summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-java')
-rw-r--r--metadata/md5-cache/dev-java/Manifest.gzbin75668 -> 74376 bytes
-rw-r--r--metadata/md5-cache/dev-java/ant-1.10.14-r3 (renamed from metadata/md5-cache/dev-java/ant-1.10.14-r2)9
-rw-r--r--metadata/md5-cache/dev-java/ant-1.10.911
-rw-r--r--metadata/md5-cache/dev-java/ant-antlr-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-bcel-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r14
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r14
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-oro-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-regexp-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-resolver-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-commons-logging-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-commons-net-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-core-1.10.144
-rw-r--r--metadata/md5-cache/dev-java/ant-core-1.10.9-r515
-rw-r--r--metadata/md5-cache/dev-java/ant-jai-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-javamail-1.10.9-r14
-rw-r--r--metadata/md5-cache/dev-java/ant-jdepend-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-jmf-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-jsch-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-junit-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-junit4-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-junitlauncher-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-swing-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-testutil-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/ant-xz-1.10.94
-rw-r--r--metadata/md5-cache/dev-java/apache-rat-0.1516
-rw-r--r--metadata/md5-cache/dev-java/c3p0-0.9.5.5-r14
-rw-r--r--metadata/md5-cache/dev-java/commons-httpclient-3.1-r215
-rw-r--r--metadata/md5-cache/dev-java/commons-httpclient-3.1-r34
-rw-r--r--metadata/md5-cache/dev-java/commons-vfs-2.0-r24
-rw-r--r--metadata/md5-cache/dev-java/cortado-0.6.0-r24
-rw-r--r--metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r115
-rw-r--r--metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r24
-rw-r--r--metadata/md5-cache/dev-java/fec-1.0.4-r44
-rw-r--r--metadata/md5-cache/dev-java/gin-2.1.2-r14
-rw-r--r--metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r14
-rw-r--r--metadata/md5-cache/dev-java/gwt-2.9.0-r34
-rw-r--r--metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r14
-rw-r--r--metadata/md5-cache/dev-java/javacc-5.0-r415
-rw-r--r--metadata/md5-cache/dev-java/javacc-5.0-r58
-rw-r--r--metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r14
-rw-r--r--metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r34
-rw-r--r--metadata/md5-cache/dev-java/jcalendar-1.4-r14
-rw-r--r--metadata/md5-cache/dev-java/jclasslib-3.1-r14
-rw-r--r--metadata/md5-cache/dev-java/jdom-1.1.3-r14
-rw-r--r--metadata/md5-cache/dev-java/jtidy-1.0-r14
-rw-r--r--metadata/md5-cache/dev-java/lucene-2.4.1-r34
-rw-r--r--metadata/md5-cache/dev-java/saxon-9.2.0.6-r34
-rw-r--r--metadata/md5-cache/dev-java/snappy-1.1.10.515
-rw-r--r--metadata/md5-cache/dev-java/swt-3.7.2-r34
-rw-r--r--metadata/md5-cache/dev-java/swt-4.10-r24
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.404
-rw-r--r--metadata/md5-cache/dev-java/xmlunit-1.6-r115
-rw-r--r--metadata/md5-cache/dev-java/xpp2-2.1.10-r34
55 files changed, 96 insertions, 214 deletions
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 116101674b10..f704ac9a678b 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-java/ant-1.10.14-r2 b/metadata/md5-cache/dev-java/ant-1.10.14-r3
index 3dfd32932560..72b46a5bdebe 100644
--- a/metadata/md5-cache/dev-java/ant-1.10.14-r2
+++ b/metadata/md5-cache/dev-java/ant-1.10.14-r3
@@ -5,15 +5,14 @@ DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration
EAPI=8
HOMEPAGE=https://ant.apache.org/
INHERIT=java-pkg-2 java-pkg-simple verify-sig prefix
-IUSE=bcel bsf commonslogging commonsnet jai jakartamail javamail jdepend jsch junit junit4 junitlauncher log4j oro regexp resolver testutil xalan xz doc source test verify-sig
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+IUSE=antlr bcel bsf commonslogging commonsnet imageio jai jakartamail javamail jdepend jmf jsch junit junit4 junitlauncher log4j oro regexp resolver swing testutil xalan xz doc source test verify-sig
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
LICENSE=Apache-2.0
-PDEPEND=~dev-java/ant-core-1.10.14:0
PROPERTIES=test_network
-RDEPEND=!<dev-java/ant-core-1.10.14 !dev-java/ant-apache-regexp !dev-java/ant-apache-log4j !dev-java/ant-apache-xalan2 !dev-java/ant-commons-logging !dev-java/ant-swing !dev-java/ant-junit4 !dev-java/ant-testutil !dev-java/ant-junitlauncher !dev-java/ant-jai !dev-java/ant-commons-net !dev-java/ant-apache-bsf !dev-java/ant-jmf !dev-java/ant-apache-oro !dev-java/ant-javamail !dev-java/ant-junit !dev-java/ant-jdepend !dev-java/ant-antlr !dev-java/ant-apache-bcel !dev-java/ant-apache-resolver !dev-java/ant-jsch !dev-java/ant-xz >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=!dev-java/ant-apache-regexp !dev-java/ant-apache-log4j !dev-java/ant-apache-xalan2 !dev-java/ant-commons-logging !dev-java/ant-swing !dev-java/ant-junit4 !dev-java/ant-testutil !dev-java/ant-junitlauncher !dev-java/ant-jai !dev-java/ant-commons-net !dev-java/ant-apache-bsf !dev-java/ant-jmf !dev-java/ant-apache-oro !dev-java/ant-javamail !dev-java/ant-junit !dev-java/ant-jdepend !dev-java/ant-antlr !dev-java/ant-apache-bcel !dev-java/ant-apache-resolver !dev-java/ant-jsch !dev-java/ant-xz >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
REQUIRED_USE=junit4? ( junit ) test? ( bsf ) testutil? ( junit )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.14-src.tar.gz verify-sig? ( https://downloads.apache.org/ant/source/apache-ant-1.10.14-src.tar.gz.asc )
_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-pkg-simple 67f37f8db9bdf7868f26504fd7bcbb22 java-utils-2 b346c3901e71ba37137bae0b25b00221 prefix eab3c99d77fe00506c109c8a736186f7 verify-sig a79ba011daaf532d71a219182474d150
-_md5_=5da32cfbcd33a95c5f16cf6b099fe124
+_md5_=179fbbd38f67520e27e4777c88d9cf97
diff --git a/metadata/md5-cache/dev-java/ant-1.10.9 b/metadata/md5-cache/dev-java/ant-1.10.9
deleted file mode 100644
index b935ed17db89..000000000000
--- a/metadata/md5-cache/dev-java/ant-1.10.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=~dev-java/ant-core-1.10.9
-DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration files
-EAPI=7
-HOMEPAGE=https://ant.apache.org/
-IUSE=X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/ant-core-1.10.9 ~dev-java/ant-core-1.10.9 ~dev-java/ant-junit-1.10.9 ~dev-java/ant-apache-xalan2-1.10.9 antlr? ( ~dev-java/ant-antlr-1.10.9 ) bcel? ( ~dev-java/ant-apache-bcel-1.10.9 ) bsf? ( ~dev-java/ant-apache-bsf-1.10.9 ) commonslogging? ( ~dev-java/ant-commons-logging-1.10.9 ) commonsnet? ( ~dev-java/ant-commons-net-1.10.9 ) jai? ( ~dev-java/ant-jai-1.10.9 ) javamail? ( ~dev-java/ant-javamail-1.10.9 ) jdepend? ( ~dev-java/ant-jdepend-1.10.9 ) jmf? ( ~dev-java/ant-jmf-1.10.9 ) jsch? ( ~dev-java/ant-jsch-1.10.9 ) junit? ( ~dev-java/ant-junit-1.10.9 ) junit4? ( ~dev-java/ant-junit4-1.10.9 ) junitlauncher? ( ~dev-java/ant-junitlauncher-1.10.9 ) log4j? ( ~dev-java/ant-apache-log4j-1.10.9 ) oro? ( ~dev-java/ant-apache-oro-1.10.9 ) regexp? ( ~dev-java/ant-apache-regexp-1.10.9 ) resolver? ( ~dev-java/ant-apache-resolver-1.10.9 ) swing? ( ~dev-java/ant-swing-1.10.9 ) testutil? ( ~dev-java/ant-testutil-1.10.9 ) X? ( ~dev-java/ant-swing-1.10.9 ) xz? ( ~dev-java/ant-xz-1.10.9 )
-SLOT=0
-_md5_=4dcc55ccb3fe02077651ecb984b0b2b7
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.10.9 b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
index 7adb0a2ff09f..a5972e094899 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks for Antlr
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=95b25a81b2078596185b8c633916297c
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
index 2a56cab49878..bd430a0546f9 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on bcel
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=38e89e04094fd723f33e230a67080265
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1
index 0c995b7fc787..0bd013d00253 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.10.9-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?] >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?] >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on bsf-2.3
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[javascript?,tcl?] >=dev-java/java-config-2.2
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=aaeb7a056c47e4a8f4243b83dbeefa27
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
index 078fbd055be5..cf1c0cabda36 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.10.9-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on log4j-12-api-2
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-co
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=6927de0050741d27d434190f09d25282
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
index e291724cc65a..a79650883e0d 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on jakarta-oro-2.0
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=ece355386a034501aefc3abbf63f290c
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
index 5aed3d31ea1e..7eb87d8b6ff9 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on jakarta-regexp-1.4
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~de
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=b1df8370de1c2e4446bbc1a857090021
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
index ed269bafb784..176a4f68ba59 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on xml-commons-resolver
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~d
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=9010b1d5007987008f8989150f4f3459
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
index b2cc56f4c7c8..d1f858ad6973 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on xalan
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=525c909435e802693faa9089623d681a
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
index 3abf2383cab1..67ec752a8f92 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on commons-logging
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~d
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=c17cca848a2209269372949af9e28e04
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9 b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
index 3662d8bb5bba..4bf3285db8f8 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on commons-net
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-j
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=f9777c11b201ce8e54fdb4c143832bfd
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.14 b/metadata/md5-cache/dev-java/ant-core-1.10.14
index 931434c21a43..d9b9aebd0faf 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.14
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.14
@@ -4,9 +4,9 @@ DESCRIPTION=Compatibility link to ant-core for >=dev-java/ant-1.10.14
EAPI=8
HOMEPAGE=https://ant.apache.org/
INHERIT=java-pkg-2
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221
-_md5_=5d64d7cefa6d375279a415c929081d9f
+_md5_=4a7a09f7f7a137b4887e37ac4fd15f34
diff --git a/metadata/md5-cache/dev-java/ant-core-1.10.9-r5 b/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
deleted file mode 100644
index e9623b472bf4..000000000000
--- a/metadata/md5-cache/dev-java/ant-core-1.10.9-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* doc? ( dev-java/bcel:0 dev-java/bsf:2.3 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/jakarta-activation-api:1 dev-java/jakarta-regexp:1.4 dev-java/jakarta-oro:2.0 dev-java/jdepend:0 dev-java/jsch:0 dev-java/log4j-12-api:2 dev-java/javax-mail:0 dev-java/sun-jai-bin:0 dev-java/xalan:0 dev-java/xml-commons-resolver:0 dev-java/xz-java:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) dev-java/javatoolkit
-DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration files
-EAPI=8
-HOMEPAGE=https://ant.apache.org/
-INHERIT=java-pkg-2 java-ant-2 prefix
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=059cc9a4ad7fe562359e8db875e5e2e7
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.10.9 b/metadata/md5-cache/dev-java/ant-jai-1.10.9
index 34256937c17b..36dafc363647 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jai-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on sun-jai-bin
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=42e8a3bbc17b75be224e72baf75747a2
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1 b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
index f3c22e00fd19..b23264c525cd 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.10.9-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on gnu-jaf-1
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=virtual/jdk:1.8 dev-java/gnu-jaf:1 dev-java/javax-mail:0 >=dev-java/java
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=0d0fe5000a6697f59ae1a22ee8899d2d
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9 b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
index 182099e67045..274de010d449 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on jdepend
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/an
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=f3b9655aa578743dcf51d9369738a1e4
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.10.9 b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
index 398fa21b8236..bfdefa701758 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks for the Java Media Framework (JMF)
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=9d7fd9f097b82993ec1201c2aac20158
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.10.9 b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
index 6bf359e1a14a..2a143c1040ea 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on jsch
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-c
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=ddcbb7ce88f3db70836c837727ec9c66
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.10.9 b/metadata/md5-cache/dev-java/ant-junit-1.10.9
index 061ca121d2e2..12338c886ae6 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on junit
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-j
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=6367f66edd8a2057d214a119368067a2
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.10.9 b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
index 9d3c42a8fc4c..799bc1669062 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on junit-4
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.10.9 >=dev-java/java-config-2.2.0
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=6967158f03a23bbcfe494ed4c782ad81
diff --git a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9 b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
index e6c4de95cc32..b8cbace4537a 100644
--- a/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-junitlauncher-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks depending on
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=6a9589f1600cbdca6a8c270f017a4a35
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.10.9 b/metadata/md5-cache/dev-java/ant-swing-1.10.9
index f21a0075d9fa..91af0226baae 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-swing-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks for Swing
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10.9:0 >=virtual/jr
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=3be3c9a424df111d8108d7ea3aac88e9
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.10.9 b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
index 1904fdf774ca..4ac7acc13c58 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8 >=dev-java/junit-4.11:4 ~dev-java/ant-swing-1.10.9 ~dev-java/ant-junit4-1.10.9 ~dev-java/ant-junitlauncher-1.10.9 >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8 >=dev-java/junit-4.11:4 ~dev-java/ant-swing-1.10.9 ~dev-java/ant-junit4-1.10.9 ~dev-java/ant-junitlauncher-1.10.9 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional test utility classes
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 ~d
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=fe7b077b1b09f4e16b940f01228f6e8d
diff --git a/metadata/md5-cache/dev-java/ant-xz-1.10.9 b/metadata/md5-cache/dev-java/ant-xz-1.10.9
index 6e6b6f5207cf..9eac6c0c8043 100644
--- a/metadata/md5-cache/dev-java/ant-xz-1.10.9
+++ b/metadata/md5-cache/dev-java/ant-xz-1.10.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
+DEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit ~dev-java/ant-core-1.10.9:0 >=virtual/jdk-1.8
DESCRIPTION=Apache Ant's optional tasks for XZ compression
EAPI=7
HOMEPAGE=https://ant.apache.org/
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xz-java >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.10
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.10.9-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.9-gentoo.tar.bz2
-_eclasses_=ant-tasks f4cef80c43613a641f3f0f22d74883f0 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=ant-tasks e09b5b633d67069638691986e11da782 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=80b30c32b257df29fde82bdf94428c6f
diff --git a/metadata/md5-cache/dev-java/apache-rat-0.15 b/metadata/md5-cache/dev-java/apache-rat-0.15
deleted file mode 100644
index 871bff884621..000000000000
--- a/metadata/md5-cache/dev-java/apache-rat-0.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-creadur ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-compress:0 dev-java/commons-io:1 dev-java/commons-lang:3.6 >=virtual/jdk-1.8:* test? ( dev-java/ant-testutil:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Apache Rat is a release audit tool, focused on licenses
-EAPI=8
-HOMEPAGE=https://creadur.apache.org/rat/
-INHERIT=java-pkg-2 java-pkg-simple verify-sig
-IUSE=doc source test verify-sig
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-compress:0 dev-java/commons-io:1 dev-java/commons-lang:3.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache//creadur/apache-rat-0.15/apache-rat-0.15-src.tar.bz2 verify-sig? ( https://archive.apache.org/dist/creadur/apache-rat-0.15/apache-rat-0.15-src.tar.bz2.asc )
-_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-pkg-simple 67f37f8db9bdf7868f26504fd7bcbb22 java-utils-2 b346c3901e71ba37137bae0b25b00221 verify-sig a79ba011daaf532d71a219182474d150
-_md5_=32f4b7e4981692921b2a14cff7f808a5
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
index 5668077810cd..0016b83f114f 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.5-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=JDBC drivers with JNDI-bindable DataSources
EAPI=8
HOMEPAGE=https://www.mchange.com/projects/c3p0/
@@ -10,5 +10,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
RDEPEND=>=virtual/jre-1.8:* dev-java/log4j-12-api:2 dev-java/mchange-commons:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/c3p0/c3p0-src/c3p0-0.9.5.5/c3p0-0.9.5.5.src.tgz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=6af13cc902a709bd62f79cdde4d1843f
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
deleted file mode 100644
index 35bb39543174..000000000000
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=The Jakarta Commons HttpClient library
-EAPI=7
-HOMEPAGE=https://hc.apache.org/httpclient-legacy/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc examples source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=4bfadc2ca13c5ff2db0bdd47f2f9d72c
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
index 0726fb379f96..5032a3126dbe 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r3
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://hc.apache.org/httpclient-legacy/
INHERIT=java-pkg-2 java-pkg-simple verify-sig
IUSE=doc source test verify-sig
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test !test? ( test )
SLOT=3
SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz verify-sig? ( https://downloads.apache.org/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz.asc )
_eclasses_=java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-pkg-simple 67f37f8db9bdf7868f26504fd7bcbb22 java-utils-2 b346c3901e71ba37137bae0b25b00221 verify-sig a79ba011daaf532d71a219182474d150
-_md5_=315946907ac35ed67b4b6481d20e8b3d
+_md5_=6d179a54999ce0dd9cf46f9937cb8896
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
index 677926d02f17..739047a562ab 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=A single API for accessing various different file systems
EAPI=7
HOMEPAGE=https://commons.apache.org/vfs/
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2
SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=7fe2e1d80a50330b345a7433034ced4f
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r2 b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
index 7eeb94c7d26a..d187f0075752 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r2
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Multimedia framework for Java written by Fluendo
EAPI=8
HOMEPAGE=https://www.theora.org/cortado/
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=9b2debbc537a0092e0ea6d6a4fbe4292
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
deleted file mode 100644
index f5fc1707c23c..000000000000
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/xerces:2 test? ( dev-java/ant-junit:0 dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Ant-tasks to compile various source languages and produce executables
-EAPI=8
-HOMEPAGE=http://ant-contrib.sourceforge.net/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc examples source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=e34ce749cce1ab0dc73cf770b0590392
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
index 31798c0c5fcb..d9be51e049cc 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/ant-1.10.14:0 dev-java/xerces:2 test? ( >=dev-java/ant-1.10.14:0[junit] dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/ant-1.10.14:0 dev-java/xerces:2 test? ( >=dev-java/ant-1.10.14:0[junit] dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Ant-tasks to compile various source languages and produce executables
EAPI=8
HOMEPAGE=https://ant-contrib.sourceforge.net/
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14:0 dev-java/xerces:2 >=dev-jav
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=4119d44de9ef5503b26406249cd4cc26
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r4 b/metadata/md5-cache/dev-java/fec-1.0.4-r4
index 95bbcb79de75..2d1f3f4919e6 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r4
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r4
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/log4j-12-api:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/log4j-12-api:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Forward Error Correction library in Java
EAPI=8
HOMEPAGE=https://github.com/hyphanet/contrib/blob/master/README
@@ -11,5 +11,5 @@ RDEPEND=dev-java/log4j-12-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=367ae75dc05c4448025f00e17507b758
diff --git a/metadata/md5-cache/dev-java/gin-2.1.2-r1 b/metadata/md5-cache/dev-java/gin-2.1.2-r1
index 7feeef11ae63..09539a0a6fa1 100644
--- a/metadata/md5-cache/dev-java/gin-2.1.2-r1
+++ b/metadata/md5-cache/dev-java/gin-2.1.2-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Google Gin (GWT INjection)
EAPI=7
HOMEPAGE=https://gwtplus.github.io/google-gin/
@@ -11,5 +11,5 @@ RDEPEND=dev-java/aopalliance:1 dev-java/javax-inject:0 dev-java/gwt:2.8 dev-java
RESTRICT=mirror
SLOT=2.1
SRC_URI=https://github.com/gwtplus/google-gin/archive/2.1.2.tar.gz -> gin-2.1.2.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=2411d184bca3209b2a42c682775c8ad2
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
index 986ff3a7cc19..451d42327bd5 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.2-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=GNU implementation of the JavaBeans Activation Framework
EAPI=8
HOMEPAGE=https://www.gnu.org/software/classpathx/jaf/jaf.html
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gnu/classpathx/activation-1.1.2.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=8262c20d8c547d826d3620a0c5929896
diff --git a/metadata/md5-cache/dev-java/gwt-2.9.0-r3 b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
index 33ad181bdfd7..1acdaf1b4051 100644
--- a/metadata/md5-cache/dev-java/gwt-2.9.0-r3
+++ b/metadata/md5-cache/dev-java/gwt-2.9.0-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:4.15 dev-java/validation-api:1.0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Google Web Toolkit library
EAPI=8
HOMEPAGE=https://www.gwtproject.org/
@@ -11,5 +11,5 @@ RDEPEND=dev-java/guava:0 dev-java/rhino:1.6 dev-java/asm:9 dev-java/eclipse-ecj:
RESTRICT=mirror test
SLOT=2.8
SRC_URI=https://github.com/gwtproject/gwt/archive/2.9.0.tar.gz -> gwt-2.9.0.tar.gz https://github.com/gwtproject/tools/archive/194772ed94078802d8030136796de344eb1fdbe1.tar.gz -> gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=ff32efc4c783593995d5cb71417aa35b
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
index 0c24a35b41dc..8345ac200831 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.50-r1
@@ -1,6 +1,6 @@
BDEPEND=virtual/jdk
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 dev-util/cunit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 dev-util/cunit ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=A wrapper that makes it possible to install a Java Application as daemon
EAPI=8
HOMEPAGE=https://wrapper.tanukisoftware.com
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://download.tanukisoftware.com/wrapper/3.5.50/wrapper_3.5.50_src.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-pkg-simple 67f37f8db9bdf7868f26504fd7bcbb22 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-pkg-simple 67f37f8db9bdf7868f26504fd7bcbb22 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=0289e85479573729c116bd0e84ef1649
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r4 b/metadata/md5-cache/dev-java/javacc-5.0-r4
deleted file mode 100644
index 67a2fb244101..000000000000
--- a/metadata/md5-cache/dev-java/javacc-5.0-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
-EAPI=8
-HOMEPAGE=https://javacc.github.io/javacc/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc examples source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=d89460767e9b517238fbed3a2464460d
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r5 b/metadata/md5-cache/dev-java/javacc-5.0-r5
index 5ff42980de49..ce7210143784 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r5
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r5
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/junit:0 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-1.10.14:0[junit] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/junit:0 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-1.10.14:0[junit] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
EAPI=8
HOMEPAGE=https://javacc.github.io/javacc/
INHERIT=java-pkg-2 java-ant-2
IUSE=doc examples source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=BSD
RDEPEND=dev-java/junit:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=732bfb12857b70964822acb5d6486c3d
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_md5_=df67519aba806bc4964b5d62fdd82825
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
index 0e358fae76be..02e64ec96b61 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/jflex:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/ant-core:0 dev-java/jflex:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=CUP Parser Generator for Java
EAPI=7
HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=b7861a015fa8d672bd4aa7c7aa5ac1b6
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
index 127a3a02da4c..8a67a3b0b329 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=virtual/jdk:1.8 dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=virtual/jdk:1.8 dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=The JavaHelp system online help system
EAPI=8
HOMEPAGE=https://javaee.github.io/javahelp/
@@ -10,5 +10,5 @@ LICENSE=GPL-2-with-linking-exception
RDEPEND=>=virtual/jre-1.8:* dev-java/javax-jsp-api:2.0 dev-java/javax-servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=affaa6213111dd69d75e3f3d70a021a5
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
index bc4af3ef9741..2b44f6c19524 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r1
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
@@ -1,6 +1,6 @@
BDEPEND=app-arch/unzip
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Java date chooser bean for graphically picking a date
EAPI=8
HOMEPAGE=https://www.toedter.com/en/jcalendar/
@@ -12,5 +12,5 @@ RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2
RESTRICT=test
SLOT=1.2
SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1-r1 b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
index 42379d6eacc1..0c14d4332389 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Java bytecode viewer
EAPI=8
HOMEPAGE=https://github.com/ingokegel/jclasslib
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=e8fc11b9dda2ea2bc79f400b074596a3
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r1 b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
index 9a6195a95eb9..795581f70564 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Java API to manipulate XML data
EAPI=7
HOMEPAGE=http://www.jdom.org
@@ -10,5 +10,5 @@ LICENSE=JDOM
RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0-r1 b/metadata/md5-cache/dev-java/jtidy-1.0-r1
index 4fb547641196..0848f0f6cfc9 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0-r1
+++ b/metadata/md5-cache/dev-java/jtidy-1.0-r1
@@ -1,6 +1,6 @@
BDEPEND=app-arch/unzip
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Java port of HTML Tidy, an HTML syntax checker and pretty printer
EAPI=8
HOMEPAGE=http://jtidy.sourceforge.net/
@@ -11,5 +11,5 @@ LICENSE=HTML-Tidy W3C
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/project/jtidy/JTidy/r938/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=b140cbe80d1d147d604ba3d6832d278c
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r3 b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
index cc819a9ee550..b9e4d23bb8e9 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r3
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/javacc:0 virtual/jdk:1.8 test? ( dev-java/junit:0 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/javacc:0 virtual/jdk:1.8 test? ( dev-java/junit:0 dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=High-performance, full-featured text search engine written entirely in Java
EAPI=8
HOMEPAGE=https://lucene.apache.org
@@ -11,5 +11,5 @@ RDEPEND=dev-java/javacc:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 so
RESTRICT=!test? ( test )
SLOT=2.4
SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=590e0bfc50c22320d0caef8faa97ffbd
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
index 9dfc1bc07692..5db4fc138718 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r3
@@ -1,6 +1,6 @@
BDEPEND=app-arch/unzip
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=A XSLT and XQuery Processor
EAPI=8
HOMEPAGE=https://www.saxonica.com/index.html https://saxon.sourceforge.net/
@@ -11,5 +11,5 @@ LICENSE=MPL-1.0
RDEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=9
SRC_URI=mirror://sourceforge/project/saxon/Saxon-HE/9.2/saxonhe9-2-0-6source.zip
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=492c373b39e55881c0c316c96e9a9551
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.10.5 b/metadata/md5-cache/dev-java/snappy-1.1.10.5
deleted file mode 100644
index 33dfd0e21d47..000000000000
--- a/metadata/md5-cache/dev-java/snappy-1.1.10.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare pretend setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshuffle test? ( dev-java/ant-junit4:0 dev-java/commons-io:1 dev-java/commons-lang:3.6 dev-java/plexus-classworlds:0 dev-java/xerial-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Snappy compressor/decompressor for Java
-EAPI=8
-HOMEPAGE=https://github.com/xerial/snappy-java/
-INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-core:0 app-arch/snappy dev-libs/bitshuffle >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.1
-SRC_URI=https://github.com/xerial/snappy-java/archive/v1.1.10.5.tar.gz -> snappy-1.1.10.5.tar.gz test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/3.3.5/hadoop-common-3.3.5.jar )
-_eclasses_=check-reqs 02ac7654b64f7acc7a8b1a35ad9d6ddc java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-pkg-simple 67f37f8db9bdf7868f26504fd7bcbb22 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=b8f3b37ed8c2071fa2c78b0cbb548b93
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r3 b/metadata/md5-cache/dev-java/swt-3.7.2-r3
index d84c063f8791..7173b56b0e8e 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r3
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r3
@@ -1,6 +1,6 @@
BDEPEND=app-arch/unzip virtual/pkgconfig
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) virtual/jdk:1.8 x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) virtual/jdk:1.8 x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=GTK based SWT Library
EAPI=7
HOMEPAGE=https://www.eclipse.org/
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
SLOT=3.7
SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( https://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-osgi c82db640aeccac34f009e90c7bb10a81 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-osgi c82db640aeccac34f009e90c7bb10a81 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=da01f369ec32ff0e9e1a3bf3b58fdd50
diff --git a/metadata/md5-cache/dev-java/swt-4.10-r2 b/metadata/md5-cache/dev-java/swt-4.10-r2
index 24f9e80d6e9c..a91eac3767df 100644
--- a/metadata/md5-cache/dev-java/swt-4.10-r2
+++ b/metadata/md5-cache/dev-java/swt-4.10-r2
@@ -1,6 +1,6 @@
BDEPEND=app-arch/unzip virtual/pkgconfig
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jdk-1.8:*[-headless-awt] x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jdk-1.8:*[-headless-awt] x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=GTK based SWT Library
EAPI=7
HOMEPAGE=https://www.eclipse.org/
@@ -11,5 +11,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) webkit? ( net-libs/webkit-gtk:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=4.10
SRC_URI=amd64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-x86_64.zip ) ppc64? ( https://archive.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/swt-4.10-gtk-linux-ppc64le.zip )
-_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-osgi c82db640aeccac34f009e90c7bb10a81 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=flag-o-matic 24c947ff5f858625cf0b33c15eed4425 java-ant-2 695635244f02d8e4820279a6511ccc18 java-osgi c82db640aeccac34f009e90c7bb10a81 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=9357b69c0bdc450cae3296a3992da441
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
index 9e341f4846f6..275e2213fb9d 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=Tomcat's Servlet API 2.3/JSP API 1.2 implementation
EAPI=7
HOMEPAGE=https://tomcat.apache.org/
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.3
SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-4/v4.1.40/src/apache-tomcat-4.1.40-src.tar.gz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=d65353f5132fb112929415131a525e35
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6-r1 b/metadata/md5-cache/dev-java/xmlunit-1.6-r1
deleted file mode 100644
index 39a98db0b648..000000000000
--- a/metadata/md5-cache/dev-java/xmlunit-1.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* app-arch/unzip:0 doc? ( app-text/docbook-xsl-stylesheets:0 ) test? ( dev-java/ant-junit:0 dev-java/ant-core:0 ) dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=XMLUnit extends JUnit and NUnit to enable unit testing of XML
-EAPI=8
-HOMEPAGE=https://sourceforge.net/projects/xmlunit/ https://www.xmlunit.org
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source test
-KEYWORDS=amd64 ~arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=mirror://sourceforge/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%201.6/xmlunit-1.6-src.zip
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
-_md5_=f771c91245e878c1083966be775a99cf
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
index bbd9acad2f1c..3f7bf1b7e28d 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
DESCRIPTION=A streaming pull XML parser used to quickly process input elements
EAPI=7
HOMEPAGE=https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 so
RESTRICT=test
SLOT=0
SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=java-ant-2 53b9c110af009f9f4548f5b129ae6fe6 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
+_eclasses_=java-ant-2 695635244f02d8e4820279a6511ccc18 java-pkg-2 b6d755b4f6afabfd933932be28b46368 java-utils-2 b346c3901e71ba37137bae0b25b00221 multilib c19072c3cd7ac5cb21de013f7e9832e0 toolchain-funcs e56c7649b804f051623c8bc1a1c44084
_md5_=c997da50407e1c5b051225df8e317c3c