Adding metadata

7 files changed, 127 insertions, 30 deletions

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
index 1e3805eb1755..065cc5092b70 100644
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
@@ -1,5 +1,3 @@
-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 d435303..962c945 100644
 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
 +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
 @@ -1,6 +1,7 @@
@@ -19,8 +17,6 @@ index d435303..962c945 100644
      }
  
      /**
-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 e003a7f..4ed9030 100644
 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
 +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
 @@ -1,6 +1,7 @@
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
index b250f1cc7c01..9f68faecb6bf 100644
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
@@ -1,5 +1,3 @@
-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 a206b80..d55cf6b 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> {
@@ -11,8 +9,6 @@ index a206b80..d55cf6b 100644
      }

  

      /**

-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 55d08dd..2a46631 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> {
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 1af30d072f00..be9562ee2f45 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 MY_PN="hamcrest"
 MY_P="${MY_PN}-${PV}"
@@ -19,16 +19,15 @@ LICENSE="BSD-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
 
-DEPEND="~dev-java/hamcrest-generator-${PV}:1.3
-	>=virtual/jdk-1.8:*
+DEPEND=">=virtual/jdk-1.8:*
 	userland_GNU? ( sys-apps/findutils )"
 
 RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
 
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+JAVA_SRC_DIR="${PN}/src"
 
-EANT_BUILD_TARGET="core"
+DOCS=( {CHANGES,LICENSE,README}.txt )
 
 PATCHES=(
 	# https://bugs.gentoo.org/751379
@@ -37,24 +36,26 @@ PATCHES=(
 
 src_prepare() {
 	default
-	# Empty out the contents of the generator target; it has already been built.
-	eapply "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+	java-pkg_clean
+}
 
-	# Fix problems with Javadoc target.
-	eapply "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+src_compile() {
+	java-pkg-simple_src_compile
 
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+	# 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
 
-	local cp="build/${P}.jar"
-	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
-	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+	# Compile again, this time including the freshly generated "CoreMatchers.java"
+	java-pkg-simple_src_compile
 }
 
 src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
+	default
+	java-pkg-simple_src_install
 }
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
index 239b175a357d..85ed4c59f397 100644
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -6,7 +6,6 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="google-code">hamcrest</remote-id>
   <remote-id type="github">hamcrest/</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
new file mode 100644
index 000000000000..fb749dfe7d24
--- /dev/null
+++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-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-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
new file mode 100644
index 000000000000..9cbcd0747a15
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN/-library}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="dev-java/hamcrest-core:${SLOT}
+	>=virtual/jdk-1.8:*
+	userland_GNU? ( sys-apps/findutils )"
+RDEPEND="dev-java/hamcrest-core:${SLOT}
+	>=virtual/jre-1.8:*"
+BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
+
+JAVA_SRC_DIR="${PN}/src"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+
+DOCS=( {CHANGES,LICENSE,README}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/hamcrest-library-1.3-java-11.patch
+)
+
+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
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index 239b175a357d..85ed4c59f397 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -6,7 +6,6 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="google-code">hamcrest</remote-id>
   <remote-id type="github">hamcrest/</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>