[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/, dev-java/ant-contrib/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/, dev-java/ant-contrib/files/

[Miroslav Šulc]

commit:     2a5ca07b74c938e5fe0c6245e0cc4358a93b6866
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Dec 10 14:13:38 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Dec 11 07:29:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a5ca07b

dev-java/ant-contrib: Drop 1.0_beta3-r2

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/23241
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/ant-contrib/Manifest                      |  1 -
 .../ant-contrib/ant-contrib-1.0_beta3-r2.ebuild    | 80 ----------------------
 dev-java/ant-contrib/files/tests-visibility.patch  | 12 ----
 3 files changed, 93 deletions(-)

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 8b26c2ae497b..f56a40d13f5d 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,2 +1 @@
 DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
-DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
deleted file mode 100644
index 68d5f869ed7b..000000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
+++ /dev/null
@@ -1,80 +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"
-WANT_ANT_TASKS="ant-ivy"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-#	test? ( dev-java/ant-junit dev-java/ant-testutil )
-CP_DEPEND="
-	>=dev-java/ant-core-1.7.0:0
-	dev-java/ant-ivy:0
-	>=dev-java/bcel-5.1:0
-	dev-java/commons-httpclient:3
-	dev-java/xerces:2
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.4"
-
-# javatoolkit for cElementTree
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.4
-	>=dev-java/javatoolkit-0.3.0-r2"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/tests-visibility.patch )
-
-rewrite_build_xml() {
-	python <<EOF
-import xml.etree.cElementTree as et
-tree = et.ElementTree(file='build.xml')
-root = tree.getroot()
-root.append(et.Element('path',id='test.classpath'))
-root.append(et.Element('path',id='compile.classpath'))
-skip=['resolve','classpath']
-for target in tree.getiterator("target"):
-	if target.attrib['name'] in skip:
-		target.attrib['if'] = 'false'
-
-tree.write('build.xml')
-EOF
-	[[ $? != 0 ]] && die "Removing taskdefs failed"
-}
-
-src_prepare() {
-	default
-	rewrite_build_xml
-	java-pkg_clean
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
-
-# Can't load bcel for some reason
-RESTRICT="test"
-# for tests
-EANT_GENTOO_CLASSPATH_EXTRA="target/${PN}.jar"
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc target/docs/api
-	use source && java-pkg_dosrc src/java/net
-
-	java-pkg_dohtml -r docs/manual
-}

diff --git a/dev-java/ant-contrib/files/tests-visibility.patch b/dev-java/ant-contrib/files/tests-visibility.patch
deleted file mode 100644
index 182a17f054e0..000000000000
--- a/dev-java/ant-contrib/files/tests-visibility.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java
---- ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java   2008-03-05 23:56:16.000000000 +0200
-+++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java       2008-03-05 23:56:55.000000000 +0200
-@@ -76,7 +76,7 @@
-     * @param filename            name of project file to run
-     * @exception BuildException  Description of the Exception
-     */
--   protected void configureProject( String filename ) throws BuildException {
-+   public void configureProject( String filename ) throws BuildException {
-       // find the build file
-       File f = new File( filename );
-       if ( !f.exists() ) {