From 3980ecf15e6202ac2f2015045b549600e709b721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Oct 2024 04:04:10 +0100 Subject: gentoo auto-resync : 12:10:2024 - 04:04:10 --- dev-java/hamcrest/Manifest | 3 - dev-java/hamcrest/files/hamcrest-2.2-java-11.patch | 127 --------------------- dev-java/hamcrest/hamcrest-2.2-r1.ebuild | 41 ------- 3 files changed, 171 deletions(-) delete mode 100644 dev-java/hamcrest/files/hamcrest-2.2-java-11.patch delete mode 100644 dev-java/hamcrest/hamcrest-2.2-r1.ebuild (limited to 'dev-java/hamcrest') diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest index e063b4570826..eba08d2122b1 100644 --- a/dev-java/hamcrest/Manifest +++ b/dev-java/hamcrest/Manifest @@ -1,6 +1,3 @@ -AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556 -DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a DIST hamcrest-3.0.tar.gz 880513 BLAKE2B f2240a08d6d54e14a8e5441311127fc09f78c8a38a7dcf56d888827f716090cbf15e4a4a563ee56d5afc22574ca1d081276d0173e9361effd20ea3f5389e37a7 SHA512 7997afbc414d7ace3f150eb3ce775c10de4beb595deba02dd41f195e3d885e11dec9af1df4b92d36140217503aebb8c4b97192ed6f925f92287f72b0c2b1b6f5 -EBUILD hamcrest-2.2-r1.ebuild 912 BLAKE2B c4efa76a1c6b935fd6abdc4bdcec98e1f5bde829aa6316b8fca97c7898f28d05acc22cb34f5affec327fcc5410551c3ef196f0fb6280f028f4adf7df400ed9ae SHA512 81a189bab441d2593cfa2091acdbc4a905ed080f5b86fb505b58c4f565be157c3b124e6b73c9804cf0c47887301a75ee5b1738e077accfec62af94bbe41efef5 EBUILD hamcrest-3.0.ebuild 799 BLAKE2B 006ac976260fe42dd698a450d9e2bfef862966aaf254fe8dcdfc5730cffdc1aff885d141ddb6ca2edd5767abdc813539dade17b791df81596b689b73797c58db SHA512 731dfa621d9c1de2d85933f6b9820d65749f1a594a0e5ad0a92704d8308a7f47f2ea7e47b89e5e677830d39ddf780f435fb927a2793b937b581b6df5364a387b MISC metadata.xml 303 BLAKE2B b415b83e9cd87ea6d0c58b8096930a08d4f3732068be492e201820cfef6599045327972bdc36d5936fc2f04c49b5c82c16b64b808edc882f863047989c94256e SHA512 97de5ee8a7aa583829434d5768522c3d73cebbc70a44874cafc87f0827d595d01b6b545b9709ec24f034e3c62527627828c6c0b0ac158cc6a7c4a633bb26748f 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 Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { -- return arrayContainingInAnyOrder(asList(itemMatchers)); -+ return arrayContainingInAnyOrder((List>) 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 extends TypeSafeMatcher { - * a list of matchers, each of which must be satisfied by an entry in an examined array - */ - public static Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { -- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); -+ return arrayContainingInAnyOrder((List>) 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 extends TypeSafeMatcher { - * the matchers that must be satisfied by the items in the examined array - */ - public static Matcher arrayContaining(Matcher... itemMatchers) { -- return arrayContaining(asList(itemMatchers)); -+ return arrayContaining((List>) 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 extends TypeSafeDiagnosingMatcher - */ - @SafeVarargs - public static Matcher> containsInAnyOrder(Matcher... itemMatchers) { -- return containsInAnyOrder(Arrays.asList(itemMatchers)); -+ return containsInAnyOrder((List>) 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 extends TypeSafeDiagnosingMa - */ - @SafeVarargs - public static Matcher> containsInRelativeOrder(Matcher... itemMatchers) { -- return containsInRelativeOrder(asList(itemMatchers)); -+ return containsInRelativeOrder((List>) 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 extends DiagnosingMatcher { - */ - @SafeVarargs - public static Matcher allOf(Matcher... matchers) { -- return allOf(Arrays.asList(matchers)); -+ return allOf((List>) 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 extends ShortcutCombination { - */ - @SafeVarargs - public static AnyOf anyOf(Matcher... matchers) { -- return anyOf(Arrays.asList(matchers)); -+ return anyOf((List>) 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 extends TypeSafeDiagnosingMatcher { - this.first = matcher; - } - public CombinableMatcher and(Matcher other) { -- return new CombinableMatcher<>(first).and(other); -+ return new CombinableMatcher(first).and(other); - } - } - -@@ -76,7 +76,7 @@ public class CombinableMatcher extends TypeSafeDiagnosingMatcher { - this.first = matcher; - } - public CombinableMatcher or(Matcher other) { -- return new CombinableMatcher<>(first).or(other); -+ return new CombinableMatcher(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 -} -- cgit v1.2.3