Adding metadata

6 files changed, 78 insertions, 18 deletions

diff --git a/dev-java/bcel/bcel-6.5.0-r2.ebuild b/dev-java/bcel/bcel-6.5.0-r3.ebuild
index 7b3bf82feb05..54af8629d599 100644
--- a/dev-java/bcel/bcel-6.5.0-r2.ebuild
+++ b/dev-java/bcel/bcel-6.5.0-r3.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 		dev-java/commons-lang:3.6
 		dev-java/jna:4
 		dev-java/jmh-core:0
-		dev-java/oracle-javamail:0
+		dev-java/javax-mail:0
 	)
 "
 
@@ -49,7 +49,7 @@ S="${WORKDIR}/${P}-src"
 
 JAVA_SRC_DIR="src/main/java"
 
-JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,oracle-javamail"
+JAVA_TEST_GENTOO_CLASSPATH="commons-collections-4,commons-io-1,commons-lang-3.6,jmh-core,jna-4,junit-4,javax-mail"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS=(
 	"src/test/resources"
diff --git a/dev-java/bcmail/bcmail-1.69-r1.ebuild b/dev-java/bcmail/bcmail-1.69-r1.ebuild
new file mode 100644
index 000000000000..0eabcf7e3584
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.69-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.bouncycastle:bcmail-jdk15on:1.69"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
+SRC_URI="https://github.com/bcgit/bc-java/archive/refs/tags/r${PV/./rv}.tar.gz -> bc-java-r${PV/./rv}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	~dev-java/bcpkix-${PV}:0
+	~dev-java/bcprov-${PV}:0
+	~dev-java/bcutil-${PV}:0
+	dev-java/jakarta-activation:1
+	dev-java/javax-mail:0
+	"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{README,SECURITY}.md )
+HTML_DOCS=( ../{CONTRIBUTORS,index,LICENSE}.html )
+
+S="${WORKDIR}/bc-java-r${PV/./rv}/mail"
+
+JAVA_GENTOO_CLASSPATH="bcpkix,bcprov,bcutil,jakarta-activation-1,javax-mail"
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/jdk1.9"	# https://bugs.gentoo.org/797634
+)
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests"	# OK (106 tests)
+
+src_prepare() {
+	default
+	cd ../ || die
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	einstalldocs
+	docinto html
+	dodoc -r ../docs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/javax-mail/javax-mail-1.6.2.ebuild b/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild
index 864ef388d4f4..81ac05785694 100644
--- a/dev-java/javax-mail/javax-mail-1.6.2.ebuild
+++ b/dev-java/javax-mail/javax-mail-1.6.2-r1.ebuild
@@ -20,15 +20,13 @@ LICENSE="|| ( CDDL GPL-2-with-classpath-exception )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-# No clue how to deal with ${S}/exclude.xml
-# RESTRICT="test"
-
 # Common dependencies
 # POM: mail/pom.xml
 # javax.activation:activation:1.1 -> !!!groupId-not-found!!!
 
 CP_DEPEND="
 	dev-java/jakarta-activation-api:1
+	dev-java/jakarta-activation:2
 "
 
 DEPEND="${CP_DEPEND}
@@ -70,11 +68,7 @@ src_test() {
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 	popd
 
-	# With higher Java versions tests run forever.
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" == "1.8" ]] ; then
-		java-pkg-simple_src_test
-	fi
+	java-pkg-simple_src_test
 }
 
 src_install() {
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 5720206a7262..a8b32f34adf8 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -15,8 +15,10 @@ DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.1_12.tar.gz 191355612 BLAKE2B
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz 191978211 BLAKE2B f0428e67c6f75bc204c8e7c74b25c73a270cff1889c0e3fdcc830f868bcddb58e6c9a480ba0313638a7edf56dd2e61e52b7c4f1dd9ad3643f3e70c9770141c93 SHA512 057fc5c4869bc9113c1a299b125c8bed47e4a841238b42fbd4b39adfd7bbbca0fa9efed7315a98303ff8f4000afd02baaa5b3169be6287d06edbfbbb44728538
 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz 192449459 BLAKE2B 506d31e97c7be57a870e80e1beb0bfa72528cb0e5d006b0dc76667f6ef29624165375a91127e3cc934f3135298d748c43a5adcecb9a07c5d758998bbf6551837 SHA512 8d7afed31b37759ba426d412f70c36e380f0f472d850c9ba9e895e0ebd4a2cf9a7f6118526f0a30f6a1d9d880affca4e1ed9848125509ae97e32f506ad78f541
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz 102144826 BLAKE2B b351fe3a82d8ef1e77314890a00c2920dbe5621bb524c4d4ed80b2f3a3b10853f91b0488ab42a5b1691ba66aa9de8eb0630b9325c3dc7fe6b071e2a95dad6bed SHA512 1b58c5453c473d798e5c4871212c484518b44038f81b32623668174fc47c4118120f770ebe3a21534b7f9e01c383a75cb558538e1e635f7c290686825b4ea78a
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz 102170434 BLAKE2B 84755d791d6aea0b58de68f7ced3e023d7d5f705c99ece9cb91f77663643681ea22672bb1dae143475959374193b1bea1068c0a0f73df4e748430495993d1c5c SHA512 cda25392c8d51b720fac9022de0d7cfc1f496b9e5295b90ee6082e6787d483eaf32198092072b6fe9cadfec157a93f66290691b3d1476572ba2097ab5e70b33c
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33e9486637f9274f5a3138d6c1a53afa63d24ecb82aff4c0baa8b765003642c582c0191d0d229754dd9de64ab7cda4d81e9168df3d960baa44a5de9a SHA512 8b7273688a1ee28d0a2f918f2fe02586b8ff9e7962bbf8cd2973001594e627b1eef7a9f1893bf3bd3789fabe0058a916ac2d4d53c72cbd8d586e4e7c3217438e
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz 100615206 BLAKE2B 8956f1ed38732aa8e9880396dce7c477370d128c1a957ba6d135676140f3e8bf233c6563dbcd2f63c2136454a398c49455a96f77224691ded7843f6cac027d1f SHA512 11975e73e6615bcb686703241b0f1589699edfc76a4de97e7066d4d93826dfb8c07a54b6ea3f8a70d231f98d4033c2fbb7741fbf0df374aa810f6cff8b5cda33
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz 103063877 BLAKE2B 9ca165707b4f02eeb5156a5379d246942eb06ffe4338490600e7a834c49c1199d46cd098bbcd8041e7c58107ccb657818e6ea37cdd39018a17a87e370c32665b SHA512 6ec164df1f95d2c8921b5d90c2dbd208107fa20e66d97e2920dbefd2b616214609392e36b885700bba14571d10848f412194db2f18206c1a21d16e6df7e29e53
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc6788c00d8ed51b0beb3a08c6dee80e3fe40bdd5ca79bbaf59159869a9b3234f1ac53321e988152293c938a13202fcd9e57ec133bbd2cde3f849a0fa6 SHA512 fc75b7fe2489ac6fcf7180407db3fa839ef1a0b5de2aedf4c9db902eeb3618e2e1d1436970fc7a002b111c6f6be6250e0e1e62dba28aba21b4c88fa8f765a92e
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
index 256d71c8dc7f..9ae60de7a9e9 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
@@ -26,12 +26,14 @@ SLOT="$(ver_cut 1)"
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 SRC_URI="
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 x64-macos)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
index 664a6948d878..9b1ca168a49f 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
 
 # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
 # set build version properly
@@ -151,7 +151,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
 	# Work around -fno-common ( GCC10 default ), bug #713180
@@ -175,6 +175,7 @@ src_configure() {
 		--with-freetype="${XPAK_BOOTSTRAP:-system}"
 		--with-giflib="${XPAK_BOOTSTRAP:-system}"
 		--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
+		--with-jvm-features=shenandoahgc
 		--with-lcms="${XPAK_BOOTSTRAP:-system}"
 		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
 		--with-libpng="${XPAK_BOOTSTRAP:-system}"
@@ -199,7 +200,7 @@ src_configure() {
 		# https://bugs.gentoo.org/822612
 		export LEGAL_EXCLUDES=mesa3d.md
 
-		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
 		if [[ -r ${zip} ]]; then
 			myconf+=( --with-import-modules="${zip}" )
 		else
@@ -234,7 +235,7 @@ src_compile() {
 
 src_install() {
 	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED}/${dest#/}"
 
 	cd "${S}"/build/*-release/images/jdk || die
 
@@ -262,7 +263,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
@@ -277,7 +278,7 @@ src_install() {
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }