Adding metadata

11 files changed, 215 insertions, 3 deletions

diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 6c4ab7fb2a33..26d456730a41 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,2 +1,3 @@
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch
new file mode 100644
index 000000000000..21a957eb7212
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch
@@ -0,0 +1,26 @@
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+index a5daf94..23090b2 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
+      */
+     @Factory
+     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+-        return allOf(Arrays.asList(matchers));
++        return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ 
+     /**
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+index de00677..fb551a2 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+      */
+     @Factory
+     public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
+-        return anyOf(Arrays.asList(matchers));
++        return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ 
+     /**
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
index e8d9fbe997ec..d8b3c2e8df34 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -11,7 +11,7 @@ MY_PN="hamcrest"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
 SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index 27f4ffa43866..dc0a524fea35 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
 SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
new file mode 100644
index 000000000000..53e789b76cc3
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.hamcrest:hamcrest-core:1.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="dev-java/hamcrest-generator:1.3"
+
+DOCS=( {CHANGES,LICENSE,README}.txt )
+
+PATCHES=(
+	# https://bugs.gentoo.org/751379
+	"${FILESDIR}"/hamcrest-core-1.3-r3-java-11.patch
+)
+
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Need to add this in order to generate "CoreMatchers.java" as with java-ant-2 was triggered by "build.xml"
+	"$(java-config -J)" \
+		-cp $(java-config --with-dependencies --classpath hamcrest-generator:1.3):${PN}.jar \
+		org.hamcrest.generator.config.XmlConfigurator \
+		core-matchers.xml \
+		hamcrest-core/src/main/java \
+		org.hamcrest.CoreMatchers \
+		hamcrest-core/src/main/java
+
+	# Compile again, this time including the freshly generated "CoreMatchers.java"
+	java-pkg-simple_src_compile
+}
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 480364f4e8f4..42f381d82b57 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -1 +1,2 @@
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild
new file mode 100644
index 000000000000..401c4fb05f9a
--- /dev/null
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+
+CP_DEPEND="dev-java/qdox:1.12"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src/main/java"
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 480364f4e8f4..42f381d82b57 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1 +1,2 @@
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch
new file mode 100644
index 000000000000..5e1103d3fbfe
--- /dev/null
+++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch
@@ -0,0 +1,44 @@
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+      */
+     @Factory
+     public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
+-        return containsInAnyOrder(Arrays.asList(itemMatchers));
++        return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
+      */
+     @Factory
+     public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
+-        return contains(asList(itemMatchers));
++        return contains((List<Matcher<? super E>>) asList(itemMatchers));
+     }
+ 
+     /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+      */
+     @Factory
+     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+-        return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++        return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+      */
+     @Factory
+     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
+-        return arrayContaining(asList(itemMatchers));
++        return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
+     }
+ 
+     /**
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
new file mode 100644
index 000000000000..c695c5a0b075
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="dev-java/hamcrest-core:1.3"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="dev-java/hamcrest-generator:1.3"
+
+JAVA_SRC_DIR="${PN}/src"
+
+DOCS=( {CHANGES,LICENSE,README}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/hamcrest-library-1.3-r3-java-11.patch
+)
+
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Generate "Matchers.java" (java-pkg-simple does not use the "build.xml" file)
+	"$(java-config -J)" \
+		-cp $(java-config --with-dependencies --classpath hamcrest-core:1.3,hamcrest-generator:1.3):${PN}.jar \
+		org.hamcrest.generator.config.XmlConfigurator \
+		matchers.xml \
+		hamcrest-core/src/main/java,hamcrest-library/src/main/java \
+		org.hamcrest.Matchers \
+		hamcrest-library/src/main/java
+
+	# Compile again, this time including the freshly generated "Matchers.java"
+	java-pkg-simple_src_compile
+}
diff --git a/dev-java/maven-bin/maven-bin-3.8.6.ebuild b/dev-java/maven-bin/maven-bin-3.8.6.ebuild
index 8f533bbc4a50..2866b9890bf2 100644
--- a/dev-java/maven-bin/maven-bin-3.8.6.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.8"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*