7 files changed, 20 insertions, 24 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f22e4fe47646..9e420eb18092 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index a5272bf137cc..23bd6aa6ac87 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -1,5 +1,5 @@
 AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c903aa919f0426a699051e6b2a3060a46f87ee33f26579de7b3cdf822f749712234dd1b6482130d3f195b77d606a1e SHA512 a8ec511906b80562ac3f8a8c791703ce06f6fd0861ea5a29684e60716a2dff67ec5f497e11959a3f989fcc538f6c3f6dfebfa0fdaeb316965a2c30ee50001eab
 AUX commons-vfs-2.0-incompatibility.patch 2323 BLAKE2B d14a91d06c0b831026260f348c17c82b2725ffcbe00125146f0268d0ec5a95e87175ed23e35143c73654cfa5b14a34930adf01a48f9fc8c280cb3233308f9a77 SHA512 46287b86d2ba9b6d1a9aa3fb90fc0a64724e3862cbb534bdea39c384d4733f037ebf764ea3e6a8ffaccabe343af99097cbe9ba5eb115fef5029757b78cd4e98d
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
-EBUILD commons-vfs-2.0-r2.ebuild 1640 BLAKE2B f4a42735f3579ed2990a2b645f21fa077b4068360f8197d6ded419b805998ed5f75d544ec96406ad479de6c678ba8d7e1b88078c4f04d7a030c96c6a5d3b51c6 SHA512 c8cbd5003f15bc27a9f384b4517cc6912a208586d53d66305198d63a505f263370478771fc2d70c440654256afa7d226b13ef5bbaa9bf61807531480d14a2231
+EBUILD commons-vfs-2.0-r3.ebuild 1645 BLAKE2B 98a54b5e6859257fc5d1bf0535af224b593c6f0efb80b69eed54ccc38ae17c995e94841a8851547ec7e631750741c989091bf22393f97a7672f85aef96290c94 SHA512 24d0218f8548661663f96474a3a529d2c1978add24306ce3cd114900b769c815c8dc15226a7548ccbec2603a306036d82f22cef600a3114c66a54e6c8222f43f
 MISC metadata.xml 523 BLAKE2B c4cba3c890c33ac78a1266a0127d5ff394be884b99d243bcd2eff5516abdb2aefe861f244ffa741b30211c3527be774b3c15ae86c93aee6caf9bc60fe2e7b2de SHA512 c647d90719e4581dfefbf7dfb215136ab94e0b25a069e222dbfe50e90c5ad06ac7052a0ccfc41d82ad423c3d0fe2e410b1473ffd396e833d5581e44176e2b233
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild
index 6a24d0bb811e..418ad23cc41f 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 
@@ -9,14 +9,15 @@ inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A single API for accessing various different file systems"
 HOMEPAGE="https://commons.apache.org/vfs/"
-SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
+SRC_URI="https://archive.apache.org/dist/commons/vfs/source/${P}-src.tar.gz"
+S="${WORKDIR}/${P}/core"
 
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="
-	dev-java/ant-core:0
+	dev-java/ant:0
 	dev-java/commons-collections:0
 	dev-java/commons-logging:0
 	dev-java/commons-net:0
@@ -34,10 +35,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-incompatibility.patch
 )
 
-S="${WORKDIR}/${P}/core"
-
 EANT_GENTOO_CLASSPATH="
-	ant-core
+	ant
 	commons-collections
 	commons-logging
 	commons-net
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index e4667dcb274b..11fbdf99e726 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,3 +1,3 @@
 DIST htmlcleaner-src-2.29.zip 394326 BLAKE2B 6317e5dd51facd901e7a5bdc72322c58deb5d3a2e2d0a784e6cd71b938c7b46b7a612d0610a1e5f96ac6c55714942e00ffa68f2259416fe1e6be8cb5ad96c0b3 SHA512 87c3884f56c01d4f34be71b5a016a839f949f03ea429a3c10cc5518fe954b09aa42d05fdf821e7b0bf2115787cffff6ae72dbe13e3d7e08537c4ffbf51d6b34f
-EBUILD htmlcleaner-2.29.ebuild 1042 BLAKE2B 255983940abdba15b969450efbd26ccfe6bdb0713fb21aa8d74118fd44529b2a8e9a8c5298f68e5d114e8aa22076eb51a37b2d7e75024f4c93a47770513474e5 SHA512 eca94d241a1e918e9f420a9f39fb28957c756c2b096fd19c7548208e378c9b407be48baaa9366de70379044d1c45f269434f126dffade0dfaf3c94e0824be65b
+EBUILD htmlcleaner-2.29-r1.ebuild 1032 BLAKE2B 40019c56d80b9bb4e00e2fc437c837fa495becba377d4b5313ee29ce3c8ce04c030b649a9c312eff2d3cb2a0286fdb2583ebdf496a62922c14b61c3bdc9040de SHA512 e0eb382c6627d2deec44ccdeec53adfe103a44b9156313f56fcd93a0121cbe8fe14894f6adffcb8c3dd70a369828de8e762a39ed61247b5bf4f961f96f1cb239
 MISC metadata.xml 957 BLAKE2B b3efa9952daa1c7027db845d6a7f8c079240c2128d8bb454490990722f2cf66c0f6ebfca4795bd0d166d45e6b4dc764c0ad6bdb53b95945043cf864b6e9d0f22 SHA512 b804e88d45556cddf4a6e2da621a8eb971935370b82c875a9e0dda0772bb23b94a874214d1727335b3ca358f5d10bd363723ba8629413f9169dbf28dd0ef588d
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
index a3637d08cc40..ed7088f6cec6 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,13 +20,13 @@ KEYWORDS="amd64 x86"
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/jdom:2"
 DEPEND="${CP_DEPEND}
-	dev-java/ant-core:0
+	dev-java/ant:0
 	>=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )"
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
-JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_CLASSPATH_EXTRA="ant"
 JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine"
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-java/jal/Manifest b/dev-java/jal/Manifest
index 95850d3f5850..2a59da3e3eef 100644
--- a/dev-java/jal/Manifest
+++ b/dev-java/jal/Manifest
@@ -1,3 +1,3 @@
 DIST jal-20031117.tar.gz 48793 BLAKE2B b7cb51f5adb2b0f2fc4e03c9adf826519accee43aee3d98be0139439408527618af9e30b63c1e439a5defe4c74a0185ea48e9fd24235a319e9571fb8764e080f SHA512 0cb6cbd5e80d38dfbf57417b756dbc3bdddb2a28c4cbec292799ee71ac86cff3121f1e09e86f976f6562dafac54835bdd58780e4f1ffe733897b6d6ef053f95e
-EBUILD jal-20031117-r6.ebuild 1063 BLAKE2B 3c340606dde9226c6687140e313dffef0e582e97e579bf7c0216c7b7fa8e91d5ccebbbb1e7d2756bce44b8dd536f9169c59e0e1f04034cd7a8c2b879a40e947a SHA512 15368e2fd94f43721d7223abb85f2d6fc14073ce2bcb57164457e6accfdf7d9710c1f3e0a0741664862cd937e0f85f1f1979130a7a26290d2722d5830d0df446
+EBUILD jal-20031117-r7.ebuild 1058 BLAKE2B 054d6a30613bc7cb4d6df45c4f4e0c70979aa09301edc3f4d46f79e90f645c961093ebd5060985a2c0ace2f8cb801e93221a0e908743b56b84860a3a0c58044a SHA512 f11dbda1e21e34c0ffd9b62fc0fff4fe55ab4ae557505d66f84693f98eaf7165d76ef31953fc84b67d824e6d767a11e9f78dd5bf5bfca734e321d4314be0fbe8
 MISC metadata.xml 549 BLAKE2B a1f9b88d1930fa34d04a62d2f927f85f981edd46abe2a5a210701a223982abe059c27ee6ef61cf6efe06b0baec457982b5871df4ceabd51068e9bd92645cf9af SHA512 1e30ba295c2d7b008bedf56eaf212266359ca2ecb82206be5e542c44b5912b3ca0f4de8afbc45dab628a35bb3b6d5b2974a596878ecaca7b9054ef9ceaa35028
diff --git a/dev-java/jal/jal-20031117-r6.ebuild b/dev-java/jal/jal-20031117-r7.ebuild
index d8d008aab7b0..184a2ce24dc7 100644
--- a/dev-java/jal/jal-20031117-r6.ebuild
+++ b/dev-java/jal/jal-20031117-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,27 +10,24 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Partial port of the C++ Standard Template Library"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-CP_DEPEND="dev-java/ant-core:0"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
 DEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
+	dev-java/ant:0
+	>=virtual/jdk-1.8:*
+"
 
-S="${WORKDIR}/${P}"
+RDEPEND=">=virtual/jre-1.8:*"
 
+JAVA_CLASSPATH_EXTRA="ant"
 JAVA_SRC_DIR="src/jal"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
 
 	# Generate sources.
 	./instantiate -n byte bytes || die