diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/bcmail/bcmail-1.77-r1.ebuild (renamed from dev-java/bcmail/bcmail-1.77.ebuild) | 2 | ||||
| -rw-r--r-- | dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch | 11 | ||||
| -rw-r--r-- | dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild | 42 | ||||
| -rw-r--r-- | dev-java/leiningen-bin/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild | 62 |
5 files changed, 97 insertions, 22 deletions
diff --git a/dev-java/bcmail/bcmail-1.77.ebuild b/dev-java/bcmail/bcmail-1.77-r1.ebuild index 087f90f7a3cd..fc5a0ce57369 100644 --- a/dev-java/bcmail/bcmail-1.77.ebuild +++ b/dev-java/bcmail/bcmail-1.77-r1.ebuild @@ -26,6 +26,7 @@ CP_DEPEND=" dev-java/javax-mail:0 " DEPEND="${CP_DEPEND} + dev-java/jakarta-activation:1 >=virtual/jdk-11:*" RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" @@ -34,6 +35,7 @@ DOCS=( ../{README,SECURITY}.md ) HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.mail" +JAVA_CLASSPATH_EXTRA="jakarta-activation-1" JAVA_RESOURCE_DIRS="src/main/resources" JAVA_SRC_DIR=( "src/main/java" diff --git a/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch b/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch new file mode 100644 index 000000000000..7848f1e77c9a --- /dev/null +++ b/dev-java/jakarta-mail/files/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch @@ -0,0 +1,11 @@ +--- a/src/test/java/com/sun/mail/util/logging/LogManagerPropertiesTest.java ++++ b/src/test/java/com/sun/mail/util/logging/LogManagerPropertiesTest.java +@@ -78,7 +78,7 @@ public class LogManagerPropertiesTest extends AbstractLogging { + assertEquals(Arrays.toString(declared), 0, declared.length); + } + +- @Test ++ @Test @Ignore + public void testCheckAccessPresent() { + LogManager m = LogManager.getLogManager(); + m.checkAccess(); diff --git a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild index 2fcf73b3a66e..0e12088b9f5e 100644 --- a/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild +++ b/dev-java/jakarta-mail/jakarta-mail-2.0.1.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jakartaee/mail-api/archive/2.0.1.tar.gz --slot 0 --keywords "~amd64" --ebuild jakarta-mail-2.0.1.ebuild - EAPI=8 JAVA_PKG_IUSE="doc source test" @@ -15,31 +12,22 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Implementation of the Jakarta Mail API" HOMEPAGE="https://github.com/jakartaee/mail-api" SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/mail-api-${PV}/mail" LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86" -# Common dependencies -# POM: pom.xml -# com.sun.activation:jakarta.activation:2.0.1 -> >=dev-java/jakarta-activation-2.0.1:2 - CP_DEPEND="dev-java/jakarta-activation:2" -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} -" +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" DOCS=( ../{CONTRIBUTING,NOTICE,README}.md ) -S="${WORKDIR}/mail-api-${PV}/mail" - JAVA_ENCODING="iso-8859-1" JAVA_SRC_DIR="src/main/java" @@ -56,15 +44,25 @@ src_prepare() { } src_test() { + # test failure with jdk:21 + # 1) testCheckAccessPresent(com.sun.mail.util.logging.LogManagerPropertiesTest) + # java.lang.UnsupportedOperationException: + # The Security Manager is deprecated and will be removed in a future release + # at java.base/java.lang.System.setSecurityManager(System.java:429) + # at com.sun.mail.util.logging.LogManagerPropertiesTest.testCheckAccessPresent(LogManagerPropertiesTest.java:89) + # https://github.com/jakartaee/mail-api/pull/704#issuecomment-1911924741 + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 21; then + eapply "${FILESDIR}/jakarta-mail-2.0.1-LogManagerPropertiesTest.patch" + fi pushd src/test/java || die # Selection according to 137,138 pom.xml - # This one does not run because of + # MailHandlerTest does not run because of # "java.io.IOException: Permission denied" # excluding it costs 141 tests. - # 1) com.sun.mail.util.logging.MailHandlerTest local JAVA_TEST_RUN_ONLY=$(find * \ - \( -wholename "**/*TestSuite.java" \ - -o -wholename "**/*Test.java" \) \ + \( -path "**/*TestSuite.java" \ + -o -path "**/*Test.java" \) \ ! -name "MailHandlerTest.java" \ ) JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest index 573922fb97a0..92e7e580c26f 100644 --- a/dev-java/leiningen-bin/Manifest +++ b/dev-java/leiningen-bin/Manifest @@ -1,2 +1,4 @@ +DIST leiningen-2.11.1-standalone.jar 16481190 BLAKE2B 62f77411cc1d76ef15a7dee3185e109fdfe2f4c7273fb23b5d1aad13e7cc09f95bb71efaef190b890892cffab3ebcff84f0829105df824e8942367c96f388ca3 SHA512 9549bfebe79d4358ec94493df1f261ac8f84fae1b00c5a0e7a1c52b8d38f30b1b51241246224890b02cdad7ca388567b1e57aae850ba77878faf091d9d0e8d66 +DIST leiningen-2.11.1.sh 7467 BLAKE2B 7c82fde4cca990ef31fe6e207c872d6cfad69d0afc906119d069140831dc9e66e4fab8742c610eb922b14a3f4dec3c525c8a0598e426d78830d4136bace7a0f6 SHA512 9399bd4f37a9326d928b73c2f43b438545ea1c87942c365a86958345e95f86059d2d6fa18a68b20cc615193f69909620089c6f7aa8b8ab22c9fbc0f04852f6a5 DIST leiningen-2.9.8-standalone.jar 12834369 BLAKE2B 6c9bc9a2f990bb4959aa06f8f8b31c1084f0d2bad2e19c8343fb7e8a02acb6f6173737cbf36b028e113577ef26e380d7ace035316dee840c6da92512afa7ac0b SHA512 de4989bf31fe86bfb943d90b683dd17a7417c267e67ac8036967ed352e47a4361b8b6ec8378a1e6cf24fd8df51bcabb9578bc8f487d812c9fb5c2f5f476016cd DIST leiningen-2.9.8.sh 4555 BLAKE2B c876d19a4ba9a53d84c31874af442e57e6184ce1f7145512355a88b833d2d236bd73eef93f260d22b51e6200c5579c3721a8b6bcb16d516e503a98a2eaf26126 SHA512 58cba7d457c98546e530ad821273cb3f51445ed3191022d0963dd51683cb6b24d0f7d557da34313083b0df11a2c9885bf6d5bb073dea736731de95e8fbbca492 diff --git a/dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild new file mode 100644 index 000000000000..81887709ff36 --- /dev/null +++ b/dev-java/leiningen-bin/leiningen-bin-2.11.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-pkg-2 + +MY_PN="${PN%-bin}" +MY_PNV="${MY_PN}-${PV}" + +DESCRIPTION="Automate Clojure projects without setting your hair on fire" +HOMEPAGE="https://leiningen.org/" +SRC_URI=" + https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.jar + https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh +" + +LICENSE="EPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos" + +RDEPEND=">=virtual/jre-1.8" +DEPEND=">=virtual/jdk-1.8" + +RESTRICT="test" + +src_unpack() { + mkdir -p "${S}" || die "Can't mkdir ${S}" + cd "${S}" || die "Can't enter ${S}" + for file in ${A}; do + einfo "Copying ${file}" + cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}" + done +} + +src_prepare() { + einfo "Copying leinrc" + cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc" + einfo "Patching leinrc" + sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc" + + einfo "Renaming lein-pkg" + # Rename generically to help user patching + mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein" + + einfo "Patching lein" + java-pkg_init_paths_ + sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${EPREFIX}/${JAVA_PKG_JARDEST#/}/${PN}.jar|" "${S}/lein" \ + || die "Can't patch LEIN_JAR in lein" + + default +} + +src_compile() { :; } + +src_install() { + dobin "${S}/lein" + java-pkg_newjar "${MY_PNV}-standalone.jar" + insinto /etc + doins "${S}/leinrc" + fperms 0644 "/etc/leinrc" +} |