public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2015-08-16  8:25 Agostino Sarubbo
  0 siblings, 0 replies; 47+ messages in thread
From: Agostino Sarubbo @ 2015-08-16  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     0c609a12e55e68a0edd1b4d1c201f5d07130376a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 08:25:06 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 08:25:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c609a12

dev-java/commons-collections-3.2.1-r1: amd64 stable wrt bug #557902

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index b20947a..d5ceab7 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2015-08-16  8:25 Agostino Sarubbo
  0 siblings, 0 replies; 47+ messages in thread
From: Agostino Sarubbo @ 2015-08-16  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     bb863e0c2778188a32466cdb03f2b52f78494cea
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 08:25:27 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 08:25:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb863e0c

dev-java/commons-collections-3.2.1-r1: x86 stable wrt bug #557902

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index d5ceab7..bf46f00 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2015-08-21  7:35 Agostino Sarubbo
  0 siblings, 0 replies; 47+ messages in thread
From: Agostino Sarubbo @ 2015-08-21  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d084b77a4c8859a5c5ecc9ddd662db5688599c1d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 07:35:23 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 07:35:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d084b77a

dev-java/commons-collections-3.2.1-r1: ppc stable wrt bug #557902

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index bf46f00..ed707e2 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2015-08-21  7:35 Agostino Sarubbo
  0 siblings, 0 replies; 47+ messages in thread
From: Agostino Sarubbo @ 2015-08-21  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     29ac83aeef4cd2b5dc323cce2c7e58f995119d0a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 07:35:45 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 07:35:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ac83ae

dev-java/commons-collections-3.2.1-r1: ppc64 stable wrt bug #557902

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc64"

 dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index ed707e2..44bab4b 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2015-08-21  9:42 Patrice Clement
  0 siblings, 0 replies; 47+ messages in thread
From: Patrice Clement @ 2015-08-21  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     6a9e3047851903a1757ea5f885c59666284248e2
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 09:00:52 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 10:42:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9e3047

dev-java/commons-collections: Remove old.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../commons-collections-3.2.1.ebuild               | 58 ----------------------
 1 file changed, 58 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1.ebuild
deleted file mode 100644
index 6e91542..0000000
--- a/dev-java/commons-collections/commons-collections-3.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Jakarta-Commons Collections Component"
-HOMEPAGE="http://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test-framework"
-
-COMMON_DEP="test-framework? ( =dev-java/junit-3.8* )"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${P}-src"
-
-src_compile() {
-	local antflags
-	if use test-framework; then
-		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
-		#no support for installing two sets of javadocs via dojavadoc atm
-		#use doc && antflags="${antflags} tf.javadoc"
-	fi
-	eant jar $(use_doc) ${antflags}
-}
-
-src_test() {
-	if [[ "${ARCH}" = "ppc" ]]; then
-		einfo "Tests are disabled on ppc"
-	else
-		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
-	fi
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-	use test-framework && \
-		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
-			${PN}-testframework.jar
-
-	dodoc README.txt || die
-	java-pkg_dohtml *.html || die
-	if use doc; then
-		java-pkg_dojavadoc build/docs/apidocs
-		#use test-framework && java-pkg_dojavadoc build/docs/testframework
-	fi
-	use source && java-pkg_dosrc src/java/*
-}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2016-11-24 22:04 James Le Cuirot
  0 siblings, 0 replies; 47+ messages in thread
From: James Le Cuirot @ 2016-11-24 22:04 UTC (permalink / raw
  To: gentoo-commits

commit:     97eb14e720de9e83a3b1040e101d5935c3e9802f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 21:56:58 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 21:56:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97eb14e7

dev-java/commons-collections: Version bump to 4.1 into new SLOT 4

Package-Manager: portage-2.3.2

 dev-java/commons-collections/Manifest              |  1 +
 .../commons-collections-4.1.ebuild                 | 49 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 0eb13b0..8a4484d 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1 +1,2 @@
 DIST commons-collections-3.2.1-src.tar.gz 609930 SHA256 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0 WHIRLPOOL ec31406560a1156e8e8780e3cc1d5be2b614b26e8dc3c04a80ee758d4d42c353c2eaf6f5f41057d3f9735063cb81143005bd63d7b552b73f1e2acc5fa644766d
+DIST commons-collections4-4.1-src.tar.gz 704671 SHA256 94839a0620a0fb1999aa94d490cd8d6919f79dc206be33b722f856ffde862ecf SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b WHIRLPOOL 154bddba08d881303d888a6c195eceda7582677ac3cd0089d189b04b1d1673d9b7fa92e94c22298bc2ce3c12502ea731f51144ac22b7ff5ef9767c7bb2d816a0

diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
new file mode 100644
index 00000000..7af7293
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+SLOT="4"
+MY_P="${PN}${SLOT}-${PV}"
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="http://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.7"
+
+DEPEND=">=virtual/jdk-1.7
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${MY_P}-src"
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc RELEASE-NOTES.txt
+	docinto html
+	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2018-01-12 20:30 Patrice Clement
  0 siblings, 0 replies; 47+ messages in thread
From: Patrice Clement @ 2018-01-12 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     cd02a9248d1977ec43940e0d7813c2cd449d0c0f
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 20:25:56 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 20:30:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd02a924

dev-java/commons-collections: fix tests.

EAPI 6 bumped the ebuild whilst at it.

Closes: https://bugs.gentoo.org/644154
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../commons-collections-3.2.1-r2.ebuild            | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
new file mode 100644
index 00000000000..9c732bfc538
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-utils-2
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}/${P}-Java-8.patch" )
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local antflags
+	if use test; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+	fi
+	eant jar $(use_doc) ${antflags}
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "tests are disabled on ppc"
+	else
+		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use test && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	java-pkg_dohtml *.html
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+	fi
+	use source && java-pkg_dosrc src/java/*
+}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2018-01-12 20:30 Patrice Clement
  0 siblings, 0 replies; 47+ messages in thread
From: Patrice Clement @ 2018-01-12 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     75a124c4e86d0dca3b8c2816242b9e3e2d40eb02
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 20:30:17 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 20:30:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a124c4

dev-java/commons-collections: stable for amd64. mark stable for the remaining arches using the ALLARCHES policy.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-java/commons-collections/commons-collections-4.1.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 100262bc428..bd84b509220 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -14,18 +14,21 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut
 HOMEPAGE="https://commons.apache.org/collections/"
 SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
-RDEPEND=">=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
+DEPEND="
+	>=virtual/jdk-1.7
 	test? (
 		dev-java/easymock:3.2
 		dev-java/junit:4
 	)"
 
+RDEPEND="
+	>=virtual/jre-1.7"
+
 S="${WORKDIR}/${MY_P}-src"
+
 JAVA_SRC_DIR="src/main/java"
 
 src_install() {


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2018-01-12 20:30 Patrice Clement
  0 siblings, 0 replies; 47+ messages in thread
From: Patrice Clement @ 2018-01-12 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     39cb4b5ffd7de9744863c1ba0b1c91112dbdf86e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 20:28:38 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 20:30:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39cb4b5f

dev-java/commons-collections: switch to https.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-java/commons-collections/commons-collections-4.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 3f442ecfe0e..100262bc428 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SLOT="4"
 MY_P="${PN}${SLOT}-${PV}"
 
 DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="http://commons.apache.org/collections/"
+HOMEPAGE="https://commons.apache.org/collections/"
 SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~ppc64 ~x86"


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2018-03-01  8:39 Michał Górny
  0 siblings, 0 replies; 47+ messages in thread
From: Michał Górny @ 2018-03-01  8:39 UTC (permalink / raw
  To: gentoo-commits

commit:     f3690752009f7d61d86b2313ddb715cd96727646
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 08:37:56 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 08:39:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3690752

dev-java/commons-collections: Dekeyword *-fbsd

 dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild | 4 ++--
 dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index ddceb7ea23c..accce8f13e0 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
index 9c732bfc538..50ad9b9cf0a 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-04 21:49 Patrice Clement
  0 siblings, 0 replies; 47+ messages in thread
From: Patrice Clement @ 2021-04-04 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     7ef47ba2da5f2e99b3f4ced0266342338a6d8fd3
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 20:05:42 2021 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 21:49:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef47ba2

dev-java/commons-collections: 4.1 -> EAPI 7 bump.

Closes: https://bugs.gentoo.org/779490
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../commons-collections-4.1-r1.ebuild              | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
new file mode 100644
index 00000000000..b2156aa863c
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+SLOT="4"
+MY_P="${PN}${SLOT}-${PV}"
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc RELEASE-NOTES.txt
+	docinto html
+	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
+}
+
+src_test() {
+	local DIR=src/test/java
+	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
+	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
+	TESTS="${TESTS//src\/test\/java\/}"
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-04 21:49 Patrice Clement
  0 siblings, 0 replies; 47+ messages in thread
From: Patrice Clement @ 2021-04-04 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     99e0f67ea0cbf1f5371671f3dc90fbdde96ebcb4
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 20:05:23 2021 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 21:49:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e0f67e

dev-java/commons-collections: 3.2.1 -> EAPI 7 bump.

Bug: https://bugs.gentoo.org/779490
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../commons-collections-3.2.1-r3.ebuild            | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild
new file mode 100644
index 00000000000..896076e3d83
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 java-utils-2
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=( "${FILESDIR}/${P}-Java-8.patch" )
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local antflags
+	if use test; then
+		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
+	fi
+	eant jar $(use_doc) ${antflags}
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "tests are disabled on ppc"
+	else
+		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
+	fi
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	use test && \
+		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
+			${PN}-testframework.jar
+
+	java-pkg_dohtml *.html
+	if use doc; then
+		java-pkg_dojavadoc build/docs/apidocs
+	fi
+	use source && java-pkg_dosrc src/java/*
+}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-19 10:57 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2021-04-19 10:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9cf57c25e227f01b2f921f140fb930154bff61ef
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 10:52:00 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 10:57:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf57c25

dev-java/commons-collections: added MAVEN_ID to slot 0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild | 1 +
 dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild | 1 +
 dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index 4b75f2ae4ea..ef22afeed88 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=5
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:3.2.1"
 
 inherit java-pkg-2 java-ant-2 java-utils-2 epatch
 

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
index 9dac8440d36..e82eac0d21f 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:3.2.1"
 
 inherit java-pkg-2 java-ant-2 java-utils-2
 

diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild
index 896076e3d83..cfd46905336 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:3.2.1"
 
 inherit java-pkg-2 java-ant-2 java-utils-2
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-19 17:57 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2021-04-19 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     1cf8a8f440ed34b93e59b85edae43512f1a033f7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Apr 19 12:45:30 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 17:57:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf8a8f4

dev-java/commons-collections: MAVEN_ID

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

 dev-java/commons-collections/commons-collections-4.1-r1.ebuild | 1 +
 dev-java/commons-collections/commons-collections-4.1.ebuild    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
index b2156aa863c..7e6cbf44764 100644
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-collections4:4.1"
 
 inherit java-pkg-2 java-pkg-simple
 

diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index 6a1080bb83c..3cb523c4cd8 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-collections4:4.1"
 
 inherit java-pkg-2 java-pkg-simple
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-21 18:53 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2021-04-21 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     9f05651ca97cb7fb5715d3f9eaa8be5e4df26fcc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 18:51:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 18:51:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f05651c

dev-java/commons-collections: Stabilize 3.2.2 amd64, #739348

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index b127e357b05..99b8239fa92 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-25  5:19 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2021-04-25  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     354061465b52c01c669cac98ad79eb30121847c4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:18:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:18:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35406146

dev-java/commons-collections: Keyword 4.1-r1 arm64, #784407

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
index 7e6cbf44764..1f0821a8903 100644
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut
 HOMEPAGE="https://commons.apache.org/collections/"
 SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-26 19:11 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2021-04-26 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     a5614f0959601c02f7761c1d62c9dd5c6902532d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 26 19:09:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 26 19:11:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5614f09

dev-java/commons-collections: Stabilize 3.2.2 x86, #739348

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 667be7a046b..85a84701234 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-04-27 10:21 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2021-04-27 10:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5174beb53e0be84c4e23ec462d8bc07311e78fdb
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Apr 27 08:10:17 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 10:20:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5174beb5

dev-java/commons-collections: adjust MAVEN_ID

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20553/commits/1eb8305f06fb125745887a2043a61b57576dba42
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 85a84701234..6d32a5a18a4 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-collections:commons-collections:3.2.1"
+MAVEN_ID="commons-collections:commons-collections:3.2.2"
 
 inherit java-pkg-2 java-ant-2 java-utils-2
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-05-16 18:58 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2021-05-16 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     3ddb3e473fca4b291acf4ddbd7c51f3a50629155
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 18:57:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 18:57:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ddb3e47

dev-java/commons-collections: Stabilize 4.1-r1 arm64, #784407

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
index 3cbb9daf528..228b947a439 100644
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut
 HOMEPAGE="https://commons.apache.org/collections/"
 SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2021-07-23  5:31 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2021-07-23  5:31 UTC (permalink / raw
  To: gentoo-commits

commit:     22be474d52bd2ffcc699380d197a43b117aba662
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jul 22 08:58:33 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 05:31:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22be474d

dev-java/commons-collections: remove obsolete version

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

 .../commons-collections-4.1.ebuild                 | 53 ----------------------
 1 file changed, 53 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
deleted file mode 100644
index 3cb523c4cd8..00000000000
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-collections4:4.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-SLOT="4"
-MY_P="${PN}${SLOT}-${PV}"
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.7
-	test? (
-		dev-java/easymock:3.2
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc RELEASE-NOTES.txt
-	docinto html
-	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
-	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-01-05 16:32 Florian Schmaus
  0 siblings, 0 replies; 47+ messages in thread
From: Florian Schmaus @ 2022-01-05 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     33429181735be07d059eba9e83bdd729c6c41452
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jan  5 15:31:16 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jan  5 16:32:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33429181

dev-java/commons-collections: bump to 4.4

Bug: https://bugs.gentoo.org/830639
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23659
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/commons-collections/Manifest              |  1 +
 .../commons-collections-4.4.ebuild                 | 67 ++++++++++++++++++++++
 dev-java/commons-collections/metadata.xml          | 11 ++--
 3 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 02508b4a856d..466c5b01284b 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,2 +1,3 @@
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
+DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b

diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
new file mode 100644
index 000000000000..3c12d8f477e8
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:4.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
+SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/easymock:3.2
+		dev-java/commons-lang:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_test() {
+	# https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
+	pushd src/test/java || die
+		local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java"  ! -name "Abstract*.java" ! -name "BulkTest.java")
+		TESTS="${TESTS//.java}"
+		TESTS="${TESTS//\//.}"
+	popd
+
+	JAVA_TEST_RUN_ONLY=( "${TESTS}" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}

diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 6ef2d50cf07e..62a57c23950f 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
+	</longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-01-07 20:40 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-01-07 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     43b6a0bb17606a5e0b1383dc7544ff36fa27aed2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  7 20:38:05 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 20:40:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b6a0bb

dev-java/commons-collections: Keyword 4.4 arm, #830680

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
index 3c12d8f477e8..994cf13e94df 100644
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-01-07 20:40 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-01-07 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     8d593d66f1526053006219416f9618e460d71343
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  7 20:38:02 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 20:40:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d593d66

dev-java/commons-collections: Keyword 3.2.2 arm, #830680

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 6d32a5a18a44..3ad1e7ad5de4 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-01-07 20:42 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-01-07 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     af51172bb745d43b992c5651e6336435e0035f5a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  7 20:41:52 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 20:41:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af51172b

dev-java/commons-collections: Keyword 3.2.2 arm64, #830680

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index 3ad1e7ad5de4..e205323f6cdc 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-02-04  9:29 Jakov Smolić
  0 siblings, 0 replies; 47+ messages in thread
From: Jakov Smolić @ 2022-02-04  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ae7487a49bb9712c02e4345ce7de69132fdf6065
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 09:29:14 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 09:29:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7487a4

dev-java/commons-collections: Stabilize 4.4 amd64, #832681

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
index 994cf13e94df..2745e900b2db 100644
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-02-04  9:29 Jakov Smolić
  0 siblings, 0 replies; 47+ messages in thread
From: Jakov Smolić @ 2022-02-04  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     4496ad220f5fc1aff8fc5de60d11ad22707e3564
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 09:29:22 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 09:29:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4496ad22

dev-java/commons-collections: Stabilize 4.4 x86, #832681

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
index 2745e900b2db..2f54a38c4fde 100644
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-02-05  8:08 Agostino Sarubbo
  0 siblings, 0 replies; 47+ messages in thread
From: Agostino Sarubbo @ 2022-02-05  8:08 UTC (permalink / raw
  To: gentoo-commits

commit:     76821b976441bff2e1efa979c9c550f9b908807e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 08:08:17 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 08:08:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76821b97

dev-java/commons-collections: ppc64 stable wrt bug #832681

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
index 2f54a38c4fde..2a37f28ac0cc 100644
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-02-05 18:17 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-02-05 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a90840527c460e2b3dd31a5ffe1e56b99bac4812
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 18:17:14 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 18:17:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9084052

dev-java/commons-collections: Stabilize 4.4 arm64, #832681

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
index 2a37f28ac0cc..b843e427b13b 100644
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-02-06  8:51 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2022-02-06  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     7a5df8a5a744c2da4261923a098bebd13ba6b61e
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Feb  5 18:35:07 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 08:51:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5df8a5

dev-java/commons-collections: Drop 4.1-r1

Closes: https://bugs.gentoo.org/830639
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24090
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-collections/Manifest              |  1 -
 .../commons-collections-4.1-r1.ebuild              | 53 ----------------------
 2 files changed, 54 deletions(-)

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 466c5b01284b..a70cf6348c0f 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,3 +1,2 @@
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
 DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
-DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b

diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
deleted file mode 100644
index 228b947a439d..000000000000
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-collections4:4.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-SLOT="4"
-MY_P="${PN}${SLOT}-${PV}"
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	test? (
-		dev-java/easymock:3.2
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc RELEASE-NOTES.txt
-	docinto html
-	dodoc {DEVELOPERS-GUIDE,PROPOSAL}.html
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${DIR}/../resources:${PN}.jar:$(java-pkg_getjars easymock-3.2,junit-4)"
-	local TESTS=$(find ${DIR} -name "*Test.java" ! -name "Abstract*" ! -name "BulkTest.*")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-02-11 20:05 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-02-11 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     12045bb30105e664a5234421c31c165261020d41
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 20:05:27 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 20:05:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12045bb3

dev-java/commons-collections: Stabilize 3.2.2 arm64, #832895

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index e205323f6cdc..3e6fe5ecf537 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-07-24 17:00 Florian Schmaus
  0 siblings, 0 replies; 47+ messages in thread
From: Florian Schmaus @ 2022-07-24 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     846d994a284683d676011df7dd3bf19d53f3456a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jul 11 14:55:44 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 16:51:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846d994a

dev-java/commons-collections: add missing Automatic-Module-Name

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

 .../commons-collections-4.4-r1.ebuild              | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
new file mode 100644
index 000000000000..c55d0bb19796
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-collections4:4.4"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
+HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
+SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/easymock:3.2
+		dev-java/commons-lang:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+S="${WORKDIR}/commons-collections4-${PV}-src"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
+
+src_test() {
+	# https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
+	pushd src/test/java || die
+		local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java"  ! -name "Abstract*.java" ! -name "BulkTest.java")
+		TESTS="${TESTS//.java}"
+		TESTS="${TESTS//\//.}"
+	popd
+
+	JAVA_TEST_RUN_ONLY=( "${TESTS}" )
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-08-23 16:32 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-08-23 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     943808edc3218cd8ec1b8ccc16aacf03b364c9c2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 16:32:13 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 16:32:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943808ed

dev-java/commons-collections: Stabilize 4.4-r1 arm64, #866111

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
index c55d0bb19796..30836e55f393 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-08-23 16:32 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-08-23 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     62b6f1a2bd0c7bb0b2a62548ead9560c5ffce896
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 16:32:16 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 16:32:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b6f1a2

dev-java/commons-collections: Stabilize 4.4-r1 ppc64, #866111

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
index 30836e55f393..237df84cb36a 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-08-23 18:26 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2022-08-23 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     0ebee55adf552247116cd207bb6eec626140e6a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 18:24:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:24:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebee55a

dev-java/commons-collections: Stabilize 4.4-r1 amd64, #866111

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
index 237df84cb36a..d4f809ffecd7 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-08-23 18:26 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2022-08-23 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     aa6308998f2ce097bd644b5a233885ddfbd1ec3a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 18:25:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:25:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa630899

dev-java/commons-collections: Stabilize 4.4-r1 x86, #866111

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
index d4f809ffecd7..5c4b6e0ebaee 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2022-08-23 18:53 Arthur Zamarin
  0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-08-23 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     699ffca67773b15b9e8f7b21c57ca51fa934f49e
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Aug 23 18:42:43 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:53:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699ffca6

dev-java/commons-collections: drop 4.4

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../commons-collections-4.4.ebuild                 | 67 ----------------------
 1 file changed, 67 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4.ebuild b/dev-java/commons-collections/commons-collections-4.4.ebuild
deleted file mode 100644
index b843e427b13b..000000000000
--- a/dev-java/commons-collections/commons-collections-4.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-collections4:4.4"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
-HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
-SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/easymock:3.2
-		dev-java/commons-lang:3.6
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
-HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
-
-S="${WORKDIR}/commons-collections4-${PV}-src"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_test() {
-	# https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
-	pushd src/test/java || die
-		local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java"  ! -name "Abstract*.java" ! -name "BulkTest.java")
-		TESTS="${TESTS//.java}"
-		TESTS="${TESTS//\//.}"
-	popd
-
-	JAVA_TEST_RUN_ONLY=( "${TESTS}" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2023-02-22  7:36 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2023-02-22  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     43931ffa93caaa85f53eb145679cc7fde2065800
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb 21 09:55:08 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 07:36:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43931ffa

dev-java/commons-collections: do not inherit java-utils-2.eclass directly

- changes EAPI 7 -> 8
- adds verify-sig

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29696
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-collections/Manifest                       |  1 +
 ...ons-3.2.2.ebuild => commons-collections-3.2.2-r1.ebuild} | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index a70cf6348c0f..7038859c5ae2 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,2 +1,3 @@
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
+DIST commons-collections-3.2.2-src.tar.gz.asc 819 BLAKE2B a7d170b03613cddddc284908d95287fc092c01b125c5adffebfc493daf9119e0c9d82fdc7d8ce1865ef45a1e015072f5a09181abcba5b17c9c48d7c6333279da SHA512 c5d33518ed5343b38c10e317f677266858bd9614eff7fdc13a2e0131fe71836c3694f49898843e6978496d7dd2f976b82922230a44cde1eac5f6cdfdb822dcd0
 DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee

diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild
similarity index 72%
rename from dev-java/commons-collections/commons-collections-3.2.2.ebuild
rename to dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild
index 3e6fe5ecf537..843a9c53c215 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="commons-collections:commons-collections:3.2.2"
 
-inherit java-pkg-2 java-ant-2 java-utils-2
+inherit java-pkg-2 java-ant-2 verify-sig
 
 DESCRIPTION="Jakarta-Commons Collections Component"
 HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
+SRC_URI="https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz
+	verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz.asc )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -27,6 +27,9 @@ DEPEND="
 
 RDEPEND=">=virtual/jre-1.8:*"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2023-12-03  9:05 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2023-12-03  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     11ab770ea5a0f684316374c0c7c420fd3a7517a1
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Oct 31 07:09:36 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 09:05:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ab770e

dev-java/commons-collections: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-collections/metadata.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index 62a57c23950f..23e31dd764c3 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -5,6 +5,12 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/projects/COLLECTIONS/issues</bugs-to>
+		<changelog>https://commons.apache.org/proper/commons-collections/changes-report.html</changelog>
+		<doc>https://commons.apache.org/proper/commons-collections/userguide.html</doc>
+		<remote-id type="github">apache/commons-collections</remote-id>
+	</upstream>
 	<longdescription>
 		The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
 	</longdescription>


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2023-12-03  9:05 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2023-12-03  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     7ae550d3dc325b6b238174f59d3f48c19a770311
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Dec  2 09:01:50 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 09:05:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae550d3

dev-java/commons-collections: slot 4, max jdk 17

adds verify-sig to slot 4

Bug: https://bugs.gentoo.org/916445
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-collections/Manifest                        |  3 ++-
 ...tions-4.4-r1.ebuild => commons-collections-4.4-r2.ebuild} | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index 7038859c5ae2..ce4044f37b42 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,3 +1,4 @@
 DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
 DIST commons-collections-3.2.2-src.tar.gz.asc 819 BLAKE2B a7d170b03613cddddc284908d95287fc092c01b125c5adffebfc493daf9119e0c9d82fdc7d8ce1865ef45a1e015072f5a09181abcba5b17c9c48d7c6333279da SHA512 c5d33518ed5343b38c10e317f677266858bd9614eff7fdc13a2e0131fe71836c3694f49898843e6978496d7dd2f976b82922230a44cde1eac5f6cdfdb822dcd0
-DIST commons-collections-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
+DIST commons-collections4-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee
+DIST commons-collections4-4.4-src.tar.gz.asc 499 BLAKE2B 8217d8c8714d2c07a66eca22069b40e2d1012881385172bedd29d52f14ae5c6e287ce2f097f1bde77af06677c776e45c3e67dc6c885709f6c97f61155252131c SHA512 533c47ad2cb6b6926ea8e4aaf9072b6c7a0c9d4a6becb31163a33a6cba8a9888534b74701935a0f0e797c10cbc688331d9abefc3d4085edcd9a7d29260f735ae

diff --git a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
similarity index 82%
rename from dev-java/commons-collections/commons-collections-4.4-r1.ebuild
rename to dev-java/commons-collections/commons-collections-4.4-r2.ebuild
index 5c4b6e0ebaee..cebe177a6358 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -10,11 +10,12 @@ JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.commons:commons-collections4:4.4"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities"
 HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
-SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz -> ${P}-src.tar.gz"
+SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/collections/source/${PN}4-${PV}-src.tar.gz.asc )"
 
 LICENSE="Apache-2.0"
 SLOT="4"
@@ -26,8 +27,11 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
 # test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+# broken with jdk:21 - https://bugs.gentoo.org/916445
 DEPEND="
-	>=virtual/jdk-1.8:*
+	<=virtual/jdk-17:*
 	test? (
 		dev-java/easymock:3.2
 		dev-java/commons-lang:3.6


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2023-12-03  9:05 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2023-12-03  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8e50a6026d27fd3deec692ea7fd723ef4ec198a6
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Dec  2 09:30:32 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 09:05:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e50a602

dev-java/commons-collections: minor style update (slot 4)

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33587
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-collections-4.4-r2.ebuild              | 51 ++++++++--------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
index cebe177a6358..059e87b91233 100644
--- a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/collections/source/commons-collections4-4.4-src.tar.gz --slot 4 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild commons-collections-4.4.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.commons:commons-collections4:4.4"
+MAVEN_ID="org.apache.commons:commons-collections4:${PV}"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple verify-sig
@@ -16,17 +13,12 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut
 HOMEPAGE="https://commons.apache.org/proper/commons-collections/"
 SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz
 	verify-sig? ( https://downloads.apache.org/commons/collections/source/${PN}4-${PV}-src.tar.gz.asc )"
+S="${WORKDIR}/commons-collections4-${PV}-src"
 
 LICENSE="Apache-2.0"
 SLOT="4"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.easymock:easymock:4.0.2 -> !!!suitable-mavenVersion-not-found!!!
-
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
 # broken with jdk:21 - https://bugs.gentoo.org/916445
@@ -37,36 +29,31 @@ DEPEND="
 		dev-java/commons-lang:3.6
 	)
 "
+RDEPEND=">=virtual/jre-1.8:*"
 
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( {CONTRIBUTING,README}.md {LICENSE,NOTICE,RELEASE-NOTES}.txt )
+DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt )
 HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
 
-S="${WORKDIR}/commons-collections4-${PV}-src"
-
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
 JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,commons-lang-3.6,easymock-3.2"
-JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+	commons-lang-3.6
+	easymock-3.2
+	junit-4
+"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4"
+JAVA_TEST_SRC_DIR="src/test/java"
 
 src_test() {
-	# https://github.com/apache/commons-collections/blob/cab58b3a8093a2f6b84f12783a3fb358747310f7/pom.xml#L542-L550
+	# https://github.com/apache/commons-collections/blob/commons-commons-collections-4.4/pom.xml#L542-L550
 	pushd src/test/java || die
-		local TESTS=$(find * -name "*Test.java" ! -name "TestUtils.java"  ! -name "Abstract*.java" ! -name "BulkTest.java")
-		TESTS="${TESTS//.java}"
-		TESTS="${TESTS//\//.}"
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*Test.java" \
+			! -name "TestUtils.java" \
+			! -name "Abstract*.java" \
+			! -name "BulkTest.java")
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 	popd
-
-	JAVA_TEST_RUN_ONLY=( "${TESTS}" )
 	java-pkg-simple_src_test
 }
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2023-12-03  9:05 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2023-12-03  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     b0ecba66c1ea1461a7a4667dec8c23015f818baf
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Oct 30 13:19:37 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 09:05:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ecba66

dev-java/commons-collections: slot 0, max jdk 17

switches from java-ant-2.eclass to java-pkg-simple.eclass

Bug: https://bugs.gentoo.org/916445
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-collections-3.2.2-r2.ebuild            | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
new file mode 100644
index 000000000000..d5c0110ad865
--- /dev/null
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-collections:commons-collections:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Jakarta-Commons Collections Component"
+HOMEPAGE="https://commons.apache.org/collections/"
+SRC_URI="https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz
+	verify-sig? ( https://archive.apache.org/dist/commons/collections/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+# broken with jdk:21 - https://bugs.gentoo.org/916445
+DEPEND="
+	<=virtual/jdk-17:*
+	test? ( dev-java/junit:0 )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {NOTICE,README,RELEASE-NOTES}.txt )
+HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html )
+
+PATCHES=( "${FILESDIR}/${P}-fixes.patch" )
+
+JAVA_SRC_DIR="src/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	if [[ "${ARCH}" = "ppc" ]]; then
+		einfo "tests are disabled on ppc"
+	else
+		java-pkg-simple_src_test
+	fi
+}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2024-01-02  8:17 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2024-01-02  8:17 UTC (permalink / raw
  To: gentoo-commits

commit:     0bfdbd391e1f12d32ba9169eafe7926a879ad5a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 08:16:08 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 08:16:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bfdbd39

dev-java/commons-collections: Stabilize 3.2.2-r2 ppc64, #919136

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
index d5c0110ad865..05d39c7facd7 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2024-01-02  8:17 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2024-01-02  8:17 UTC (permalink / raw
  To: gentoo-commits

commit:     67c681daeb173ace525cef3fb9dc11c2ab834806
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 08:16:25 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 08:16:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c681da

dev-java/commons-collections: Stabilize 3.2.2-r2 arm64, #919136

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
index 05d39c7facd7..c34cd1f1fc2e 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2024-01-02  8:21 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2024-01-02  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     0d091ef23af8b6224449c881c6555f0a58a4bdad
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 08:20:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 08:20:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d091ef2

dev-java/commons-collections: Stabilize 3.2.2-r2 amd64, #919136

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
index c34cd1f1fc2e..781e0fea9b99 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2024-01-02  9:22 Sam James
  0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2024-01-02  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     46cb4a600ec1074496bfa8ac379855f5df47318f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 09:22:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 09:22:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46cb4a60

dev-java/commons-collections: Stabilize 3.2.2-r2 x86, #919136

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
index 781e0fea9b99..7ec6cb15cb8c 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2024-01-03  8:34 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2024-01-03  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     5822adcdf6435830817ebdf779888063e501fd02
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jan  2 09:46:08 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 08:34:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5822adcd

dev-java/commons-collections: drop 3.2.2-r1

Closes: https://bugs.gentoo.org/916445
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34602
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-collections-3.2.2-r1.ebuild            | 70 ----------------------
 1 file changed, 70 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild
deleted file mode 100644
index 77421d30330b..000000000000
--- a/dev-java/commons-collections/commons-collections-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-collections:commons-collections:3.2.2"
-
-inherit java-pkg-2 java-ant-2 verify-sig
-
-DESCRIPTION="Jakarta-Commons Collections Component"
-HOMEPAGE="https://commons.apache.org/collections/"
-SRC_URI="https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz
-	verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-${PV}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fixes.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	local antflags
-	if use test; then
-		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars --build-only junit)"
-	fi
-	eant jar $(use_doc) ${antflags}
-}
-
-src_test() {
-	if [[ "${ARCH}" = "ppc" ]]; then
-		einfo "tests are disabled on ppc"
-	else
-		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
-	fi
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-	use test && \
-		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
-			${PN}-testframework.jar
-
-	java-pkg_dohtml *.html
-	if use doc; then
-		java-pkg_dojavadoc build/docs/apidocs
-	fi
-	use source && java-pkg_dosrc src/java/*
-}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/
@ 2024-07-01 12:16 Miroslav Šulc
  0 siblings, 0 replies; 47+ messages in thread
From: Miroslav Šulc @ 2024-07-01 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     88f572e04b7adefd50834c19725262e0e0be2d4b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jul  1 08:12:08 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 12:16:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f572e0

dev-java/commons-collections: ppc not supported

Closes: https://bugs.gentoo.org/935257
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37382
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-collections/commons-collections-3.2.2-r2.ebuild    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
index 7ec6cb15cb8c..a292cac71fb2 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2-r2.ebuild
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
 # broken with jdk:21 - https://bugs.gentoo.org/916445
 DEPEND="
@@ -41,11 +41,3 @@ src_prepare() {
 	default #780585
 	java-pkg-2_src_prepare
 }
-
-src_test() {
-	if [[ "${ARCH}" = "ppc" ]]; then
-		einfo "tests are disabled on ppc"
-	else
-		java-pkg-simple_src_test
-	fi
-}


^ permalink raw reply related	[flat|nested] 47+ messages in thread

end of thread, other threads:[~2024-07-01 12:16 UTC | newest]

Thread overview: 47+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-01  8:39 [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2024-07-01 12:16 Miroslav Šulc
2024-01-03  8:34 Miroslav Šulc
2024-01-02  9:22 Sam James
2024-01-02  8:21 Sam James
2024-01-02  8:17 Sam James
2024-01-02  8:17 Sam James
2023-12-03  9:05 Miroslav Šulc
2023-12-03  9:05 Miroslav Šulc
2023-12-03  9:05 Miroslav Šulc
2023-12-03  9:05 Miroslav Šulc
2023-02-22  7:36 Miroslav Šulc
2022-08-23 18:53 Arthur Zamarin
2022-08-23 18:26 Sam James
2022-08-23 18:26 Sam James
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-07-24 17:00 Florian Schmaus
2022-02-11 20:05 Arthur Zamarin
2022-02-06  8:51 Miroslav Šulc
2022-02-05 18:17 Arthur Zamarin
2022-02-05  8:08 Agostino Sarubbo
2022-02-04  9:29 Jakov Smolić
2022-02-04  9:29 Jakov Smolić
2022-01-07 20:42 Arthur Zamarin
2022-01-07 20:40 Arthur Zamarin
2022-01-07 20:40 Arthur Zamarin
2022-01-05 16:32 Florian Schmaus
2021-07-23  5:31 Miroslav Šulc
2021-05-16 18:58 Sam James
2021-04-27 10:21 Miroslav Šulc
2021-04-26 19:11 Sam James
2021-04-25  5:19 Sam James
2021-04-21 18:53 Sam James
2021-04-19 17:57 Miroslav Šulc
2021-04-19 10:57 Miroslav Šulc
2021-04-04 21:49 Patrice Clement
2021-04-04 21:49 Patrice Clement
2018-01-12 20:30 Patrice Clement
2018-01-12 20:30 Patrice Clement
2018-01-12 20:30 Patrice Clement
2016-11-24 22:04 James Le Cuirot
2015-08-21  9:42 Patrice Clement
2015-08-21  7:35 Agostino Sarubbo
2015-08-21  7:35 Agostino Sarubbo
2015-08-16  8:25 Agostino Sarubbo
2015-08-16  8:25 Agostino Sarubbo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox