commit: 25d736fba0f2b4f3a3820fb20f61aa3b3c235d94 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Apr 21 09:32:57 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 21 09:33:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d736fb
dev-java/commons-collections: removed obsolete 3.2.1-r[23] Closes: https://github.com/gentoo/gentoo/pull/20474 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../commons-collections-3.2.1-r2.ebuild | 65 --------------------- .../commons-collections-3.2.1-r3.ebuild | 68 ---------------------- .../commons-collections-3.2.1-fix-tests.patch | 13 ----- 3 files changed, 146 deletions(-) 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 deleted file mode 100644 index e82eac0d21f..00000000000 --- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild +++ /dev/null @@ -1,65 +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 test" -MAVEN_ID="commons-collections:commons-collections:3.2.1" - -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=" - 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/* -} 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 deleted file mode 100644 index 75a4556fc9c..00000000000 --- a/dev-java/commons-collections/commons-collections-3.2.1-r3.ebuild +++ /dev/null @@ -1,68 +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 test" -MAVEN_ID="commons-collections:commons-collections:3.2.1" - -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" - "${FILESDIR}/${P}-fix-tests.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/* -} diff --git a/dev-java/commons-collections/files/commons-collections-3.2.1-fix-tests.patch b/dev-java/commons-collections/files/commons-collections-3.2.1-fix-tests.patch deleted file mode 100644 index 9ba66eb6e4a..00000000000 --- a/dev-java/commons-collections/files/commons-collections-3.2.1-fix-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -index 1c01b53..aea6edf 100644 ---- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -+++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java -@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { - verify(); - - try { -- array = collection.toArray(null); -+ array = collection.toArray((Object[]) null); - fail("toArray(null) should raise NPE"); - } catch (NullPointerException e) { - // expected
