From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-java/hamcrest/Manifest | 4 + dev-java/hamcrest/files/hamcrest-2.2-java-11.patch | 127 +++++++++++++++++++++ dev-java/hamcrest/hamcrest-2.2.ebuild | 49 ++++++++ dev-java/hamcrest/metadata.xml | 10 ++ 4 files changed, 190 insertions(+) create mode 100644 dev-java/hamcrest/Manifest create mode 100644 dev-java/hamcrest/files/hamcrest-2.2-java-11.patch create mode 100644 dev-java/hamcrest/hamcrest-2.2.ebuild create mode 100644 dev-java/hamcrest/metadata.xml (limited to 'dev-java/hamcrest') diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest new file mode 100644 index 000000000000..e645e22c9a71 --- /dev/null +++ b/dev-java/hamcrest/Manifest @@ -0,0 +1,4 @@ +AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556 +DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a +EBUILD hamcrest-2.2.ebuild 1164 BLAKE2B e40aa25739a6710f96f4b62890fe89436bfc29241ba9b75ce889a4b1bbc1b9eeb751350b5ddbf241a79c135be7f4a348468ed65ffc41bc82f67cee8abaabd324 SHA512 0ef16472e93bdc4bf636f05c77114f22dacd14ade33e696390d7d1e252970284b3b6950b9747f58e9e6013fe2f52c1ac2ba14f4f83004bce31d7323812ff7fdf +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 new file mode 100644 index 000000000000..83d8ddea9108 --- /dev/null +++ b/dev-java/hamcrest/files/hamcrest-2.2-java-11.patch @@ -0,0 +1,127 @@ +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.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild new file mode 100644 index 000000000000..6b0b18d4b6b5 --- /dev/null +++ b/dev-java/hamcrest/hamcrest-2.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom hamcrest-2.2.pom --download-uri https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz --slot 0 --keywords "~amd64" --ebuild hamcrest-2.2.ebuild + +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="http://hamcrest.org/JavaHamcrest/" +SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >=virtual/jdk-1.8:* +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch ) + +DOCS=( {CHANGES,README}.md ) + +S="${WORKDIR}/JavaHamcrest-${PV}" + +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 +} + +src_install() { + default # https://bugs.gentoo.org/789582 + java-pkg-simple_src_install +} diff --git a/dev-java/hamcrest/metadata.xml b/dev-java/hamcrest/metadata.xml new file mode 100644 index 000000000000..27becd4fbc1d --- /dev/null +++ b/dev-java/hamcrest/metadata.xml @@ -0,0 +1,10 @@ + + + + + java@gentoo.org + + + hamcrest/JavaHamcrest + + -- cgit v1.2.3