subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-java\/hamcrest\-core\/, dev\-java\/hamcrest\-core\/files\/"

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/

2022-09-05 Thread Florian Schmaus

commit: c13990421b033c45b8782015b4f77a04f4ac4533
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Aug 11 09:19:31 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Mon Sep  5 18:45:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1399042

dev-java/hamcrest-core: slot 1.3 use SRC_URI from Github, update EAPI 7 -> 8

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/hamcrest-core/Manifest|  1 +
 .../files/hamcrest-core-1.3-r3-java-11.patch   | 26 +++
 dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild | 53 ++
 3 files changed, 80 insertions(+)

diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 6c4ab7fb2a33..26d456730a41 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -1,2 +1,3 @@
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 
38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493
 SHA512 
5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 
07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105
 SHA512 
d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
+DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 
7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf
 SHA512 
4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch 
b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch
new file mode 100644
index ..21a957eb7212
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-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 a5daf94..23090b2 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 extends DiagnosingMatcher {
+  */
+ @Factory
+ public static  Matcher allOf(Matcher... matchers) {
+-return allOf(Arrays.asList(matchers));
++return allOf((List>) 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 de00677..fb551a2 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 extends ShortcutCombination {
+  */
+ @Factory
+ public static  AnyOf anyOf(Matcher... matchers) {
+-return anyOf(Arrays.asList(matchers));
++return anyOf((List>) Arrays.asList(matchers));
+ }
+ 
+ /**

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild 
b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
new file mode 100644
index ..26e415b9350e
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild
@@ -0,0 +1,53 @@
+# 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-core: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 ~ppc-macos ~x64-macos"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="dev-java/hamcrest-generator:1.3"
+
+DOCS=( {CHANGES,LICENSE,README}.txt )
+
+PATCHES=(
+   # https://bugs.gentoo.org/751379
+   "${FILESDIR}"/hamcrest-core-1.3-r3-java-11.patch
+)
+
+S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}"
+
+JAVA_SRC_DIR="${PN}/src"
+
+src_prepare() {
+   default
+   java-pkg_clean
+}
+
+src_compile() {
+   java-pkg-simple_src_compile
+
+   # Need to add this in order to generate "CoreMatchers.java" as with 
java-ant-2 was triggered by "build.xml"
+   "$(java-config -J)" \
+   -cp $(java-config --with-dependencies --classpath 
hamcrest-generator:1.3):${PN}.jar \
+   org.hamcrest.generator.config.XmlConfigurator \
+   core-matchers.xml \
+   hamcrest-core/src/main/java \
+   org.hamcrest.CoreMatchers \
+

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/

2021-03-23 Thread Miroslav Šulc

commit: 1bba1e847663a86acf3c21fe015656b905dfd0c1
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Mar 20 09:12:52 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar 23 11:24:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bba1e84

dev-java/hamcrest-core: Switch :1.3 to java-pkg-simple

Closes: https://bugs.gentoo.org/642534

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20019
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/hamcrest-core-1.1-java-11.patch  |  4 ---
 .../files/hamcrest-core-1.3-java-11.patch  |  4 ---
 dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild | 41 +++---
 dev-java/hamcrest-core/metadata.xml|  1 -
 4 files changed, 21 insertions(+), 29 deletions(-)

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
index 1e3805eb175..065cc5092b7 100644
--- 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
@@ -1,5 +1,3 @@
-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 @@
@@ -19,8 +17,6 @@ index d435303..962c945 100644
  }
  
  /**
-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 @@

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
index b250f1cc7c0..9f68faecb6b 100644
--- 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
@@ -1,5 +1,3 @@
-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 extends DiagnosingMatcher {
@@ -11,8 +9,6 @@ index a206b80..d55cf6b 100644
  }
  
  /**
-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 extends ShortcutCombination {

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild 
b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
index 1af30d072f0..be9562ee2f4 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 MY_PN="hamcrest"
 MY_P="${MY_PN}-${PV}"
@@ -19,16 +19,15 @@ 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:*
+DEPEND=">=virtual/jdk-1.8:*
userland_GNU? ( sys-apps/findutils )"
 
 RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
 
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+JAVA_SRC_DIR="${PN}/src"
 
-EANT_BUILD_TARGET="core"
+DOCS=( {CHANGES,LICENSE,README}.txt )
 
 PATCHES=(
# https://bugs.gentoo.org/751379
@@ -37,24 +36,26 @@ PATCHES=(
 
 src_prepare() {
default
-   # Empty out the contents of the generator target; it has already been 
built.
-   eapply "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+   java-pkg_clean
+}
 
-   # Fix problems with Javadoc target.
-   eapply "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+src_compile() {
+   java-pkg-simple_src_compile
 
-   find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled 
JAR files"
+   # Need to add this in order to generate "CoreMatchers.java" as with 
java-ant-2 was triggered by "build.xml"
+   "$(java-config -J)" \
+   -cp $(java-config --with-dependencies --classpath 
hamcrest-generator:1.3):${PN}.jar \
+   org.hamcrest.generator.config.XmlConfigurator \
+   core-matchers.xml \
+   hamcrest-core/src/main/java \
+   org.hamcrest.CoreMatchers

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/

2021-03-20 Thread Miroslav Šulc

commit: 7eb968c34b6f4bda3d7a72f1cc8740eaea11144d
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Mar 17 17:09:50 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Mar 20 08:29:19 2021 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19981
Signed-off-by: Miroslav Šulc  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 000..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 extends ShortcutCombination {
+  */
+ @Factory
+ public static  Matcher allOf(Matcher... matchers) {
+-return allOf(Arrays.asList(matchers));
++return allOf((List>) 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 extends ShortcutCombination {
+  */
+ @Factory
+ public static  Matcher anyOf(Matcher... matchers) {
+-return anyOf(Arrays.asList(matchers));
++return anyOf((List>) 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 000..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 extends DiagnosingMatcher {
+  */
+ @Factory
+ public static  Matcher allOf(Matcher... matchers) {
+-return allOf(Arrays.asList(matchers));
++return allOf((List>) 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 extends ShortcutCombination {
+  */
+ @Factory
+ public static  AnyOf anyOf(Matcher... matchers) {
+-return anyOf(Arrays.asList(matchers));
++return anyOf((List>) 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 000..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="
+

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/

3 matches

Site Navigation

Mail list logo

Footer information