diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2022-10-09 07:56:15 +0200 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2022-10-09 09:33:28 +0200 |
| commit | a79e89bb51cddc7dc7adc83a997443dc0b5b9259 (patch) | |
| tree | 0577224500c8400a892511105105b8939984f4c3 | |
| parent | dev-java/mockito: drop 4.6.1-r1 (diff) | |
| download | gentoo-a79e89bb51cddc7dc7adc83a997443dc0b5b9259.tar.gz gentoo-a79e89bb51cddc7dc7adc83a997443dc0b5b9259.tar.bz2 gentoo-a79e89bb51cddc7dc7adc83a997443dc0b5b9259.zip | |
dev-java/hamcrest-core: drop 1.3-r2
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
| -rw-r--r-- | dev-java/hamcrest-core/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch | 22 | ||||
| -rw-r--r-- | dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild | 60 |
3 files changed, 0 insertions, 83 deletions
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest index 26d456730a41..53b1379edb09 100644 --- a/dev-java/hamcrest-core/Manifest +++ b/dev-java/hamcrest-core/Manifest @@ -1,3 +1,2 @@ -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-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 -} |