From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAD80158046 for ; Fri, 11 Oct 2024 09:56:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 031D2E29AC; Fri, 11 Oct 2024 09:56:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DE07DE29AC for ; Fri, 11 Oct 2024 09:56:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AF653431FA for ; Fri, 11 Oct 2024 09:56:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBA68B36 for ; Fri, 11 Oct 2024 09:56:02 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1728640539.a7e603cd7c86b94e393ec89da4ccfe41b40b1271.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest/, dev-java/hamcrest/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/hamcrest/Manifest dev-java/hamcrest/files/hamcrest-2.2-java-11.patch dev-java/hamcrest/hamcrest-2.2-r1.ebuild X-VCS-Directories: dev-java/hamcrest/files/ dev-java/hamcrest/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: a7e603cd7c86b94e393ec89da4ccfe41b40b1271 X-VCS-Branch: master Date: Fri, 11 Oct 2024 09:56:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a467b51b-dfff-4773-bd71-720b5709407f X-Archives-Hash: 262a94db9f9e07aeb0b76cd6ec7c21b5 commit: a7e603cd7c86b94e393ec89da4ccfe41b40b1271 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Oct 10 16:41:16 2024 +0000 Commit: Miroslav Šulc gentoo 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 pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/38836/commits/78df484159f3bf2bcb8f3b45d98772dd4756b359 Signed-off-by: Miroslav Šulc 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 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 -}