gentoo resync : 27.03.2021

6 files changed, 28 insertions, 36 deletions

diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 23e284d15961..99aab5975d31 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,11 +1,11 @@
 AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
-AUX hamcrest-core-1.1-java-11.patch 1516 BLAKE2B 0a6c7fdc74015377075f174149a1fe2f55a3a4e782490c5bc7cac4abc3b0f8996e39dd98c094637f9899b58b15f9339b800154e4ab380395c06167c28d603076 SHA512 43b084fafa7d1c69f3cd6924e3446c32f20481da1148a77d2dc9021a439257eaa518e3b57a8049f3212cba75f62e1cd3db2c6feea36e28a6c93584fbb48ee968
+AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052a33ad0ef46d8982d39220e851584afcf67b7696a5770ffe2a61090020a7dc6925367e5eb13c4f0e3c6a621361825e1ac7 SHA512 21f5305ef9bb2b0c4c8f9eb5524dd31a621b6acad1447644f75afac5c87de6187617c3beb592cb934f6befe316735f1cfb72b34371fd4b7c09e893a99461a87a
 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
-AUX hamcrest-core-1.3-java-11.patch 1204 BLAKE2B 25f17238124829786bd3c8dbc468536f8a6bb684531e7859c003789249c88307d063aaf5b3e47abca5a93884bb3378d9197ce112d3237eaf1d021ad75e678e61 SHA512 6269c90835fea7387e5f830160c536eb91ab3037ed2e9bd5142f8cd2029fbea9e9baf374aa0fba98e0d59f0a0e83cd41f1d81265d94099013b81841253a85f20
+AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
 EBUILD hamcrest-core-1.1-r3.ebuild 716 BLAKE2B a0442ff57be2628e59b831794fb9e48cb54d1ae88abd9ab69bdfe39195e55c16da9234241af00378345e21dd4b98421b625a3e42ffe254f57b2b4fd0a4b8cb55 SHA512 8138d54074543ccbf142647639eb45efd304b0bceffcd0fbe942e3dfcfe565d15c184178661495717aee507196284543a7d4f596e0ea828f1b1871d6ba29f260
-EBUILD hamcrest-core-1.1-r4.ebuild 819 BLAKE2B 3f493eba6cefdb44388ce7ff68358973124e501d4d64baa3db1ed090fc14879ea84cdc703a5735101980a7b65b9c3cca6fd0128e3faa70e70af42a1f54a7d80e SHA512 67e6a9862994324c14eae28d426ff1b9265bec1fb1ccb82ada71f2b376b13ec57d010c10678fc570ef60b6cf6a05a15558901ecaf0aee8f4e092db8a571f542c
+EBUILD hamcrest-core-1.1-r4.ebuild 815 BLAKE2B cdffa29ff20d6b06b31d603bc2c55bfc5d5c492eb7e6cb778b0287b6d6f11acaab57a17f31640a94972f68c3c57afa8c83cb613de3e258ff35e7dcd6628befd1 SHA512 b77edf3f90c512774e0b959a6792b99380bd8a467c3251652f95f98d65ca134d429b06dffdacb8fb4b2b14c3a8bcf384b3373603733ad6c0566092f9ce63b4a0
 EBUILD hamcrest-core-1.3-r1.ebuild 1508 BLAKE2B 9d6f9a554c9194ae529da1323cb299012e0c9e24eb824abc81c97832d6bb3388278b1d2b70c2ab63a881d90e7e37051ab8a77775ebe58b6718f60a19a02a39cc SHA512 0c4e858cabb30eb516ee565bc12a34b3a10c160b8604a6c2ea7c64fdf1ef7f18f307bfd1f6dde9689606fc1396b67c54ed129c49bf92affa91917033ffddd510
-EBUILD hamcrest-core-1.3-r2.ebuild 1589 BLAKE2B 836857be5cc28379c345ded0738cb3d48dc43096d804b80bdb9e2345961a53b6b084e3e0fe39ef18fdb81cbf226005d1f6e82e7ae219db8467588043287a3e56 SHA512 9be6623ef6703d1a6dd930d4000d939de5d11f65221f9bcb4e537e6e9804a5cb3a9fa50d9661bd7af57950366d4f5bd825ecdd7e90a814f08bce4fab6fbdc5f3
-MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
+EBUILD hamcrest-core-1.3-r2.ebuild 1428 BLAKE2B ccbf85dcb4938e66ec439a2bda18a1703624031d34a40d6e5fd8f3127196376b0f2b3e4b924ff98c3530ca0fca7dd40fe13a45956268904f0e5f64d385f41b3f SHA512 a9dc9ca58c6a152b0800959098399b354009d6f0218228d0e10c32243537ff59beecd94a0183eaac6e60315a7bfd037cf945deabac27a9e50ad7e87a0b1e076e
+MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
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.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
index 36347fc3a513..4023e0a16ff8 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x64-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.8:*"
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..1828b5a8a3f8 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}"
@@ -17,18 +17,17 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"
+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 b09ef005001e..7ee93b2f2b47 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>
 </pkgmetadata>