gentoo resync : 29.06.2021

18 files changed, 237 insertions, 99 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b100fdf00010..c2cae427a81b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index c9451b0d8a86..ec763613ffe9 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,3 +1,5 @@
-DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
-EBUILD gradle-bin-6.3.ebuild 985 BLAKE2B 5108b1a0ec969d79b2a27256b8c9ba5430f4d4326bd0e692cebeb31c9f09830592c3b856b19376fc6eef2d14069bf3c804b11f8054e7464a5a88c2b6b81cfd58 SHA512 c04c5d989701292ee4cd269e61ba989b5dfb818822b8c92f274c808216fadea75014ca21359ccdc859f29cc62812f3bc45c4a6db71a0f800f25575587373b583
+DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec204519edf42c8a0f05a911ef716715b706e3c22637763b4a7a0c7cbfa89f163673ef5631c115c025c5634b353fcee6 SHA512 fdd5c347142c2a8e2a1455d8886ddb103531de6e69d41f20d199a488d10165600924876761b452da213759a1dc6d47ed00a069f1a9f8af99fdbf1af3bb2e0564
+DIST gradle-bin-7.1.zip 154782196 BLAKE2B 8252b53dd9214f92c2a900a240ee22e1cf98f8dadc07248df8015dd3eda745338198b864aeb1cd0d3b3ec4604fdf01105c74e95fba4b9dde1ef56db7eb5f8dcd SHA512 30aad03b1bd02fef13fbb59ae29ce859dc60f734432207c9a173056bc9e23125233d618c3f4906011f70065dd09c848abdc6dd249421c3b79c28477903b78a01
+EBUILD gradle-bin-6.8.3.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
+EBUILD gradle-bin-7.1.ebuild 1109 BLAKE2B 670747ab94b68c37bcee23bd71de58ebdb599794b25227bf56c37a55f3a72ba5f41e0df7afd88c119a26cef7c0953846c6ad797b89d1b60e980c962b2a144bb5 SHA512 e4dba16bfab419d884478c41e8ba6d005d099fa536d436df884c4237d404c9ced6038cffc38fa0727a2e72090627e81af96cbf685bb7029425eca8d13838a56b
 MISC metadata.xml 467 BLAKE2B bb2f586cab99d5a2b27ff6c13d1ea88ae50561a7b9d0c57451616d28b9f651b9899be8b6653b508616e6e8adfeaef5ba099f666855b514feb168050f48bd9d29 SHA512 243a28ef037ec2041d0440d624ddb2d9cb7546f048e9b9f0971af542a41af33c30e561eb76ab24803fe541935d983c7b1f52f52bd005490e77c9d6a8d96d2de8
diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
index 1623bb9c3f34..dfbd1549205b 100644
--- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-6.8.3.ebuild
@@ -19,31 +19,43 @@ LICENSE="Apache-2.0"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
 
+DEPEND="app-eselect/eselect-gradle"
 BDEPEND="app-arch/unzip"
-DEPEND=">=virtual/jre-1.8"
-RDEPEND=">=virtual/jdk-1.8"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 S="${WORKDIR}/${MY_P}"
 
+src_compile() {
+	:
+}
+
 src_install() {
 	local gradle_dir="/usr/share/${PN}-${SLOT}"
 
-	insinto "${gradle_dir}"
-	doins -r lib/
-
-	exeinto "${gradle_dir}"/bin
-	doexe bin/${MY_PN}
-	dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+	if use source; then
+		java-pkg_dosrc src
+	fi
 
 	docinto html
 	dodoc -r docs/release-notes.html
-
-	if use doc ; then
+	if use doc; then
 		dodoc -r docs/{dsl,userguide}
 		java-pkg_dojavadoc docs/javadoc
 	fi
 
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
 }
diff --git a/dev-java/gradle-bin/gradle-bin-7.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.1.ebuild
new file mode 100644
index 000000000000..dfbd1549205b
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 37a117d27424..f00b22fe5598 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,3 +1,5 @@
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
-EBUILD jakarta-activation-api-2.0.1.ebuild 935 BLAKE2B 22cb90a9b6b5397636ede15bfcf6d1c039cbc5b4228be4d908e64d7d595b80c4421ca85a04487da7db670d8118c7f6baaa4ef94c49a90e9ebcc0271a5df2fc25 SHA512 7cae470ad71954dab9e526b3580b2c251f01098aea4b26bca366d2c80d277f984addb90f451d3a914cbc4cce6579417ed7651c8e8270efc8d5370d7cd7c543d1
+DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
+EBUILD jakarta-activation-api-1.2.2.ebuild 1594 BLAKE2B 5fe2c55a2e8b940d9a932dcfed02124793850c7e591ca0abc4936e9c54c0ba0662cc5261bec3d8d4193108ca261da4d6ad532795775815d9b5acf58cc8c4a580 SHA512 52bb3a7e881fee28bec2c89f468893d34ee69d07a79c3381099c715551a506211f47c54166be5ba6efecc4b8114746570489c24349435b18551447db30951ac8
+EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1558 BLAKE2B 3951b0ea3bd20d0bb129387747c215122f662f1f52b6660bc5be83b4eb6afcb966bf8518bba74131026933d9d944ece5d15b9100963adf2c826c61d0f4d4bb86 SHA512 09d0f47c9472f4ec6528f109f238beabf68a7dbdd7f71458fc07747f46457972e1eb74e8aa5ba49ea38b8ec66722c47eed805c3c1b469f396441c4f735f06c10
 MISC metadata.xml 361 BLAKE2B d3bf866111d68c231bb0f2468c6caa6ad0898d222c1807a9e853e32573e0d4e3b8c1f668bf1b36e85ac466869873acdf976379a490e7cb4fb0eab377484f19b9 SHA512 e493232219ce389523bd77123bbb11ef5e4c06a05c191beef3fe9829803f0c70211bc68b99cf49d575865f0929621d9c745c81325f3ded6f25888daab72faf4f
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
new file mode 100644
index 000000000000..d66cea7f3dd0
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 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=7
+
+JAVA_PKG_IUSE="doc source"
+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/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/jaf-${PV}/activation"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_prepare() {
+	default
+	# these files are not present in the upstream jar
+	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	# we remove implementation classes from the api
+	zip -d ${PN}.jar "com/*" || die "Failed to remove implementation classes"
+}
+
+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.0.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
index c3224df283ed..9537b85bd9ff 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
@@ -16,18 +16,35 @@ HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
 SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
 
 LICENSE="EPL-1.0"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-DEPEND="
-	>=virtual/jdk-11:*
-"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
 
-RDEPEND="
-	>=virtual/jre-11:*
-"
+DOCS=( ../{CONTRIBUTING,LICENSE,NOTICE,README}.md )
 
 S="${WORKDIR}/jaf-${PV}/activation"
 
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_prepare() {
+	default
+	# these files are not present in the upstream jar
+	find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	# we remove implementation classes from the api
+	zip -d ${PN}.jar "com/*" || die "Failed to remove implementation classes"
+}
+
+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/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index f6e33ab265bf..a84273884517 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,5 +1,3 @@
-DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
 DIST javatoolkit-0.6.7.tar.bz2 24514 BLAKE2B 5da4c95ac561b71a3019c265a5233eb825f5f57ae35e1dfefccc2fc26a5c967dcf562c321ff61f6ad4d702f4f656927cf21fa32eadb2454b18444505ba16ae91 SHA512 34e9e9d08ed486f57bbb33bed437ff7e4bbdcb6ff8f57c338e787db0ca5688a27eaf9e21f47b5d245279c58cbdaeab0d61b469b3f176ab37a18f122123c885d0
-EBUILD javatoolkit-0.6.5.ebuild 808 BLAKE2B bc0814a2693d2012ab11b26da2fdccf2e61c82ed24ca780ca12c988662a0693595df12b075d4706b160bae280a76284673553a6ad58c35dd9f48d021f6dbc39a SHA512 c301680a55c8a60c2e333252317c5306db3962e4ee781799e3f85076c3041e8035b12402dc136e96ef30284decaf4480bb2e1682040026b49cef89928917f7c8
-EBUILD javatoolkit-0.6.7.ebuild 813 BLAKE2B df9e2456105da14944e73238d8146ba61901289ed2b19dd019df7ab70610fbdaeeb28e13e37b9d495fe0eab302efc49979428308e3988fe4f94040440c3969b3 SHA512 1d509cf24e9abc0105ce258b219d903a951ab2809308183a8d657f014a5402ac08aef40697bfa311dbef2b0b627448b3ec272f391d545d38e7186042adb94600
+EBUILD javatoolkit-0.6.7.ebuild 808 BLAKE2B bc0814a2693d2012ab11b26da2fdccf2e61c82ed24ca780ca12c988662a0693595df12b075d4706b160bae280a76284673553a6ad58c35dd9f48d021f6dbc39a SHA512 c301680a55c8a60c2e333252317c5306db3962e4ee781799e3f85076c3041e8035b12402dc136e96ef30284decaf4480bb2e1682040026b49cef89928917f7c8
 MISC metadata.xml 260 BLAKE2B b37eb6d2d2182a4b64e7c3a9881a08a7072533de1f0920927c3c197f53db2a0ad57a44bdf47cf75cf08a93d6c55b2f6e0694227bcf07a606e337345131719cee SHA512 c4b63e127973fa92d06e9e1efb5d42571a9963a23c60e50039d8a4fc31b2ddfeac407deae9e03c2c1636957b3b3c53ba3944c03978958bada06a7996337fbb7c
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
deleted file mode 100644
index 2b2457911698..000000000000
--- a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Collection of Gentoo-specific tools for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_prepare_all() {
-	hprefixify src/py/buildparser src/py/findclass setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${EPREFIX}"/usr/libexec/${PN}
-}
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
index 5296dbc8e73e..2b2457911698 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
new file mode 100644
index 000000000000..5a89a98e9cfd
--- /dev/null
+++ b/dev-java/jaxb-api/Manifest
@@ -0,0 +1,3 @@
+DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
+EBUILD jaxb-api-2.3.3.ebuild 1546 BLAKE2B bb387e63dba7fcc84408e279ebd609f9bcccb98d581951fce1d0df2ea1340e9ea22e7b00354cd1654f4b05ef033b86bd0a05a0cf6c6a3d7231b9f4dd8c7c1922 SHA512 5b3ec04eeed4536bd952909de96083665a17ae8d57601397302b522f8c0bd16150611ffd60605a24e912e33627be59e017b92e960ce205bf45727036e8db3af6
+MISC metadata.xml 371 BLAKE2B c214c5c3de3faae1842e9853fb7f200d582f39b4acc5bb6a379ee95f32e59d8928dd8e7b64492e54b0a5ffc005f36ec5ec80d1702214a4071210f79a52e4e461 SHA512 196bf72bc4e82bc131a9dc81db8b08b2b61aadc8c4be9cda8f6508943c0adb20f0223f7f5036f2c4c1aaf59070e17599c05384f8ca1671f54824bad18b929998
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
new file mode 100644
index 000000000000..90e543acd3b8
--- /dev/null
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 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/jaxb-api/archive/refs/tags/2.3.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxb-api-2.3.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta XML Binding API"
+HOMEPAGE="https://github.com/eclipse-ee4j/jaxb-api"
+SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# jakarta.activation:jakarta.activation-api:1.2.2 -> >=dev-java/jakarta-activation-api-2.0.1:0
+# jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 -> >=dev-java/jaxb-api-2.3.3:0
+
+CDEPEND="dev-java/jakarta-activation-api:1"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( ../{LICENSE,NOTICE,README}.md )
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
+JAVA_GENTOO_CLASSPATH_EXTRA="jaxb-api.jar"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="../${PN}-test/src/test/java"
+JAVA_TEST_RESOURCE_DIRS="../${PN}-test/src/test/resources"
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jaxb-api/metadata.xml b/dev-java/jaxb-api/metadata.xml
new file mode 100644
index 000000000000..f09abe4dcbf0
--- /dev/null
+++ b/dev-java/jaxb-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/jaxb-api</remote-id>
+		<bugs-to>https://github.com/eclipse-ee4j/jaxb-api/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest
index f009553ab27d..573d95d3f045 100644
--- a/dev-java/piccolo2d/Manifest
+++ b/dev-java/piccolo2d/Manifest
@@ -1,5 +1,5 @@
 DIST piccolo2d-3.0.tar.gz 402866 BLAKE2B b78b93084e13c738126ab04babab4ee502deca869dc28a5bd066c13b46f455af55cf76531270d546d6cf56d56c0e48f2edbbda40944479cb9762db56421fb021 SHA512 609b38e27386ea0dac821f8d0a23bbf57afa056ed928944d63c2c8d1572c4f8b6541d27f5d26ab167948724c9f1198069fb6e0b76ce2770fe795662c76151100
 DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a
 EBUILD piccolo2d-3.0-r1.ebuild 1120 BLAKE2B 0bada107c136f31b96d5045132a717ba15deb80129a22a8dd800e2644fc2055cb41a91594fc9aa897cddaeb72192af19613aced26826c687cb43250dd2f22f35 SHA512 dddbb48aa868a36363479e8f28fbbda3bb5fb8d2ac1642da705c7255c4cfb48afb770a9742fdb6688b4120a4d1f7147a567d581eadae3235ecf34a28a5c5f05b
-EBUILD piccolo2d-3.0-r2.ebuild 1136 BLAKE2B 4525d1dd512a02c807e93ee16d3dbf657b038c03673023b5283835197697532370362ab7be8cf4d22e6deb128749aa6c0b89242a77a7748603e67e9e2fd39bce SHA512 c27935af5fa4d1c2fd1d2ca587d46bebfcacd4acbc706e5af8a27508c94790a44ee98e69bde55b1deeb904c4241a32d77c55f9127a0c26df71b2f68eaf3f2bcd
+EBUILD piccolo2d-3.0-r2.ebuild 1135 BLAKE2B a1121922f136b23c3b07aa45b69c5d7f33366620d494f389abc452e59eea9b80a762809253501a9a64591802ebd682f26fdae0eed32a7dceafaf8ec6d2742acf SHA512 f7ee2b9cbc451cee3496e7fbd718b08d8f8da1bd759b01d25c301567deb6b8fcf6f37cbbd7a1fa5096fed6b1f29cad8c63b57902c678974d3364dcb4685649cd
 MISC metadata.xml 379 BLAKE2B 8e4337e2de075e9c1697e3a9497b50f9c3e549ca16bc7ec5e242bf8021e75154d28dedf7a7fc481d2177a8a70e2012ff8547cacea4666bbe173c611cb1892855 SHA512 6411900dad2b5f7e410713dc14fd3d968d28a4c0a8235435e60e67d2ceeb9576681b8fd33efe9c9324a04869c29f73ee69d0469b5a56656eb2e256cc58849fd7
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
index bfe1cbbc3322..5526f91037b6 100644
--- a/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
+++ b/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}.java/archive/${PN}-complete-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 CDEPEND="dev-java/swt:4.10"
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 80d7ff4498d0..b6beddf5f598 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,8 +1,6 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-AUX tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 718 BLAKE2B f6e5fb4b569cb54dd6274023e155abf988c1efe724b4e42e31d96e897f8a1cc8afb64ca673d32ef30e2b44d74afcafd8cf7e1fb33372e95b802e17d9c6354270 SHA512 c7d5d2babde536adff9c5fa2ff41405ef7ab8013ebf91cd5f9ff7aeb5f5bfebe6e1e0dd9ceb7c031a4905258701156060a26ee5555ca1e3077181afe4d351c9f
-AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 710 BLAKE2B 177affee37d70208942c709324c4a7a4c561a28197792683a1f21dd747cb90f2d9fc2c32cf28cab0ad575c22dfa93efeaf7ba7f5254dbe67fe1a8b6fe5fd504f SHA512 0233b3fa6f6e3de36d62056035c84f9a22e866ff61e4cfd0976b7aa7e8ae019421bad25e49430e47a0476d09b5c1037d453e807ea02605a4f161d876f303c24a
 DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
 DIST apache-tomcat-10.0.7-src.tar.gz 6001147 BLAKE2B f1aee4748d404d02188369603824dcc97765e907cfc3872f54b1859ae950a9475d72862caa2179ac39e4cbdb8c23424f89c4cbbfff8a2e079a842b0054257009 SHA512 395b0280666c6779f6378cb87e9abdb637a823e7f89452b7324329f4c0a1fe0b315275dca5df2f80a38c6f1ef98541bd1ea762df7af9cb15e4466c3b89e4e7a8
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
diff --git a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
deleted file mode 100644
index 7dffca69ce67..000000000000
--- a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java
-index 2f42de7..5d52580 100644
---- a/java/jakarta/el/ExpressionFactory.java
-+++ b/java/jakarta/el/ExpressionFactory.java
-@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock;
- import java.util.concurrent.locks.ReadWriteLock;
- import java.util.concurrent.locks.ReentrantReadWriteLock;
- 
--import aQute.bnd.annotation.spi.ServiceConsumer;
-+//import aQute.bnd.annotation.spi.ServiceConsumer;
- 
- /**
-  *
-  * @since 2.1
-  */
--@ServiceConsumer(value=ExpressionFactory.class)
-+//@ServiceConsumer(value=ExpressionFactory.class)
- public abstract class ExpressionFactory {
- 
-     private static final boolean IS_SECURITY_ENABLED =
diff --git a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
deleted file mode 100644
index 86e9eeb8f19f..000000000000
--- a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java
-index 2f42de7..5d52580 100644
---- a/java/javax/el/ExpressionFactory.java
-+++ b/java/javax/el/ExpressionFactory.java
-@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock;
- import java.util.concurrent.locks.ReadWriteLock;
- import java.util.concurrent.locks.ReentrantReadWriteLock;
- 
--import aQute.bnd.annotation.spi.ServiceConsumer;
-+//import aQute.bnd.annotation.spi.ServiceConsumer;
- 
- /**
-  *
-  * @since 2.1
-  */
--@ServiceConsumer(value=ExpressionFactory.class)
-+//@ServiceConsumer(value=ExpressionFactory.class)
- public abstract class ExpressionFactory {
- 
-     private static final boolean IS_SECURITY_ENABLED =