gentoo auto-resync : 11:03:2024 - 00:45:38

4 files changed, 10 insertions, 59 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 77c98c4ac071..278ca320c4da 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -6,6 +6,5 @@ AUX ant-1.10.14-LinkTest.patch 4329 BLAKE2B d4165d378dd63cab2a9d813c9d26c1ef7404
 AUX ant-1.10.14-PathTest.patch 1114 BLAKE2B 870f35f250b4cd31317972c09f4a90eb26b71a8f198d1e96a085f99e0d6e41fd06c0598bcdae35c400aa8ba9b65e52b7dc0d7119308c60c8573a185907f2b7ba SHA512 9847fb3f6f3c2a37ac1e483ca7ac5685cc3d296b92ae35816fc4c58bb4de57d89196c50fabfa546efbec2303ea360066658507be0b4bdaeae3d5ff00e023f498
 DIST apache-ant-1.10.14-src.tar.gz 4692736 BLAKE2B b07a2e61fecd4f10056ca2688615ccf02c551bba0f5749f50c2be710e90306e8044b7c557359300654d93971d94520e92f593da44b1c20626db4701d499cddff SHA512 435f97a276d88a86022c5f0680f3c2a16dc36be95adac3d797a2609d96921840a57393c8f5ef8313193146115bd6a87bd4790a4a272c44f7beec892fd6528c10
 DIST apache-ant-1.10.14-src.tar.gz.asc 833 BLAKE2B d9a4b4b3cb22762f25b34651dc81c2f13af38e73fdca27bc2de562539cd8f1692744ac5ccf535a2c61d3035a129f30bafac133872f9ba0ed7b259393b0f4cdf6 SHA512 ff2e79c991f68a5c38c0b47556ca5f5301c1a8be219a9eddf8d2e17b09eed7f0426770c2dc18114ea432f0200ac824d71da633ad7881025692ce5ad4baa899ee
-EBUILD ant-1.10.14-r2.ebuild 12955 BLAKE2B 89d15461574257fed1a8c5c4e0ebe4551c13b164a61a640c197faf552cae961240530ea65c190dc11f53a9b72fffcee4eaeffc557c9d2f1956f7408f9a136e3a SHA512 d713ff2d38ac8644ab95f7a3d971b5c1fdbcd0828fd567a7fa9d25b08c98014d321790e318f2f44f5db7b3ec5a86e6b6f5ef7bc88ca02b0751a5d46909195de7
-EBUILD ant-1.10.9.ebuild 1586 BLAKE2B d88da0b36e9dfb92586b1701f2535a96c1ec9857db67ed7c8d148f24f609c784dedec1820ee4dd3d69910d37455f82e1dd7eb5f95dc5535c96312d052b9bd77c SHA512 9df6451a03b308dac45fa8d11ea18c5ff842ec6da245f39a2804b9788877cac2af65088d833787bf51406841703bc5f0823bdf037358cdc6f0be21c89df2aec4
-MISC metadata.xml 1871 BLAKE2B 506545257db2a93e15fa3c36105453c6efa3c6505dff98d558bea9434637676df7fbf8a4db6e9a6fe04a54c913ad012226ce5e7eb682a8732f140fd6f676c194 SHA512 807240f5312ffa9c7ae789697c4f2ef481ec8819bd800eaa83639129f5bff16ab7c7e80cbe07a57c171faf5efa439c3d45d8e26514418c32ca1764e2c4163b36
+EBUILD ant-1.10.14-r3.ebuild 13056 BLAKE2B 10d9035afc8e89f418deafede5119eb1942eb40f13b88944ba85455fe0ba861a84b1fbeda703a838f1f7743672a5db9e46911c8f72f00f8f2d3957e8de801960 SHA512 9fdd8664f751c606cffc8836c7ea551a0b397ffe0b043556251ebaa3224b4b3a427095cf3ba53801ef6c4caa89627c89ff9df86816582d7805e08ac764eb748e
+MISC metadata.xml 1928 BLAKE2B b48dbca1bf2ab76b0107466c68489722f4ceed5fa53f2a26d983dfd36c74efad96fce9f58d0e6bb5ba1e02d8e44135bcf96bd77b2db7491fd260da907c02fbab SHA512 9313f5e0914d9c64482c4897e659313480630316ca29b57190e976248a63a17b3c293198f82d4143bd25be0766cd4ce9556d2489d76adf74b0203a9dc4998726
diff --git a/dev-java/ant/ant-1.10.14-r2.ebuild b/dev-java/ant/ant-1.10.14-r3.ebuild
index 9a6c7aacc165..d1d0486dd712 100644
--- a/dev-java/ant/ant-1.10.14-r2.ebuild
+++ b/dev-java/ant/ant-1.10.14-r3.ebuild
@@ -20,9 +20,9 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch junit junit4
-	junitlauncher log4j oro regexp resolver testutil xalan xz"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend
+	jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz"
 
 # At least 10 test cases would fail without network
 PROPERTIES="test_network"
@@ -71,9 +71,7 @@ DEPEND="
 	)
 	xz? ( dev-java/xz-java:0 )
 "
-PDEPEND="~dev-java/ant-core-${PV}:0"
 RDEPEND="
-	!<dev-java/ant-core-1.10.14
 	!dev-java/ant-apache-regexp
 	!dev-java/ant-apache-log4j
 	!dev-java/ant-apache-xalan2
@@ -143,7 +141,7 @@ src_prepare() {
 	eprefixify "src/script/ant"
 
 	ANT_TASKS=(
-		ant-antlr # no dependencies
+		$(use antlr && echo ant-antlr) # no dependencies
 		$(use bcel && echo ant-apache-bcel)
 		$(use bsf && echo ant-apache-bsf) # REQUIRED_USE for tests
 		$(use log4j && echo ant-apache-log4j)
@@ -153,12 +151,12 @@ src_prepare() {
 		$(use xalan && echo ant-apache-xalan2)
 		$(use commonslogging && echo ant-commons-logging)
 		$(use commonsnet && echo ant-commons-net)
-		ant-imageio	# no dependencies
+		$(use imageio && echo ant-imageio)	# no dependencies
 		$(use jai && echo ant-jai)
 		$(use jakartamail && echo ant-jakartamail)
 		$(use javamail && echo ant-javamail)
 		$(use jdepend && echo ant-jdepend)
-		ant-jmf	# no dependencies
+		$(use jmf && echo ant-jmf)	# no dependencies
 		$(use jsch && echo ant-jsch)
 		$(use junit && echo ant-junit)	# REQUIRED_USE for junit4 and for testutil
 		$(use junit4 && echo ant-junit4)
@@ -167,7 +165,7 @@ src_prepare() {
 		# available on https://www.netrexx.org/downloads.nsp and states:
 		# "IBM's last NetRexx release, suitable for JVM versions 1.5 and below [...]"
 		# $(use netrexx && echo ant-netrexx) # src/etc/poms/ant-netrexx/pom.xml
-		ant-swing # no dependencies
+		$(use swing && echo ant-swing) # no dependencies
 		$(use testutil && echo ant-testutil)
 		$(use xz && echo ant-xz)
 	)
diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild
deleted file mode 100644
index e68c9948a493..000000000000
--- a/dev-java/ant/ant-1.10.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
-	~dev-java/ant-core-${PV}
-	~dev-java/ant-junit-${PV}
-	~dev-java/ant-apache-xalan2-${PV}
-	antlr? ( ~dev-java/ant-antlr-${PV} )
-	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
-	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
-	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
-	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
-	jai? ( ~dev-java/ant-jai-${PV} )
-	javamail? ( ~dev-java/ant-javamail-${PV} )
-	jdepend? ( ~dev-java/ant-jdepend-${PV} )
-	jmf? ( ~dev-java/ant-jmf-${PV} )
-	jsch? ( ~dev-java/ant-jsch-${PV} )
-	junit? ( ~dev-java/ant-junit-${PV} )
-	junit4? ( ~dev-java/ant-junit4-${PV} )
-	junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
-	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
-	oro? ( ~dev-java/ant-apache-oro-${PV} )
-	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
-	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
-	swing? ( ~dev-java/ant-swing-${PV} )
-	testutil? ( ~dev-java/ant-testutil-${PV} )
-	X? ( ~dev-java/ant-swing-${PV} )
-	xz? ( ~dev-java/ant-xz-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index fbae5fba582e..1c03ec86e251 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -12,6 +12,7 @@
       (<pkg>dev-java/bsf</pkg>)</flag>
     <flag name="commonslogging">Enable commons-logging Ant tasks</flag>
     <flag name="commonsnet">Enable commons-net Ant tasks</flag>
+    <flag name="imageio">Enable imageio Ant tasks</flag>
     <flag name="jai">Enable JAI (Java Imaging) Ant task</flag>
     <flag name="jakartamail">Enable Jakartamail Ant task</flag>
     <flag name="javamail">Enable JavaMail Ant task</flag>