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

2022-10-09 Thread Miroslav Šulc 
commit: e72aa153fc647564e901c252a3fe899a72ddc7ca
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Oct  9 06:01:10 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Oct  9 07:33:28 2022 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27702
Signed-off-by: Miroslav Šulc  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..
--- 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 extends 
TypeSafeDiagnosingMatcher
-  */
- @Factory
- public static  Matcher> 
containsInAnyOrder(Matcher... itemMatchers) {
--return containsInAnyOrder(Arrays.asList(itemMatchers));
-+return containsInAnyOrder((List>) 
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 extends 
TypeSafeDiagnosingMatcher Matcher> contains(Matcher... itemMatchers) {
--return contains(asList(itemMatchers));
-+return contains((List>) 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 extends 
TypeSafeMatcher {
-  */
- @Factory
- public static  Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) {
--return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
-+return arrayContainingInAnyOrder((List>) 
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 extends 
TypeSafeMatcher {
-  */
- @Factory
- public static  Matcher arrayContaining(Matcher... 
itemMatchers) {
--return arrayContaining(asList(itemMatchers));
-+return arrayContaining((List>) 
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..
--- 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"
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2022-10-08 Thread Sam James 
commit: 71080e4e2be0f67edf4f38ba141c42883b7b4531
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 19:52:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 19:52:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71080e4e

dev-java/hamcrest-library: Stabilize 1.3-r3 arm64, #875398

Signed-off-by: Sam James  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
index 8c4511ea30f9..1fb31d824ea8 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/hamcrest-core:1.3"

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2022-10-05 Thread Sam James 
commit: 542bf3db1b1cc889bfec05f407578f625f0828cb
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  5 19:00:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  5 19:00:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542bf3db

dev-java/hamcrest-library: Stabilize 1.3-r3 x86, #875398

Signed-off-by: Sam James  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
index 485a68822917..4317925ea931 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/hamcrest-core:1.3"

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2022-10-05 Thread Sam James 
commit: 536e19b8447bb653330b53649b36797e32c019d0
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  5 19:00:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  5 19:00:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536e19b8

dev-java/hamcrest-library: Stabilize 1.3-r3 amd64, #875398

Signed-off-by: Sam James  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
index 4317925ea931..8c4511ea30f9 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/hamcrest-core:1.3"

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2022-10-05 Thread Arthur Zamarin 
commit: 2c314ad1b00623fbf406e84acc688d7fb82feb2c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  5 18:55:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  5 18:55:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c314ad1

dev-java/hamcrest-library: Stabilize 1.3-r3 ppc64, #875398

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
index c695c5a0b075..485a68822917 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 
 CP_DEPEND="dev-java/hamcrest-core:1.3"

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

2022-09-05 Thread Florian Schmaus 
commit: 6abe431abe3321ae3d71377afd9fa280b101048b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Aug 11 09:53: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=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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26822
Signed-off-by: Florian Schmaus  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 ..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 extends 
TypeSafeDiagnosingMatcher
+  */
+ @Factory
+ public static  Matcher> 
containsInAnyOrder(Matcher... itemMatchers) {
+-return containsInAnyOrder(Arrays.asList(itemMatchers));
++return containsInAnyOrder((List>) 
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 extends 
TypeSafeDiagnosingMatcher Matcher> contains(Matcher... itemMatchers) {
+-return contains(asList(itemMatchers));
++return contains((List>) 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 extends 
TypeSafeMatcher {
+  */
+ @Factory
+ public static  Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) {
+-return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++return arrayContainingInAnyOrder((List>) 
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 extends 
TypeSafeMatcher {
+  */
+ @Factory
+ public static  Matcher arrayContaining(Matcher... 
itemMatchers) {
+-return arrayContaining(asList(itemMatchers));
++return arrayContaining((List>) 
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 ..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}
+

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2022-04-27 Thread Florian Schmaus 
commit: 0873830144ac8dd8f136d1b9ccc42f4dec1a21e5
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Apr 27 08:08:43 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Apr 27 08:45:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08738301

dev-java/hamcrest-library: update HOMEPAGE, remote-id

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25223
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild | 2 +-
 dev-java/hamcrest-library/metadata.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index 3ab303aebbcd..116e14e5b5b7 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest;
+HOMEPAGE="http://hamcrest.org/JavaHamcrest/;
 SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"

diff --git a/dev-java/hamcrest-library/metadata.xml 
b/dev-java/hamcrest-library/metadata.xml
index f94f57c00f21..4de8b3f48a51 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -6,6 +6,6 @@
Java


-   hamcrest/
+   hamcrest/JavaHamcrest

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2022-01-06 Thread David Seifert 
commit: 63a94fb7c4e799d855268ea3ae6eac2af3fac15f
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jan  6 09:06:56 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan  6 09:06:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a94fb7

dev-java/hamcrest-library: remove userland_GNU

Signed-off-by: David Seifert  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index afa5bc55ca58..3ab303aebbcd 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,8 +21,7 @@ SLOT="${PV}"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="dev-java/hamcrest-core:${SLOT}
-   >=virtual/jdk-1.8:*
-   userland_GNU? ( sys-apps/findutils )"
+   >=virtual/jdk-1.8:*"
 RDEPEND="dev-java/hamcrest-core:${SLOT}
>=virtual/jre-1.8:*"
 BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2021-04-05 Thread Miroslav Šulc 
commit: e808b8d3fbb0f530689a5dde0ef52cfee56a3e0c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Apr  1 17:31:42 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Apr  5 10:57:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e808b8d3

dev-java/hamcrest-library: MAVEN_ID

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

 dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index d55eef85cd8..afa5bc55ca5 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="source"
+MAVEN_ID="org.hamcrest:hamcrest-library:1.3"
 
 inherit java-pkg-2 java-pkg-simple

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

2021-03-27 Thread Miroslav Šulc 
commit: 0b3e51b091a0c2fba14c8cc8f193e851eea4f4fe
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Mar 27 08:00:42 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Mar 27 08:00:42 2021 +
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  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..000
--- 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 @@
- 
- 
- 
--
--
--
--
--
--
--
--
--
--
- 
- 
- 
--
--
--
--
--
--
--
--
--
--
--
--
--
- 
- 
- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2021-03-26 Thread Agostino Sarubbo 
commit: af1939b83cc54820556c8b2b0aa8572c6e44ffb9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 26 20:42:14 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 26 20:42:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1939b8

dev-java/hamcrest-library: ppc64 stable wrt bug #775638

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
index a19db7fcea8..b26fd124cfc 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz;
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CDEPEND="
dev-java/hamcrest-generator:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2021-03-26 Thread Sam James 
commit: b059ca9983c93f5d8d2b807228e2e36579c2cd6e
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 26 18:45:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 26 18:45:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b059ca99

dev-java/hamcrest-library: Stabilize 1.3-r2 arm64, #777930

Signed-off-by: Sam James  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index e524f2d023c..d55eef85cd8 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="dev-java/hamcrest-core:${SLOT}
>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2021-03-26 Thread Sam James 
commit: 7484f1750b1799412ea480dad7b9341b116a102f
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 26 11:33:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 26 11:33:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7484f175

dev-java/hamcrest-library: Stabilize 1.3-r2 ppc64, #777930

Signed-off-by: Sam James  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index d1ed8d46d97..e524f2d023c 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND="dev-java/hamcrest-core:${SLOT}
>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2021-03-26 Thread Agostino Sarubbo 
commit: 4ef504cf1f5d02a63f3839476a1a8ff33157abb2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 26 07:43:59 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 26 07:43:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef504cf

dev-java/hamcrest-library: amd64 stable wrt bug #777930

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index 426a7cb2dc2..d1ed8d46d97 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND="dev-java/hamcrest-core:${SLOT}
>=virtual/jdk-1.8:*

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2021-03-25 Thread Agostino Sarubbo 
commit: dea6a65cd63715c3b2662aa6d6de5be163709cf0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar 25 16:18:29 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar 25 16:19:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea6a65c

dev-java/hamcrest-library: x86 stable wrt bug #777930

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
index 9cbcd0747a1..426a7cb2dc2 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND="dev-java/hamcrest-core:${SLOT}
>=virtual/jdk-1.8:*

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

2021-03-23 Thread Miroslav Šulc 
commit: bd533e235aaed52b228da10d149e3ec5ee54ba3b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Mar 21 22:49:07 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar 23 11:34:52 2021 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20062
Signed-off-by: Miroslav Šulc  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 000..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 extends 
TypeSafeDiagnosingMatcher
+  */
+ @Factory
+ public static  Matcher> 
containsInAnyOrder(Matcher... itemMatchers) {
+-return containsInAnyOrder(Arrays.asList(itemMatchers));
++return containsInAnyOrder((List>) 
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 extends 
TypeSafeDiagnosingMatcher Matcher> contains(Matcher... itemMatchers) {
+-return contains(asList(itemMatchers));
++return contains((List>) 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 extends 
TypeSafeMatcher {
+  */
+ @Factory
+ public static  Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) {
+-return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++return arrayContainingInAnyOrder((List>) 
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 extends 
TypeSafeMatcher {
+  */
+ @Factory
+ public static  Matcher arrayContaining(Matcher... 
itemMatchers) {
+-return arrayContaining(asList(itemMatchers));
++return arrayContaining((List>) 
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 000..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 \
+

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2020-07-24 Thread Sam James 
commit: 5f507d0c6c8593d32276970acc9a2336e5eff14b
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 25 02:49:11 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 25 02:49:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f507d0c

dev-java/hamcrest-library: arm keyworded (bug #733822)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
index 89a57bc7315..a19db7fcea8 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz;
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CDEPEND="
dev-java/hamcrest-generator:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2017-08-28 Thread James Le Cuirot 
commit: ff919edecb37e6b1a65e54a87e69a390161358b1
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Aug 28 21:36:18 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Aug 28 21:36:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff919ede

dev-java/hamcrest-library: Keyword for ~ppc64

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
index 9bc07298ae5..89a57bc7315 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz;
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 CDEPEND="
dev-java/hamcrest-generator:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2017-07-13 Thread Alexis Ballier 
commit: 9f64c2edce8010c250fb624e089cb959b165e8c0
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jul 13 22:25:09 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jul 13 22:26:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f64c2ed

dev-java/hamcrest-library: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
index 51e87937551..9bc07298ae5 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz;
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND="
dev-java/hamcrest-generator:${SLOT}

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

2015-11-20 Thread Patrice Clement 
commit: 46ac4840a5cab580f44d5186b604acbde648ac96
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Nov 20 22:40:12 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Nov 20 22:40:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ac4840

dev-java/hamcrest-library: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/hamcrest-library/Manifest |   1 -
 .../files/1.1-remove-targets.patch | 113 -
 .../hamcrest-library/hamcrest-library-1.1.ebuild   |  53 --
 3 files changed, 167 deletions(-)

diff --git a/dev-java/hamcrest-library/Manifest 
b/dev-java/hamcrest-library/Manifest
index 780ede8..2bc8250 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,2 +1 @@
-DIST hamcrest-1.1.tgz 1670123 SHA256 
a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 
07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595
 WHIRLPOOL 
937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
 DIST hamcrest-1.3.tgz 3686096 SHA256 
c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 
5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 WHIRLPOOL 
9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9

diff --git a/dev-java/hamcrest-library/files/1.1-remove-targets.patch 
b/dev-java/hamcrest-library/files/1.1-remove-targets.patch
deleted file mode 100644
index 08affbc..000
--- a/dev-java/hamcrest-library/files/1.1-remove-targets.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
-index f819d3d..b24dea0 100644
 a/hamcrest-1.1/build.xml
-+++ b/hamcrest-1.1/build.xml
-@@ -23,48 +23,11 @@
- 
- 
--
--
--
--
--
--
--
--
- 
- 
- 
--
--
--
--
--
--
--
--
--
--
--
- 
- 
- 
- 
- 
--
--
--
--  
-+
-+
-+
-+  
- 
-@@ -121,7 +84,7 @@
-  destjar="build/hamcrest-unit-test-${version}.jar"
-  classpath="
- build/hamcrest-core-${version}.jar;
--build/hamcrest-library-${version}.jar;
-+build/hamcrest-library-${version}.jar;
-   build/hamcrest-text-${version}.jar;
- build/hamcrest-integration-${version}.jar;
- build/hamcrest-generator-${version}.jar"/>
-@@ -164,7 +127,7 @@
- 
- 
- 
--
-+
- 
- 
- 
-@@ -221,7 +184,7 @@
- 
-   
-   
--  
-+  
-   
-   
-   
-@@ -261,4 +224,4 @@
- 
- 
- 
--
-+

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
deleted file mode 100644
index bb2dc08..000
--- a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-   dev-java/hamcrest-core:${SLOT}
-   dev-java/hamcrest-generator:${SLOT}
-   dev-java/qdox:1.6
-"
-DEPEND=">=virtual/jdk-1.5
-   userland_GNU? ( sys-apps/findutils )
-   ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-   ${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-generator,hamcrest-core,qdox-1.6"
-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

[gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-library/

2015-09-01 Thread Tobias Klausmann 
commit: 831b73e280c268e32ff65a1ed858f5f18d66634f
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Sep  1 19:01:51 2015 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Sep  1 19:01:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831b73e2

dev-java/hamcrest-library: Fixing HOMEPAGE move due to code.google.com shutdown

Package-Manager: portage-2.2.20.1

 dev-java/hamcrest-library/hamcrest-library-1.1.ebuild| 2 +-
 dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
index 455206a..bb2dc08 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://code.google.com/p/${MY_PN}/;
+HOMEPAGE="https://github.com/hamcrest;
 SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz;
 
 LICENSE="BSD-2"

diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild 
b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
index 831a629..0d9fc5d 100644
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r1.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://code.google.com/p/${MY_PN}/;
+HOMEPAGE="https://github.com/hamcrest;
 SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz;
 
 LICENSE="BSD-2"