4 files changed, 2 insertions, 194 deletions
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index af2af1d3b9c1..e47e1b9d293d 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,8 +1,4 @@
 AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
-DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
-DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
-EBUILD ant-ivy-1.4.1-r2.ebuild 1760 BLAKE2B 042c11aee2720ffaf77877ab6f903026833db5600c98ea4fc70f0534fe33d478ab01d337b4dfcbfb2218a916ee06bbab42a3afffc29b8b60d663e4e51dec8bed SHA512 926b90f406b1be28920cf56b1463765b676fa00c01ddb4fa7d8a7f3b60b99ea009cad9591015fe65dae636827717390a3d4c5c00118c141f65e4e842f7599e2f
-EBUILD ant-ivy-2.3.0-r3.ebuild 2206 BLAKE2B 81ecc8890da54bcda84c4d74e3125e01a0f390264e1e243172c35cfec6629f00d2deee6441a3dce2d1e2e3dda1148cf63d8dab013f556a02705af0eee15fc8b2 SHA512 2405021491feb8fb173f0d7da0333debdb53f260a6de1b58178d3f2440ecebb21430333c733bc0ee0c298152d5cef34ab77ffb5842d3ccc8e632eb9a1f55435e
-EBUILD ant-ivy-2.5.0.ebuild 8496 BLAKE2B 8e10ef67d8e600974ca477ea53274efb96c37735de6575e8a03705db40d74a4ca5a5b809373216f860612cd6ec51bb9892a2b974962f2c3e2394fc8cd562b6df SHA512 6ea2eb0b486529cb9efd683d1d009748f92fa4efae8805073c10a403bda443d231dbf3a8c6acd60aa6c5d259fa87c1548398dc8686adff086b3518408730b42f
+EBUILD ant-ivy-2.5.0.ebuild 8495 BLAKE2B a78606e6844fe8c7c584695aec2f8c4d1a2d5a7d60fbba7e4e097a2715be9d1ec5cea5d282a0b95c3ae4fb0a06f5aea9768111c48d0d8e17f283c27db9efdc77 SHA512 95b72255d71bbb6e0d773f5d519f19ed8bcaaff2f907052f28d3cd7f7cd848e550c5b8d4c39537c61df14d5d51895f4dead1f4c9707c4629f45ad4970e1974e5
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
deleted file mode 100644
index 62198fb29dc1..000000000000
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Registers as split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Rewrites examples otherwise... bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN##*-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEP="
-	dev-java/ant-core:0
-	dev-java/commons-cli:1
-	dev-java/commons-httpclient:3
-	dev-java/commons-vfs:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jsch:0"
-
-BDEPEND="app-arch/unzip"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )
-	${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.4.1-javadoc.patch"
-)
-
-src_prepare() {
-	default
-
-	# init-ivy expects existing ivy.jar, but we don't need actually it
-	sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
-		|| die
-
-	rm -v src/java/fr/jayasoft/ivy/repository/vfs/IvyWebdav* || die
-	java-ant_rewrite-classpath
-	mkdir lib
-}
-
-EANT_GENTOO_CLASSPATH="
-	ant-core,commons-cli-1,commons-httpclient-3
-	commons-vfs,jakarta-oro-2.0,jsch"
-
-EANT_BUILD_TARGET="offline jar"
-
-src_test() {
-	# TODO: find out why a couple of these fail
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant offline test
-}
-
-src_install() {
-	java-pkg_dojar build/artifact/${MY_PN}.jar
-
-	use doc && java-pkg_dojavadoc doc/ivy/api
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/java/*
-
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
deleted file mode 100644
index 17350b9fc443..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Register this as a split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Don't rewrite examples, that's bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
-RESTRICT="test"
-
-# SLOT to use for all bc dependencies.
-BC_SLOT="1.50"
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-CDEPEND="dev-java/jsch:0
-	dev-java/bcpg:${BC_SLOT}
-	dev-java/ant-core:0
-	dev-java/bcpkix:${BC_SLOT}
-	dev-java/bcprov:${BC_SLOT}
-	dev-java/commons-vfs:0
-	dev-java/jakarta-oro:2.0
-	dev-java/commons-httpclient:3"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# This stuff needs removing.
-	local CLEANUP=(
-		doc/reports
-		test/triggers
-		doc/configuration
-		test/repositories
-		test/java/org/apache/ivy/core/settings/custom-resolver.jar
-		src/example/chained-resolvers/settings/repository/test-1.0.jar
-	)
-
-	rm -rf "${CLEANUP[@]}" || die
-
-	java-ant_rewrite-classpath
-	mkdir lib || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	jsch
-	bcpkix-${BC_SLOT}
-	ant-core
-	bcpg-${BC_SLOT}
-	commons-vfs
-	bcprov-${BC_SLOT}
-	jakarta-oro-2.0
-	commons-httpclient-3
-"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
-	java-pkg_dojar build/artifact/jars/ivy.jar
-	java-pkg_register-ant-task
-
-	if use doc; then
-		java-pkg_dojavadoc build/doc/reports/api
-		java-pkg_dohtml -r doc
-	fi
-
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
index 36f2a11d943f..4e3633fe3296 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 PROPERTIES="test_network"
 RESTRICT="test"