* [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/files/, dev-java/hamcrest-library/
@ 2021-03-23 11:38 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-03-23 11:38 UTC (permalink / raw
To: gentoo-commits
commit: bd533e235aaed52b228da10d149e3ec5ee54ba3b
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Mar 21 22:49:07 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 23 11:34:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd533e23
dev-java/hamcrest-library: EAPI 7
Switch to java-pkg-simple
Adjustments for java 11
Use mirror://gentoo for SRC_URI
Remove obsolete remote-id
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20062
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/hamcrest-library-1.3-java-11.patch | 44 +++++++++++++++
.../hamcrest-library-1.3-r2.ebuild | 62 ++++++++++++++++++++++
dev-java/hamcrest-library/metadata.xml | 1 -
3 files changed, 106 insertions(+), 1 deletion(-)
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
new file mode 100644
index 00000000000..fb749dfe7d2
--- /dev/null
+++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
@@ -0,0 +1,44 @@
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+ */
+ @Factory
+ 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));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
+ */
+ @Factory
+ public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
+- return contains(asList(itemMatchers));
++ return contains((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+ */
+ @Factory
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+ */
+ @Factory
+ 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/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
new file mode 100644
index 00000000000..9cbcd0747a1
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN/-library}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="dev-java/hamcrest-core:${SLOT}
+ >=virtual/jdk-1.8:*
+ userland_GNU? ( sys-apps/findutils )"
+RDEPEND="dev-java/hamcrest-core:${SLOT}
+ >=virtual/jre-1.8:*"
+BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
+
+JAVA_SRC_DIR="${PN}/src"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+
+DOCS=( {CHANGES,LICENSE,README}.txt )
+
+PATCHES=(
+ "${FILESDIR}"/hamcrest-library-1.3-java-11.patch
+)
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+
+ # Generate "Matchers.java" (java-pkg-simple does not use the "build.xml" file)
+ "$(java-config -J)" \
+ -cp $(java-config --with-dependencies --classpath hamcrest-core:1.3,hamcrest-generator:1.3):${PN}.jar \
+ org.hamcrest.generator.config.XmlConfigurator \
+ matchers.xml \
+ hamcrest-core/src/main/java,hamcrest-library/src/main/java \
+ org.hamcrest.Matchers \
+ hamcrest-library/src/main/java
+
+ # Compile again, this time including the freshly generated "Matchers.java"
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ default
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index b09ef005001..7ee93b2f2b4 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -6,7 +6,6 @@
<name>Java</name>
</maintainer>
<upstream>
- <remote-id type="google-code">hamcrest</remote-id>
<remote-id type="github">hamcrest/</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/files/, dev-java/hamcrest-library/
@ 2021-03-27 8:00 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-03-27 8:00 UTC (permalink / raw
To: gentoo-commits
commit: 0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 08:00:42 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 08:00:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3e51b0
dev-java/hamcrest-library: removed obsolete 1.3-r1
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/1.3-remove-targets.patch | 47 -------------------
.../hamcrest-library-1.3-r1.ebuild | 52 ----------------------
2 files changed, 99 deletions(-)
diff --git a/dev-java/hamcrest-library/files/1.3-remove-targets.patch b/dev-java/hamcrest-library/files/1.3-remove-targets.patch
deleted file mode 100644
index 6923b0bcc68..00000000000
--- a/dev-java/hamcrest-library/files/1.3-remove-targets.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 1cfd4fb..185c563 100644
---- a/build.xml
-+++ b/build.xml
-@@ -12,42 +12,9 @@
- </target>
-
- <target name="generator" description="Build code generator tool">
-- <java-to-jar srcdir="hamcrest-generator/src/main/java"
-- modulename="hamcrest-generator-nodeps"
-- classpath="lib/generator/qdox-1.12.jar"/>
--
-- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
-- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
-- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
-- <zipfileset src="lib/generator/qdox-1.12.jar"/>
-- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
-- </jarjar>
-- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
- </target>
-
- <target name="core" depends="generator" description="Build core Hamcrest library">
-- <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>
--
-- <!-- Generate one class with all static imports -->
-- <mkdir dir="build/temp/hamcrest-core/generated-code"/>
--
-- <java classname="org.hamcrest.generator.config.XmlConfigurator"
-- fork="yes"
-- failonerror="yes"
-- classpath="
-- build/hamcrest-core-${version}.jar;
-- build/hamcrest-generator-${version}.jar;
-- ">
-- <arg value="core-matchers.xml"/>
-- <arg value="hamcrest-core/src/main/java"/>
-- <arg value="org.hamcrest.CoreMatchers"/>
-- <arg value="build/temp/hamcrest-core/generated-code"/>
-- </java>
-- <!-- Append to core jar -->
-- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
-- modulename="hamcrest-core"
-- classpath="build/hamcrest-core-${version}.jar"/>
- </target>
-
- <target name="library"
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
deleted file mode 100644
index b26fd124cfc..00000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-CDEPEND="
- dev-java/hamcrest-generator:${SLOT}
- dev-java/hamcrest-core:${SLOT}
- dev-java/qdox:1.12
-"
-DEPEND=">=virtual/jdk-1.6
- userland_GNU? ( sys-apps/findutils )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-generator-${SLOT},hamcrest-core-${SLOT},qdox-1.12"
-EANT_BUILD_TARGET="library"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
- # remove core+generator target as they are already built.
- epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
- find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
- java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
-
- use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/files/, dev-java/hamcrest-library/
@ 2022-09-05 18:45 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2022-09-05 18:45 UTC (permalink / raw
To: gentoo-commits
commit: 6abe431abe3321ae3d71377afd9fa280b101048b
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Aug 11 09:53:31 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 18:45:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abe431a
dev-java/hamcrest-library: use SRC_URI from Github, update EAPI 7 -> 8
* Add 'doc' to JAVA_PKG_IUSE
* https for HOMEPAGE
* SRC_URI, use github instead of mirror://gentoo
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26822
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/hamcrest-library/Manifest | 1 +
.../files/hamcrest-library-1.3-r3-java-11.patch | 44 ++++++++++++++++
.../hamcrest-library-1.3-r3.ebuild | 58 ++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 480364f4e8f4..42f381d82b57 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1 +1,2 @@
DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch
new file mode 100644
index 000000000000..5e1103d3fbfe
--- /dev/null
+++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch
@@ -0,0 +1,44 @@
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+ */
+ @Factory
+ 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));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
+ */
+ @Factory
+ public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
+- return contains(asList(itemMatchers));
++ return contains((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+ */
+ @Factory
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+ */
+ @Factory
+ 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/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
new file mode 100644
index 000000000000..c695c5a0b075
--- /dev/null
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="dev-java/hamcrest-core:1.3"
+
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+BDEPEND="dev-java/hamcrest-generator:1.3"
+
+JAVA_SRC_DIR="${PN}/src"
+
+DOCS=( {CHANGES,LICENSE,README}.txt )
+
+PATCHES=(
+ "${FILESDIR}"/hamcrest-library-1.3-r3-java-11.patch
+)
+
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+
+ # Generate "Matchers.java" (java-pkg-simple does not use the "build.xml" file)
+ "$(java-config -J)" \
+ -cp $(java-config --with-dependencies --classpath hamcrest-core:1.3,hamcrest-generator:1.3):${PN}.jar \
+ org.hamcrest.generator.config.XmlConfigurator \
+ matchers.xml \
+ hamcrest-core/src/main/java,hamcrest-library/src/main/java \
+ org.hamcrest.Matchers \
+ hamcrest-library/src/main/java
+
+ # Compile again, this time including the freshly generated "Matchers.java"
+ java-pkg-simple_src_compile
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/files/, dev-java/hamcrest-library/
@ 2022-10-09 7:33 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2022-10-09 7:33 UTC (permalink / raw
To: gentoo-commits
commit: e72aa153fc647564e901c252a3fe899a72ddc7ca
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Oct 9 06:01:10 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 07:33:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e72aa153
dev-java/hamcrest-library: drop 1.3-r2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27702
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/hamcrest-library/Manifest | 1 -
.../files/hamcrest-library-1.3-java-11.patch | 44 ---------------
.../hamcrest-library-1.3-r2.ebuild | 62 ----------------------
3 files changed, 107 deletions(-)
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 42f381d82b57..1139a7ccc0a9 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,2 +1 @@
-DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
deleted file mode 100644
index fb749dfe7d24..000000000000
--- a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
-@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
- */
- @Factory
- 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));
- }
-
- /**
---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
-@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
- */
- @Factory
- public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
-- return contains(asList(itemMatchers));
-+ return contains((List<Matcher<? super E>>) asList(itemMatchers));
- }
-
- /**
---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
-@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
- */
- @Factory
- public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
-- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
-+ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
- }
-
- /**
---- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
-+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
-@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
- */
- @Factory
- 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/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
deleted file mode 100644
index 116e14e5b5b7..000000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="dev-java/hamcrest-core:${SLOT}
- >=virtual/jdk-1.8:*"
-RDEPEND="dev-java/hamcrest-core:${SLOT}
- >=virtual/jre-1.8:*"
-BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
-
-JAVA_SRC_DIR="${PN}/src"
-JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
-
-DOCS=( {CHANGES,LICENSE,README}.txt )
-
-PATCHES=(
- "${FILESDIR}"/hamcrest-library-1.3-java-11.patch
-)
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-
- # Generate "Matchers.java" (java-pkg-simple does not use the "build.xml" file)
- "$(java-config -J)" \
- -cp $(java-config --with-dependencies --classpath hamcrest-core:1.3,hamcrest-generator:1.3):${PN}.jar \
- org.hamcrest.generator.config.XmlConfigurator \
- matchers.xml \
- hamcrest-core/src/main/java,hamcrest-library/src/main/java \
- org.hamcrest.Matchers \
- hamcrest-library/src/main/java
-
- # Compile again, this time including the freshly generated "Matchers.java"
- java-pkg-simple_src_compile
-}
-
-src_install() {
- default
- java-pkg-simple_src_install
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-09 7:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-05 18:45 [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/files/, dev-java/hamcrest-library/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2022-10-09 7:33 Miroslav Šulc
2021-03-27 8:00 Miroslav Šulc
2021-03-23 11:38 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox