gentoo auto-resync : 30:01:2024 - 11:49:23

8 files changed, 101 insertions, 24 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 90e61f7b7056..ea203b18bfc6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index cc74ace3deea..a9a86f3816d9 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,3 +1,3 @@
 DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
-EBUILD bcmail-1.77.ebuild 1382 BLAKE2B bbb992a5a529dbb06fcd5455866200017c0bb2fbac080db3c6d451fb113cdd226de1e42c5124477728d218d02d714b06b63d0571b623931ee1173b559aa8e44d SHA512 3dfde1e9aa14fd7c75543c3275168072da136f7ade8c35f59b5722496174082d6a2a12698ccf32cbce076dfe6a73513c11d483b785881f2a2c0af6f39b9bdfd9
+EBUILD bcmail-1.77-r1.ebuild 1457 BLAKE2B f9a66db03d2a49379c792b289b03e2f6a8045e775bc371b21bdacf03381c107319edc85f2ebf2808ff74e91fa50893933ed2977344c4ef9233c013ea40dd3987 SHA512 cca708a10d89cff27bca469ee557c0b90285bd0529e51028b61da58de647781c91465eb5cc83ff34916a036893d5e54dcc4d1bb27b53f06dbe6c73ec7c75a780
 MISC metadata.xml 671 BLAKE2B 9bc7968fa569c698c7ac0f7af9a5301f55075db2ff416e55654ddca268b9ae1e63f4270d3fa7a99b06737b998c223db592f5fb570cee172a17cd3f7034b7d431 SHA512 b555d8d679fd4685aef9660023a12036d6459d8e88dfa4e5d7f84f47939574c2ded1bbf487c876435370382e2c06502d61189e79e61be49fa65aef9bb39f8ab9
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/Manifest b/dev-java/jakarta-mail/Manifest
index 5cd287f30245..1d4b23fd433c 100644
--- a/dev-java/jakarta-mail/Manifest
+++ b/dev-java/jakarta-mail/Manifest
@@ -1,3 +1,4 @@
+AUX jakarta-mail-2.0.1-LogManagerPropertiesTest.patch 465 BLAKE2B ae6c97da0bda1faaf416b894c17313f18f97360dd9439da4a619865b859ae1116fd0d17f6310c26d16d8403b10a376e633f9d1361a7fd17f7ee7ae787430d2a9 SHA512 08ad261452ee24cbf0e3b2fb32318608372fddeea17e92cd8749f61b68babcb24920f2d5a6d4986447d7e990ba1a76b3f804e7f0a6aa4fa6f9e6dc75d13dd381
 DIST jakarta-mail-2.0.1.tar.gz 1799232 BLAKE2B 91c8109dee5b1dd5d245df44b905435e59c4f7a888711edf19431bd3e7627d5ba4dbc34e3bd8458507c77c5fb6ed50843f45b2e8b01b7369b660055d8c99739d SHA512 42e9f82cda788b4cf73c06c8c2798a3f886fe714e4f8f4cb0356643b05acd756d46ff382333d2a9e4aaa4ed0dd5d01bc354f7e442c78be9f59cca25d4c23a3ec
-EBUILD jakarta-mail-2.0.1.ebuild 1992 BLAKE2B ff7a2e29a3be83a21d1955500f54419e45d024585c2a5e9be554ed442e9c1a2dc7f6cd296598c455af7c7f6d15a89dff6aeac2eeb8952940c304c85bd3b64b20 SHA512 23ad8254cf87528b927ed1d39edc81d27b450cc87dbf693d7dc1876d10564dd603ee4407a6d20ea0fae35ac1b74ce8c76af08bd4641580c34d765e2b73f3852f
+EBUILD jakarta-mail-2.0.1.ebuild 2253 BLAKE2B 62e7b17a7e627c01acb7f970f9d2f0ac8690b075cd7e40b0fc715026b502a6754626ff6e5b99d36631e74d61d899fd65dcf41c0ecd6ace598b5701301d9f10f1 SHA512 b0e263585f2f27859ad43eccdd92453982d744e7a51b8557c816f4226b5e70cbc03fddda29436308a0cabe302cb3bd15eb8de60d2f8ff4ff8e9e99cd459878b7
 MISC metadata.xml 300 BLAKE2B 59a5cc3d098097693ee38e1552293270505f8d82025e096a6d1c331045451d5782ccc8819a2034a88a89f4490318becb96f10186766db32afad98c1546c956dc SHA512 2d1560717ededf180302c9348d112971e6d24c8745aae17f1ec59c3676ae41bb7fe396bbb57f5c88ef52bd0f7e161aefc22b9d2d5fd006ffc9873dbf42cb2df5
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 2e5d5f51da09..ddcb4b904ece 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,5 +1,8 @@
 AUX leinrc 37 BLAKE2B 0c5df00ef323caebf53e52246ca87b066a1b6104fb03fc7e3548dba0947ecf53c33bf4e8215fc098212293915d9808b961c0df527f30d7f6316b4aff84bf3b69 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0
+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
+EBUILD leiningen-bin-2.11.1.ebuild 1523 BLAKE2B a37dbc6172fffbecb79e352b1a235ad69fc1b9e004f232f12f98aaf7ae3706e7fd0b23eca5216b649ccffe7b8c4e20992d8e327da20c43baa4294154dade9eee SHA512 b651b41e7d22a5276ccf6360ee3b958d732d6d90cc677b2618fb1540822aa16f49f5e24e050c2d86c7456d458af38f80ed5254f67841740bab44496f9865f213
 EBUILD leiningen-bin-2.9.8.ebuild 1521 BLAKE2B 4a5bc3ba083467e263825305cf7cc0a336e68bdb164b4aac65dbbb47c56c54919f84f4128abf561db2572409dbebbce4f0da1bc314f1c9520785039cda1a6b97 SHA512 83768c69278eb4c08991a4e441f358e74b24c3cf1711a7b3c3b7d5fcd50b9ad35c03386f650ebb74126801057c8d8d16d9df8bf8f0bebfc5ffa42ae7ffe40583
 MISC metadata.xml 303 BLAKE2B 3567c3889af4a644c925f03a220c329a207daeeca9437b8382ff777db620106cc807aadfaf6c157654c634dfa26c14fd654933aa5bd4b8027068fd6f67f1f241 SHA512 73c6a8fbd269fdf6a20f70aa0228314e3010461dad5c1b04f7b7c54d1cc3a2c7b475f180c6740cc9795b6d73fd39c7ce326ecf69768b1f11f2b264618711c1c3
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"
+}