Adding metadata

5 files changed, 64 insertions, 5 deletions

diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 38b4ed181bbe..ab5ae1e084ca 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1 +1,2 @@
-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
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/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 6788adb48ee3..3c043e1a724f 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -1 +1,2 @@
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
+DIST metainf-services-1.9.tar.gz 5353 BLAKE2B a2d72b886169f6697033c56fa581e4fed9f69236a335397b0480111959e87e1d25ee16b96c6449b37b467aa68f0b4997873346416d8a09e3b14b911ffe37ffd4 SHA512 6d666c2582944e824cc66dd58c09474775e475146af7f8edcb4abce45eff6573481f550d8c37b854addd81825201207be7855b9bbc21f539559395a63e9fa261
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"