gentoo auto-resync : 09:10:2022 - 13:31:59

3 files changed, 0 insertions, 85 deletions

diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 84f773d633bf..411a0129100c 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,10 +1,7 @@
 AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052a33ad0ef46d8982d39220e851584afcf67b7696a5770ffe2a61090020a7dc6925367e5eb13c4f0e3c6a621361825e1ac7 SHA512 21f5305ef9bb2b0c4c8f9eb5524dd31a621b6acad1447644f75afac5c87de6187617c3beb592cb934f6befe316735f1cfb72b34371fd4b7c09e893a99461a87a
-AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254
 AUX hamcrest-core-1.3-r3-java-11.patch 1188 BLAKE2B dd2da476e5aa44f48fbc049b53b44c0c9e9daf83ef0e73ebca173e3e5a2ef6b048d1f8d76cea4dd8b3a1609193e50e9e8ef180795421ee1cd43327e90ec2bef9 SHA512 29230981064580eae656bfc28ee8a2e14a7ef09f3182a206ed89d2e2bcc78ce76e9d7e0ad59b7e6c904d35c900a5511ddc49c31255755dfb231fb0ea5c20dd90
-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
 EBUILD hamcrest-core-1.1-r4.ebuild 822 BLAKE2B 2acba6df933c2683c10eba92c74c51a644959ff741b0682eb0b3515e5a86f1fe62dd9a3fb6567ea93e23a0828f9d217bdc42abeca4ac8de3be30e5a919b7aceb SHA512 ff6dbdd7aabb4399a6b9095fc3c3d73def8c0b5e440b4449e148662a96ac131506d0732915cd9731f9978e70a2712239ec0502caa61baf277650c86b0f451e37
-EBUILD hamcrest-core-1.3-r2.ebuild 1438 BLAKE2B 3670974af1592e9764547f8cb1f516b8ef209309b9943ca8a8d5953499f4fbc5f9e7d0756872a1263fab7c6c3243b0e77f93d934a0152def9c2adad5d421c01e SHA512 056d7b062e5150b035f4cd35c69c930f5930ac3157698998c92aff041e452cc68e0fda3d6ecf9403be7dde3b77605d4677ba318c0333152e6066449d3f262d79
 EBUILD hamcrest-core-1.3-r3.ebuild 1436 BLAKE2B 2a0494af0c402367ad9a8755e51d56f53ad9fd0a3c3657d4616701458c35ab6d8f8750a0fdbfc11dd66efac160601f6b74a6df5a4c388814c33f7e582685e4c6 SHA512 79cfc8ce8f6723bf5ef3f9a2caabc28b9b2dc200fa6d66789861bf77ce893276c1698d17033ff27d16ed05946d2df3203e411c8af9663d6df844418486e1c89f
 MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5
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
deleted file mode 100644
index 9f68faecb6bf..000000000000
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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));

-     }

- 

-     /**

---- 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.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
deleted file mode 100644
index dc0a524fea35..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.hamcrest:hamcrest-core:1.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
-
-JAVA_SRC_DIR="${PN}/src"
-
-DOCS=( {CHANGES,LICENSE,README}.txt )
-
-PATCHES=(
-	# https://bugs.gentoo.org/751379
-	"${FILESDIR}"/hamcrest-core-1.3-java-11.patch
-)
-
-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
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}