From 0234994edb2122d4508c5a07122e774bcab9195b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 5 Sep 2022 22:25:21 +0100 Subject: gentoo auto-resync : 05:09:2022 - 22:25:20 --- dev-java/hamcrest-library/Manifest | 3 ++ .../files/hamcrest-library-1.3-r3-java-11.patch | 44 ++++++++++++++++ .../hamcrest-library-1.3-r3.ebuild | 58 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch create mode 100644 dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild (limited to 'dev-java/hamcrest-library') diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest index 7e9c34147097..d3977ec4c38a 100644 --- a/dev-java/hamcrest-library/Manifest +++ b/dev-java/hamcrest-library/Manifest @@ -1,4 +1,7 @@ AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf +AUX hamcrest-library-1.3-r3-java-11.patch 2291 BLAKE2B 70f93e95538b3110fd4a70b68cd9eee562ebde899716e9c7706be308f917f26abe5ada399722815d873c7a8c99bff1d54b87a226eb94e1835f1912af85fe89b2 SHA512 1767eed42bda30fb799a4e3cb37382c5885eff194b2009fb8c1bf12ac76af903669944fcf581eb8440aca88315adf947297d6f893c18b276e99075398c2cddbb DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 +DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b EBUILD hamcrest-library-1.3-r2.ebuild 1503 BLAKE2B fb98d145b85162ac56a2a832f6e27008024c4f2125ee1e3bf4a1f4b4520c884c2c21377bfef9fbb07afe5b0235f7473b3583e9737d07896fe59b45301248d765 SHA512 334452a0d983ce4cd59fbdcb0738f54548604976f1724318d6cc2701e3496930987b0f65042e2d3e0df169fda2389fa6002839bb9d951dab20dac967d64cfc9e +EBUILD hamcrest-library-1.3-r3.ebuild 1444 BLAKE2B 1abf17fed83c9a593cc68526f205ecc824c2bda1dd0f250ae1c1032e7f5753d1b45b0b3a7d0a05a00484a44c2c446bb39c7809454746170480cf2878d23ca91b SHA512 e9734e74c20793277d07c743d1bda4b7ff138e7f82d424cda5f810d0a2fdedd869dbb68450d858a267f0245c27ce4b5b79f0c674d3b4d6c22eb495d85afb6f6c MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5 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 extends TypeSafeDiagnosingMatcher + */ + @Factory + public static Matcher> containsInAnyOrder(Matcher... itemMatchers) { +- return containsInAnyOrder(Arrays.asList(itemMatchers)); ++ return containsInAnyOrder((List>) 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 extends TypeSafeDiagnosingMatcher Matcher> contains(Matcher... itemMatchers) { +- return contains(asList(itemMatchers)); ++ return contains((List>) 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 extends TypeSafeMatcher { + */ + @Factory + public static Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { +- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); ++ return arrayContainingInAnyOrder((List>) 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 extends TypeSafeMatcher { + */ + @Factory + public static Matcher arrayContaining(Matcher... itemMatchers) { +- return arrayContaining(asList(itemMatchers)); ++ return arrayContaining((List>) 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 +} -- cgit v1.2.3