commit: a7e603cd7c86b94e393ec89da4ccfe41b40b1271 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Oct 10 16:41:16 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Oct 11 09:55:39 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e603cd
dev-java/hamcrest: drop 2.2-r1 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/38836/commits/78df484159f3bf2bcb8f3b45d98772dd4756b359 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/hamcrest/Manifest | 1 - dev-java/hamcrest/files/hamcrest-2.2-java-11.patch | 127 --------------------- dev-java/hamcrest/hamcrest-2.2-r1.ebuild | 41 ------- 3 files changed, 169 deletions(-) diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest index f19c6fe1c13e..d6bae6b84872 100644 --- a/dev-java/hamcrest/Manifest +++ b/dev-java/hamcrest/Manifest @@ -1,2 +1 @@ -DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a DIST hamcrest-3.0.tar.gz 880513 BLAKE2B f2240a08d6d54e14a8e5441311127fc09f78c8a38a7dcf56d888827f716090cbf15e4a4a563ee56d5afc22574ca1d081276d0173e9361effd20ea3f5389e37a7 SHA512 7997afbc414d7ace3f150eb3ce775c10de4beb595deba02dd41f195e3d885e11dec9af1df4b92d36140217503aebb8c4b97192ed6f925f92287f72b0c2b1b6f5 diff --git a/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch deleted file mode 100644 index 83d8ddea9108..000000000000 --- a/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -index fc968e0..3bbc36e 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -@@ -67,7 +67,7 @@ public class ArrayMatching { - */ - @SafeVarargs - public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) { -- return arrayContainingInAnyOrder(asList(itemMatchers)); -+ return arrayContainingInAnyOrder((List<Matcher<? super E>>) asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -index 7e72a62..35ff806 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> { - * a list of matchers, each of which must be satisfied by an entry in an examined array - */ - public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) { -- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); -+ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -index c046914..312543f 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> { - * the matchers that must be satisfied by the items in the examined array - */ - 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/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -index d6a9a33..6b4e39e 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher - */ - @SafeVarargs - 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)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -index 0657768..383c552 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder<E> extends TypeSafeDiagnosingMa - */ - @SafeVarargs - public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) { -- return containsInRelativeOrder(asList(itemMatchers)); -+ return containsInRelativeOrder((List<Matcher<? super E>>) asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -index b8c3faa..e7e2550 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -@@ -4,6 +4,7 @@ import org.hamcrest.Description; - import org.hamcrest.DiagnosingMatcher; - import org.hamcrest.Matcher; - -+import java.util.List; - import java.util.Arrays; - - /** -@@ -56,6 +57,6 @@ public class AllOf<T> extends DiagnosingMatcher<T> { - */ - @SafeVarargs - public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) { -- return allOf(Arrays.asList(matchers)); -+ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers)); - } - } -diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -index 7a22c22..ba52275 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -@@ -3,6 +3,7 @@ package org.hamcrest.core; - import org.hamcrest.Description; - import org.hamcrest.Matcher; - -+import java.util.List; - import java.util.Arrays; - - /** -@@ -46,6 +47,6 @@ public class AnyOf<T> extends ShortcutCombination<T> { - */ - @SafeVarargs - 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/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -index e37efce..3ca6f96 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -@@ -57,7 +57,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> { - this.first = matcher; - } - public CombinableMatcher<X> and(Matcher<? super X> other) { -- return new CombinableMatcher<>(first).and(other); -+ return new CombinableMatcher<X>(first).and(other); - } - } - -@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> { - this.first = matcher; - } - public CombinableMatcher<X> or(Matcher<? super X> other) { -- return new CombinableMatcher<>(first).or(other); -+ return new CombinableMatcher<X>(first).or(other); - } - } - } diff --git a/dev-java/hamcrest/hamcrest-2.2-r1.ebuild b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild deleted file mode 100644 index 401f297eddd3..000000000000 --- a/dev-java/hamcrest/hamcrest-2.2-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.hamcrest:hamcrest:2.2" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Core API and libraries of hamcrest matcher framework." -HOMEPAGE="https://hamcrest.org/JavaHamcrest/"; -SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/JavaHamcrest-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* -" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch ) - -DOCS=( {CHANGES,README}.md ) - -JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest" -JAVA_SRC_DIR="hamcrest/src/main/java" -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="hamcrest/src/test/java" - -src_prepare() { - default - java-pkg-2_src_prepare -}
