7 files changed, 67 insertions, 6 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6077b8ccd271..a63787208ec8 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 97865e03f892..18a93d59a5fa 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1,3 +1,5 @@
-DIST j2objc-1.2.tar.gz 9718769 BLAKE2B 370a52fe9821814c12dd7a13072930f178e041d14baa2e912de3379030828ae62114b213f38f849934e68060fa51d8017a28772a794658aa23272ac5d254d933 SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb
+DIST j2objc-1.2.tar.gz 9719149 BLAKE2B 8d5b9fd5b1e9356edf0e9021537c45d74f6e666de7a5fc85eb6a619b0616475bea6ef65e030e0e4023049123fba07793243af8299b8e4e24b224f252dafd8eda SHA512 2332eedcca42c936044f39ca5cf457995786beea140eb2e621d5fc7804d63aae961ad89f0f31b56afe32f8d852ecb6e73e576aaa85290135b87b762848f28c25
+DIST j2objc-2.8.tar.gz 29383083 BLAKE2B a2d288b95fac5d5fafbf5e3c8c7c862e41ba9562f6a3f367ee03574db0f07e030f7812de7d0cf63c97acdbbf8ddd8128fe14e89e97623d6d3cf7b85071e160b3 SHA512 f93a77db3a672691666de317010e455aceb20313a40217270cf4cfd082a0443f7f5cf6f53f06a1006d0a2788c199685a574b0acb435dccdc4e419a2340451860
 EBUILD j2objc-annotations-1.2-r1.ebuild 604 BLAKE2B f89ef5a8c49a6669abd3e1402f8c5b5a2ff89f210ef424e1659ddcdac116cffdf8735cb111e8a1e1b08028496b5c51bbdf6de4e2e52669dbd608755c31c850cb SHA512 780fe50fd29bd85779f9b88c73432b183a63363c6d946073b97f52c8db38ac698f1a738fed45d860a376508e08ceb995e1573a0f54c7334a809744daf3f4695c
+EBUILD j2objc-annotations-2.8.ebuild 853 BLAKE2B b28a193d67dbf1e6a0c53cdf3f4e4dd65a3036a329e9810b75db31cfee57a4988e4006796c624fbffd256ce6f26154595c456588b35b6b31df2f518cf0ad242d SHA512 e676e2976fcc69f8ea1f38a4aab42f30e4bc1c2c2928f0c0d7c398ec35054cfd2114b0e8a345cdbd47e57dab1f5b7ed06ce4a07388706bcfe100684578d27854
 MISC metadata.xml 315 BLAKE2B 5403ef9a3b61aa4b5bef35fe46ff921be35190630f344563cdd60c8ca0fa6e3f8b1e612ad05df478f69257d85f30c36cd265e2f9664cc41d67e05fc47622f784 SHA512 fd176c272bbae6a6c861625828e363bebee5d92298540a8ec0bd9574d8adbc3f44f273ccb9ac576ac097a9d1c9deb8ff28c9f59ae001e951b030d5276f3a95ec
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
new file mode 100644
index 000000000000..6d1ab4cdf1d2
--- /dev/null
+++ b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+# Yes. version is "2.2" regardless ${PV} being "2.8".
+# See https://github.com/google/j2objc/blob/2.8/annotations/pom.xml#L32-L35
+MAVEN_ID="com.google.j2objc:j2objc-annotations:2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for the J2ObjC Java to Objective-C translator"
+HOMEPAGE="https://developers.google.com/j2objc/"
+SRC_URI="https://github.com/google/j2objc/archive/${PV}.tar.gz -> j2objc-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="virtual/jdk:1.8"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,README}.md )
+
+S="${WORKDIR}/j2objc-${PV}/annotations"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	rm Makefile || die
+}
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index c023a1590213..c24e52393e20 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 DIST javassist-3.29.0.tar.gz 1290728 BLAKE2B 21543fe4d81cc46fa8d6530e8b5b821df64af31404831d15255fe7d362fe40de39451f4e6a264986ce7b8fdb16116c3266a522caf24a2df6a91cc7203354e070 SHA512 9487d4b6e1d7981360f768f2ebe7e8313c103752cc458eb454fffcf6714f62952cc772e920ee663e89cd51cd6a2669993f5595e682ec74313799eff32144541c
 EBUILD javassist-3.18.2-r1.ebuild 1028 BLAKE2B 9bc9eccea4e5d896eddbbad826a95504d54cc4b352189b3dd0ad6a56dfc34641e3e800dc99aa2348c565e03fee46534b3ad19633283670380a0bdf44a635cce0 SHA512 75eb795cd8a27728e57fc168c78fb1b2aaa5d2666432690e1e20690b64a955a6471aacba04101dc2c80f1dd4afd68ebe00e9c176d1b6bce412032ff173cefbb3
-EBUILD javassist-3.29.0-r1.ebuild 1917 BLAKE2B aaa5605c6172118bb8db7e507608bde93d3fc834061a2edb8cd2b08ea035a9777f6ab641e15d964fe6ca7a387e825edd0cc51eda526fbad39c155a2ad26249f6 SHA512 b23893ce864bf9cf466acbcc09ce147abd29e32ddf87d863cd1b5b6ee638a1b4cd9361bb05739a5e7173380d38c8ba3cc15d9e60e5fe44a0f190ded87da768e0
+EBUILD javassist-3.29.0-r2.ebuild 1923 BLAKE2B 63584d2d5cfd5f06ee1f87269774b6e5746ede114c485a806c81e848748ec51b809a7cc45afda163d663912fd07dfd226c730d6a719bca693b91b06cad25e338 SHA512 5a36d9c89f07b86d02020c459cff479dcc21dc1a80bd110adfe3b39ecfceb4935261b3fed27cd6c69e71971609a204d53c35885e1e47f46999121037273a2726
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.0-r1.ebuild b/dev-java/javassist/javassist-3.29.0-r2.ebuild
index 40cf2a69b850..dd078cbb9c34 100644
--- a/dev-java/javassist/javassist-3.29.0-r1.ebuild
+++ b/dev-java/javassist/javassist-3.29.0-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.javassist.org"
 SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
-SLOT="3.29"
+SLOT="3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # Tests run: 431,  Failures: 6
@@ -30,10 +30,10 @@ RESTRICT="test"
 # test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
 # test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
 
-DEPEND=">=virtual/jdk-11:*"
+DEPEND=">=virtual/jdk-11:*
+	test? ( dev-java/hamcrest-library:1.3 )"
 
-# https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L156-L157
-RDEPEND=">=virtual/jre-8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
 
@@ -58,5 +58,7 @@ src_prepare() {
 src_test() {
 	default
 	einfo "Testing"
+	JAVA_PKG_WANT_SOURCE=11
+	JAVA_PKG_WANT_TARGET=11
 	java-pkg-simple_src_test
 }
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index 86363966d3ef..f4caad7c7386 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1,4 +1,6 @@
 AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f709152ce656f3864af8949ef47fc32fe9932dddac08cdc44887115444069b5852383177b17de162404c6d1c46a073558bcead SHA512 183ea6c131bc9d63172d34966950f6d7eca5aeb4b23e2b9fc4f6045ac2688cc8e2931ab7d1a986c36bedbc0521a7fc13263be3e5cebbf915b07d12c4e6aac5ec
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
+DIST metainf-services-1.9.tar.gz 5353 BLAKE2B a2d72b886169f6697033c56fa581e4fed9f69236a335397b0480111959e87e1d25ee16b96c6449b37b467aa68f0b4997873346416d8a09e3b14b911ffe37ffd4 SHA512 6d666c2582944e824cc66dd58c09474775e475146af7f8edcb4abce45eff6573481f550d8c37b854addd81825201207be7855b9bbc21f539559395a63e9fa261
 EBUILD metainf-services-1.7-r1.ebuild 579 BLAKE2B 204d9b2856a31b0b0b8132e5ddfeaf4f07f81e7920a4ddd41d09802ef94fb804d92b682736c7dd1d7b2b4ff6b2c8547ab63a085e05cb6f20a2a96b37ba1fe4f9 SHA512 30b4b933a1648cc356335df4005d820fa1c7b040452aafcf5f5cc2386d350a2bc8480c6961173ce95a31ed3926898c42b4be98cc002f7a078981bceb04f2c0b0
+EBUILD metainf-services-1.9.ebuild 527 BLAKE2B 4eef153ebbad5e37518444dbe90272b3435098e1858c2a82c05ffc63fd79802ed354090cdc229c7e1e8c2f02e1888c8b188c2c2de48489c94ef29f301ca6ffc1 SHA512 4f8338a348cf0129bf5b1f25c2dc7ec9b35ce5b407bc6a600960bbcaee71c3c6bac815196a95bf99c8b54d017bd6cab30431cab11bdf56b5b1b299ba1a8caf57
 MISC metadata.xml 336 BLAKE2B b113ab8fbfc9b92ca28ffd74d92fbea63d51e156566c0cb5292186efe18e8cc6b1e4c8d53efa1bade7d7ffacfed5780e699838805ac7ec6e2dd6684067fa9297 SHA512 1e1092dca56408b2ea5d09537f33d685c6ee97d59e62b1894f2fa24255d699b82c6aeb6fe7af90045bf4498035a6f45be93b843784ee1e89fdcf7ce165aeccc9
diff --git a/dev-java/metainf-services/metainf-services-1.9.ebuild b/dev-java/metainf-services/metainf-services-1.9.ebuild
new file mode 100644
index 000000000000..d8d62e7083e4
--- /dev/null
+++ b/dev-java/metainf-services/metainf-services-1.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generates META-INF/services files automatically"
+HOMEPAGE="https://metainf-services.kohsuke.org/"
+SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"