gentoo auto-resync : 05:03:2023 - 23:52:45

15 files changed, 299 insertions, 65 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 942402d9df94..a00bbf90290d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index d39f403eb502..9e785994920b 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,3 +1,5 @@
 DIST byte-buddy-1.12.21.tar.gz 1931819 BLAKE2B 6b37b21d5f31c1564a3cc4d30870a7eca3c4c0512815db881a20602dc7ac970145dd9cc2bd6af4f2fdca0ff542b43dc675376c91f7ea7fdf3ea306112eba842b SHA512 9513caa9a5fc0924aea46e8de21ad2ad90320a582ad17be93f6305eb27f98d3af2c3fa09565083b5d97c0d9f0a1b0a9c7105738c4b65616e78bf2e7657c4ee76
+DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
 EBUILD byte-buddy-1.12.21.ebuild 4845 BLAKE2B 1464adfb8d4e25f149a6125e95b2b1befceb4963f66df40d42546fc39874aeb70b93949616afee90098b2b473daa8e53cb7c2047399ff9bbf74902ca00cebe8f SHA512 4c1a8dec6ea9a423b5dd45926322c431347631ec50223cae1a0ba63b9667d361c44dc3118b5a2da4a9c6dbc7a5070b0b6e04adbb2fccf48a429169dbb36b5a19
+EBUILD byte-buddy-1.14.0.ebuild 4849 BLAKE2B 72a46c884f59290637f485db774fc112e61aad43d47d6740df11e9bfede3a1ac6bda8816ea0f43f3c52060f4892432478ec5db2b786553dfd948ca314125e816 SHA512 59b2a36dc62527739442a201363536c6a92860968990c3562af97caafef0dafd387d5f708e14efd6de0e0ca2b42922a1499a75f27fdb03e5ac795917fbc9f54f
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
new file mode 100644
index 000000000000..f1f274b658eb
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2023 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/raphw/byte-buddy/archive/byte-buddy-1.12.23.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.23.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.23 net.bytebuddy:byte-buddy:1.12.23"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	dev-java/asm:9
+	dev-java/findbugs-annotations:0
+	dev-java/jna:4
+	dev-java/jsr305:0
+	test? (
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/byte-buddy-${P}"
+
+JAVA_CLASSPATH_EXTRA="
+	asm-9
+	findbugs-annotations
+	jsr305
+	jna-4
+"
+
+src_prepare() {
+	default
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
+	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy.agent {
+			requires java.instrument;
+			requires static jdk.attach;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			exports net.bytebuddy.agent;
+			exports net.bytebuddy.agent.utility.nullability;
+		}
+	EOF
+
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+
+	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
+	local exports="$( \
+		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
+		byte-buddy/pom.xml \
+		| sed -e 's:^:exports :' -e 's:,:;:' \
+		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
+		)" || die
+	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
+		module net.bytebuddy {
+			requires static java.instrument;
+			requires static java.management;
+			requires static jdk.unsupported;
+			requires static net.bytebuddy.agent;
+			requires static com.sun.jna;
+			requires static com.sun.jna.platform;
+			requires java.base;
+			${exports}
+		}
+	EOF
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+	einfo "Compiling byte-buddy.jar"
+	JAVA_JAR_FILENAME="byte-buddy.jar"
+	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_SRC_DIR="byte-buddy/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
+	rm -r target || die
+
+	if use doc; then
+		einfo "Compiling javadocs"
+		rm byte-buddy-agent/src/main/java/module-info.java || die
+		JAVA_SRC_DIR=(
+			"byte-buddy-agent/src/main/java"
+			"byte-buddy/src/main/java"
+		)
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+	# @Ignore one of 4 tests, https://bugs.gentoo.org/863386
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testIgnoreExistingField()/i @Ignore' \
+		-i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
+
+	# @Ignore one of 39 tests, https://bugs.gentoo.org/863386
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testNoParameterNameAndModifiers()/i @Ignore' \
+		-i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
+
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+	einfo "Testing byte-buddy-agent"
+	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
+	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy"
+	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
+	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
+
+	JAVA_TEST_EXCLUDES=(
+		# all tests in this class fail, https://bugs.gentoo.org/863386
+		net.bytebuddy.build.CachedReturnPluginTest
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg_dojar "byte-buddy.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+		java-pkg_dosrc "byte-buddy/src/main/java/*"
+	fi
+}
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index fca8d6cc5fbc..6ac3f8c4f4bf 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,5 +1,7 @@
-DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
-DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-api-1.2.2-r1.ebuild 1571 BLAKE2B 735ce68ad35184b309031f339deb652161acd3491fe0de6cc3c57a3b214fce63d6aa24517c5d30db4df42bf17822324c7e731dea2ccc247d98287a46569d6dc0 SHA512 aa726b74aefbba61c8678cba3edde77930f6747dbd999860262e3fca731bcc337eab792ba35136116da965fb61d6434dcf1af11f814b1be564de258c29b90cac
-EBUILD jakarta-activation-api-2.1.0-r1.ebuild 1043 BLAKE2B bb91273f1543ede3541b5f145c00c5af91b40352228b96b1552d6a5f22dc9b03b34c6bfc1490d4f7f45922581226298e978a6866e722a0e78b5b103c10a578f0 SHA512 2c80f897c060da4ee53e817f2e08ce54a585ddcc979c83d48468dfd4d04c9373410192e9bfc8fb68004031ef7dae3c8a6ed8fa8bc167b4396006c275db59c62a
-MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.1.0.tar.gz 118866 BLAKE2B 169457c88cb99bbcb712c9c6d2c6979bb48df7a84d5a2f302ceb56d21f4242042eef2408cfdcaccdc3fe76b78d5c417e49010885b7bf0a8955b080647cece175 SHA512 753437cfeb03ad15a66ec6895a992aba453cb4eea84042f31ed50c0b59b1299578bf1a8341d29fdf6bc5619d3a40233bf29b66aa5203ed54f295dc321a3fd6aa
+DIST jakarta-activation-api-2.1.1.tar.gz 127696 BLAKE2B d0f89e64a02fa88e251ab6f5eafa1001c987147c2163862e270b36e86c7c811bb32bfbab1aba32c8c4b8e7eab4eeed7478618974191b2f5386a0194a6a556a19 SHA512 95dd5b6696cf3ec66ce843334375740057c37dc5b4503173f607c95bd6020e8d0b8f87ec13b6d9be4d397096300cc0acb323b5700ad7ff0428a178272c1da41f
+EBUILD jakarta-activation-api-1.2.2-r1.ebuild 1318 BLAKE2B 71bb89fe608cd872d7e64983e23fb95d872c48b15c084578e1b9ee75fa3d0f082d683b3cd1cbe37878273c1dfd2a41ff503f4386a22bd02b29f2fa5e061b6417 SHA512 0bbc0afb65d84e25ee3fd9ea64fc9c629581f7553cc22c0b5c09a91cf272e4c60b7a6d352c88c4f8441d139849edbfd644b05f4595353f586578b80935df16fb
+EBUILD jakarta-activation-api-2.1.0-r1.ebuild 701 BLAKE2B c2db36550fec9ac2ff7cd6fc12d8e3fde9d9763ab8044844d339533374593306f86e2ab1e5817a9441a6eff9aebdcd670e17317d3f25d72a3fd9daa99d73d8f3 SHA512 0cbfff8f7e559bda9b6ec241c0c17624d1cb7b932396c580db35d670a5c83de65472f277b5ad357b97290d35297efd3818671f5d1331dbf894eb04c339f4d730
+EBUILD jakarta-activation-api-2.1.1.ebuild 685 BLAKE2B cf9bf5c347d2ee9fb967c94bf1b986a0638f24c178e43ddb632ac4713daadef55f17a9e988feee0742bd60369945b68b349117e7061cbc99a26b993f4d545746 SHA512 ed4f4db86ca59c4d2643f197c36e3f7463bcea76c68a0855251dd4177282746716b8fff9addf813a6498153504d035ca89a1119d51e171157d904dac7af31f32
+MISC metadata.xml 364 BLAKE2B 448ad0f93216312753658b97fd1cd9ff50754cec6a892f36e228e515be0a360318fed182eb99b131d3ccece5e65bc09a0ec9ab6759a412e0a5f9de68b2c1557c SHA512 98caf2cfedd7ec5bbd34d650db5377ede7e44c3d2f359cb7e86f0412c2962f7a677761002910db9692cba6831a108e819888dce270eb63ed75d73d4835a580b3
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
index 459fa0f06282..20b19ae30fba 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom jaf-1.2.2/activationapi/pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-api-1.2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,8 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -25,7 +22,7 @@ BDEPEND="app-arch/zip"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/activation"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 JAVA_ENCODING="iso-8859-1"
 
@@ -33,7 +30,7 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	# these files are not present in the upstream jar
 	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
 }
@@ -45,7 +42,6 @@ src_compile() {
 }
 
 src_install() {
-	default
 	# we remove the implementation sources so that they don't land in sources
 	rm -fr ${JAVA_SRC_DIR}/com || "Failed to delete implementation sources"
 	java-pkg-simple_src_install
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
index 2b6b9f6729b6..91741f54c08c 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
 
 LICENSE="EPL-1.0"
 SLOT="2"
@@ -24,12 +22,5 @@ RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/api"
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
new file mode 100644
index 000000000000..bf58d5636275
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation API jar"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation-api/metadata.xml b/dev-java/jakarta-activation-api/metadata.xml
index 947a81e39af4..26d86f56dec0 100644
--- a/dev-java/jakarta-activation-api/metadata.xml
+++ b/dev-java/jakarta-activation-api/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/jaf</remote-id>
-		<bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+		<remote-id type="github">jakartaee/jaf-api</remote-id>
+		<bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index b56f5689e71c..1c4a33113aef 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,5 +1,5 @@
-DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
-EBUILD jakarta-activation-1.2.2-r1.ebuild 1590 BLAKE2B 8f97fe4b0d557e37c4c808af4c7f8bb52895af54c23c0f1f3af447af34c3ec0ac0213dd8cdba588f9f3dab3c1346dd4a84b2a5e3bc676f7d033bc87148e6b497 SHA512 95691423ba5596fa56ad1c18453644f1cd22de91d667d0d88a47fc4c3fb6bb4a34eb009123146984544d75ab49cf9afa68afaf23dbc91b9862eeaca7eb4bc48b
-EBUILD jakarta-activation-2.0.1-r1.ebuild 895 BLAKE2B e28c54f1f86ab0376c0ac5abcc03941c0239868a8bf92bbe4bb6e72498e620626c480085f60961c0b5605935e3668bc154870ce610511779db7f3caae5e6c37e SHA512 229cdd0db6e0691fdcef006d1aeb50ec465b3fd7fc9071f18b7fb49c22b0dede4c98c4eb99454fa936d5ff945ebc91aa024335a405270e507372a5efa6b780fa
-MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.0.1.tar.gz 133817 BLAKE2B bd74e3df8a2d75c137cd3e25c9689296c4827f626c86455da4e10dd8b743e8ffbd5c502162f4f1f7399c4f1e1f2eab6632e9a69e67f017a7f8f111ea4a2ac836 SHA512 f5672f20588e894e7fb5248da7c69c1c8cebb3053342013f713fd58011a2ef069e9abfff8948613b19fd3404151f950d083aeda77ab6a79baaf673658016bfd6
+EBUILD jakarta-activation-1.2.2-r1.ebuild 1353 BLAKE2B d5bb39b3a1e6ab97363f818d5067d68f3fbe570156adb22729e844fe6f30203e9ad1d26c9dfda7b0645d029d9e31f2e226834ba8e7b21093b02cb7742738060c SHA512 17b17e4134faf4e837605e2f18cbf10c39377544431eea20c712bd788c32aac4938579559c2383d69d789b47ca84c977b2f087b98cda654ff22aecdc8fdc631e
+EBUILD jakarta-activation-2.0.1-r1.ebuild 633 BLAKE2B 0b2b9305738f91907ad666b0670548691b4132950799d0af7c5c0100cc70fae3685e1a69b354177af320ec85922a587bc7394f9be9b33312516f9a27cde9dc62 SHA512 e4cdb98899920ef0c19c59dd76d57afd3b12165c3f23e6ca2516c6648a42f4f7ec66c9a5777069ac83c0a1f07cc22dd409a882c3564a907d57d56245c48e5f3b
+MISC metadata.xml 364 BLAKE2B e6d9974b98d8675d21e9bad7ebe4d05bba1855171526218e8aaa403d0b48ec993689dfd7fdc3bf902b1ab9ad51669998d821b29a39cd3d7bc26e627b4803a027 SHA512 a7e1932872dc0660e85faa6371c9026e7325ef20f83e2a5938586f5a1fc2d28db7738f8897c01888277671f01aae2580d5ed33d88dbdeb5fc1d777349c1fe427
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
index 0a83f80926ed..1483a29bde02 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-1.2.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="1"
@@ -28,8 +26,6 @@ BDEPEND="app-arch/zip"
 
 DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
 
-S="${WORKDIR}/jaf-${PV}/activation"
-
 JAVA_ENCODING="iso-8859-1"
 
 JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
@@ -37,7 +33,7 @@ JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
 }
 
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index c409f44c8000..7b2fc15669ec 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
@@ -12,24 +9,16 @@ MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaf"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
 
 LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND="
-	>=virtual/jdk-11:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/jaf-${PV}/activation"
+DEPEND=">=virtual/jdk-11:* "
+RDEPEND=">=virtual/jre-1.8:* "
 
 JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation/metadata.xml b/dev-java/jakarta-activation/metadata.xml
index 947a81e39af4..9641aeda8c6f 100644
--- a/dev-java/jakarta-activation/metadata.xml
+++ b/dev-java/jakarta-activation/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/jaf</remote-id>
-		<bugs-to>https://github.com/eclipse-ee4j/jaf/issues</bugs-to>
+		<bugs-to>https://github.com/jakartaee/jaf-api/issues</bugs-to>
+		<remote-id type="github">jakartaee/jaf-api</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index 9b6c30aa710b..48e64813b220 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1,3 +1,5 @@
 DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
+DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc
 EBUILD jakarta-mail-api-2.1.0-r1.ebuild 2293 BLAKE2B 1ec3e487f4e1f8792d0d7c8076d4a13360ebb75fcb7ec2c5f92f2d040b773986be280cf5ed900f63482b6f385d261d38120da6b863d8670f464f480eb95e6d75 SHA512 f3066baed89428e280d1e543077dae08c838714c88e3d7509edbc900f8b03e1b3bf8d3127296ff6ecf9d7456bb28f5e17fc9da847c51175a18ac70d90de5d52a
-MISC metadata.xml 461 BLAKE2B aee5455f74a9b1f4befdfca703827933b8684cddb067d08298f6c5697c7d958d421be7e23d48e72979420d42b6d77d1880ad96a6bb6630010b2696f145be5839 SHA512 e13f30a91e3e0f825fe9f32c26747af78c3592eb4b08bfd86f40ba346f1d1f9d66c2ae77d49be884b142885d637af52f1922806262719e4c67ea19d077cfbbbe
+EBUILD jakarta-mail-api-2.1.1.ebuild 1964 BLAKE2B 5c4bc9a5de3f822fa7655f86d60bcad23e8fb174049f637fbbc637a6bcf8b9850b4a13b933509da39c5a4f2ea114c0bb87bb6f691c872a17f4deac12414ab373 SHA512 273ee3e9b98ba740ceb44fd60b5c332827231c3bdd1487f942003c26dd77ac76ce1764bb80bf45090ad960c4a4cd80a565158e152bf6f16580ef61742d448e8c
+MISC metadata.xml 541 BLAKE2B 4cef0be3e1f59957b3e9c4d1fcabd325f72da186319c5637c7c39f77e1413a3d93c8735bcd197d9bb9503affe9a9fc3e1ec594af0c1007a56b63a97061b11d5e SHA512 834f676928f44a0d0a72c3726a90f7992ead5678e0215e5706501facc75e50fce4b630b09640562329417676a82e8b1c1a357c512517d72d28c37d4d8d939eed
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
new file mode 100644
index 000000000000..11bc903425a9
--- /dev/null
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API 2.1 Specification API"
+HOMEPAGE="https://jakartaee.github.io/mail-api/"
+SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/mail-api-${PV}/api"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-java/jakarta-activation-api:2
+	>=virtual/jdk-11:*
+	test? (
+		>=dev-java/angus-activation-1.0.0-r1:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+JAVA_SRC_DIR="src/main/"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+	rm src/test/java/module-info.java || die
+
+	# There was 1 failure:
+	# 1) doesNotExist(jakarta.mail.util.FactoryFinderTest)
+	# java.lang.NullPointerException
+	#         at jakarta.mail.util.FactoryFinderTest.doesNotExist(FactoryFinderTest.java:55)
+	sed \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/doesNotExist/i @Ignore' \
+		-i src/test/java/jakarta/mail/util/FactoryFinderTest.java || die
+
+	# These tests need to run separately, otherwise would fail
+	JAVA_TEST_EXCLUDES=(
+		jakarta.mail.internet.ContentDispositionNoStrictTest
+		jakarta.mail.internet.WindowsFileNamesTest
+		jakarta.mail.internet.AppleFileNamesTest
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.ContentDispositionNoStrictTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.WindowsFileNamesTest"
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY="jakarta.mail.internet.AppleFileNamesTest"
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jakarta-mail-api/metadata.xml b/dev-java/jakarta-mail-api/metadata.xml
index bb9bcf723eb6..42164ceaf82a 100644
--- a/dev-java/jakarta-mail-api/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@@ -8,6 +8,7 @@
 		Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">eclipse-ee4j/mail</remote-id>
+		<changelog>https://jakartaee.github.io/mail-api/docs/CHANGES.txt</changelog>
+		<remote-id type="github">jakartaee/mail-api</remote-id>
 	</upstream>
 </pkgmetadata>