From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/
Date: Sat, 20 Mar 2021 08:29:23 +0000 (UTC) [thread overview]
Message-ID: <1616228959.7eb968c34b6f4bda3d7a72f1cc8740eaea11144d.fordfrog@gentoo> (raw)
commit: 7eb968c34b6f4bda3d7a72f1cc8740eaea11144d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Mar 17 17:09:50 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 08:29:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb968c3
dev-java/hamcrest-core: jdk 11 + EAPI 7
SRC_URI (:1.3) was from googlecode.com
Allow jdk:11
Closes: https://bugs.gentoo.org/751379
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/19981
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/hamcrest-core-1.1-java-11.patch | 42 +++++++++++++++
.../files/hamcrest-core-1.3-java-11.patch | 26 ++++++++++
dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild | 40 +++++++++++++++
dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild | 60 ++++++++++++++++++++++
4 files changed, 168 insertions(+)
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
new file mode 100644
index 00000000000..1e3805eb175
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
@@ -0,0 +1,42 @@
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+index d435303..962c945 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+@@ -1,6 +1,7 @@
+ package org.hamcrest.core;
+
+ import java.util.Arrays;
++import java.util.List;
+
+ import org.hamcrest.Description;
+ import org.hamcrest.Factory;
+@@ -32,7 +33,7 @@ public class AllOf<T> extends ShortcutCombination<T> {
+ */
+ @Factory
+ 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-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+index e003a7f..4ed9030 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -1,6 +1,7 @@
+ package org.hamcrest.core;
+
+ import java.util.Arrays;
++import java.util.List;
+
+ import org.hamcrest.Description;
+ import org.hamcrest.Factory;
+@@ -33,7 +34,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+ */
+ @Factory
+ public static <T> Matcher<T> anyOf(Matcher<? super T>... matchers) {
+- return anyOf(Arrays.asList(matchers));
++ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+ }
+
+ /**
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
new file mode 100644
index 00000000000..b250f1cc7c0
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
@@ -0,0 +1,26 @@
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+index a206b80..d55cf6b 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
+ */
+ @Factory
+ 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-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+index 55d08dd..2a46631 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+ */
+ @Factory
+ 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/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
new file mode 100644
index 00000000000..36347fc3a51
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-solaris"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ source? ( app-arch/zip )"
+
+S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
+
+PATCHES=(
+ # https://bugs.gentoo.org/751379
+ "${FILESDIR}"/hamcrest-core-1.1-java-11.patch
+)
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
new file mode 100644
index 00000000000..1af30d072f0
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+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 ~ppc-macos ~x64-macos"
+
+DEPEND="~dev-java/hamcrest-generator-${PV}:1.3
+ >=virtual/jdk-1.8:*
+ userland_GNU? ( sys-apps/findutils )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_BUILD_TARGET="core"
+
+PATCHES=(
+ # https://bugs.gentoo.org/751379
+ "${FILESDIR}"/hamcrest-core-1.3-java-11.patch
+)
+
+src_prepare() {
+ default
+ # Empty out the contents of the generator target; it has already been built.
+ eapply "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+
+ # Fix problems with Javadoc target.
+ eapply "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+
+ find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+
+ local cp="build/${P}.jar"
+ cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
+ EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+}
+
+src_install() {
+ java-pkg_newjar build/${P}.jar ${PN}.jar
+
+ dodoc README.txt CHANGES.txt
+
+ use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
+ use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
next reply other threads:[~2021-03-20 8:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-20 8:29 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-23 11:32 [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/ Miroslav Šulc
2022-09-05 18:45 Florian Schmaus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1616228959.7eb968c34b6f4bda3d7a72f1cc8740eaea11144d.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox