gentoo auto-resync : 05:04:2023 - 17:25:42

16 files changed, 0 insertions, 751 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6f0896a2d876..7b17ffb099f1 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 9b56a799cbf6..4d19cebd8a30 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,8 +1,5 @@
-AUX batik-1.14-modules 461 BLAKE2B a22123561682c3990ad289ca888453b876bb1a4de03b435445758386297cb8e1058db777d4c79941a407c4b95ad8623a6450dc8ba0acf71f66b25a666ab7695c SHA512 19ec52318a76f16122e0740bb8f744e6b669537ad75f44931c1cf64c407a1d11b6eba4ea4b0e0e37ec5402e9ff99b76e8ae0e5b65f529f6ad56e30625cb7b77e
 AUX batik-squiggle.desktop 177 BLAKE2B 7f4fbc31f31f6ddbdb7802ad4ea6b87c21b39b83cec2caf5f8b68634693b05c66e3f7da6d2cf69f5da6defa2d44fa4c5a0eba4af13308b8f18fb666be86b1d40 SHA512 7e7be90a0a779752cf04bbb1e702f5f3ca773129f7dfebcc3352e55f81cad2d65f6067e07c075f730b7f11235529804856fc226703b5e213216bc110dd978d8e
-DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815 SHA512 689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
 DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
 DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
-EBUILD batik-1.14-r1.ebuild 5212 BLAKE2B 3d4b50a16f0e0e940fa0a7074abbce4824f703d50d3099af157ebdeb3d8147fb7f016b105837e044a836a79fbe96a0e48d8948c1669d0e46d8a64065eed69835 SHA512 39bddd9d287ed85594924148da66586dd9d42e91bce2a18337826494e16846080524b7845266a32675cd8a5891b41c6f1540beb958d1fb3eb07533fcbfb9a6f1
 EBUILD batik-1.16-r1.ebuild 6520 BLAKE2B 168b507f647f73db2e51ee899269cf737602fde22bc8f9c6d1eed8546283cedbdc3d1e61d3394995b49499c3f3d7da7b3e96d8834c35d4082bee34ee698fed8e SHA512 ea78c70ab833ed6fec2c64f13d89bd4f26f6c53ee5bab5cfed03df6e104aa8d3b96c28fe9d88742c7381de60b360cfe6e7f77c5869fea0066ab90d7e55c41286
 MISC metadata.xml 610 BLAKE2B c589c175b595deb71eae6b8fccd46f4d6b82331f636cff28b6074300b6495efb780d157bb1b5b1359070cca7405138fcff719d72f1038023357fc7ab05c52b87 SHA512 73a6bb61c87645d1600ab90ca954599208c8599e967f6e999d973fa80e9693435db8a75ace95c8881486c8e2929d5a201a51e821e5f58763c273b21b5a32c229
diff --git a/dev-java/batik/batik-1.14-r1.ebuild b/dev-java/batik/batik-1.14-r1.ebuild
deleted file mode 100644
index 1a978d257f26..000000000000
--- a/dev-java/batik/batik-1.14-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/xmlgraphics/batik/source/batik-src-1.14.tar.gz --slot 1.14 --keywords "~amd64 ~ppc64 ~x86" --ebuild batik-1.14.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:batik:1.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple xdg-utils
-
-DESCRIPTION="XML Graphics Batik"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.14"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/jacl:0
-	dev-java/jython:2.7
-	dev-java/rhino:1.6
-	dev-java/xalan:0
-	dev-java/xml-commons-external:1.4
-	dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( CHANGES NOTICE README )
-
-S="${WORKDIR}/batik-${PV}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	# We loop over the modules list and compile the jar files.
-	while read module; do
-		einfo "Compiling $module"
-
-		JAVA_SRC_DIR=""
-		JAVA_RESOURCE_DIRS=""
-		JAVA_JAR_FILENAME="$module.jar"
-		JAVA_MAIN_CLASS=""
-
-		# Not all of the modules have resources.
-		if [[ -d $module/src/main/resources ]]; then
-			JAVA_RESOURCE_DIRS="$module/src/main/resources"
-		fi
-
-		# Don't let sed die on modules without MainClass.
-		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
-
-		# Some modules don't have source code.
-		if [[ -d $module/src/main/java/org ]]; then
-			JAVA_SRC_DIR="$module/src/main/java"
-			java-pkg-simple_src_compile
-		else
-			# This case applies to batik-rasterizer.
-			if [[ -d $module/src/main/resources/org ]]; then
-				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C "$module/src/main/resources" . || die
-			# Else for batik-rasterizer-ext, batik-squiggle and batik-squiggle-ext
-			else
-				jar -cfe $module.jar "${JAVA_MAIN_CLASS}" -C . README || die
-				zip -d $module.jar "README"
-			fi
-		fi
-
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
-
-		rm -fr target || die
-	# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions
-	# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
-	# We keep them in the mudules list for later but omit them by 'grep -v'.
-	# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
-	# batik-1.14-modules is the "Reactor Build Order" extracted from the output of "mvn dependency:tree".
-	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-
-	if use doc; then
-		JAVA_SRC_DIR=""
-		JAVA_JAR_FILENAME="ignoreme.jar"
-
-		while read module; do
-			# Some modules don't have source code
-			if [[ -d $module/src/main/java/org ]]; then
-				JAVA_SRC_DIR+=( "$module/src/main/java" )
-			fi
-		done < "${FILESDIR}"/batik-1.14-modules
-
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-	while read module; do
-		einfo "Testing $module"
-
-		JAVA_TEST_SRC_DIR=""
-		JAVA_TEST_RESOURCE_DIRS=""
-		JAVA_TEST_RUN_ONLY=""
-
-		if [[ -d $module/src/test/resources ]]; then
-			JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources"
-		fi
-
-		# https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
-		if [[ $module == batik-util ]]; then
-			JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
-		fi
-
-		if [[ -d $module/src/test/java/org ]]; then
-			JAVA_TEST_SRC_DIR="$module/src/test/java"
-			java-pkg-simple_src_test
-		fi
-	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-}
-
-src_install() {
-	einstalldocs
-	domenu "${FILESDIR}"/batik-squiggle.desktop
-	doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg
-
-	while read module; do
-		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' $module/pom.xml )
-
-		java-pkg_dojar $module.jar
-
-		# Add a launcher if the module has a MainClass.
-		if [[ -n "${JAVA_MAIN_CLASS}" ]]; then
-			java-pkg_dolauncher "$module-${SLOT}" --main "${JAVA_MAIN_CLASS}"
-		fi
-
-		# Some modules don't have source code
-		if [[ -d $module/src/main/java/org ]]; then
-			if use source; then
-				java-pkg_dosrc "$module/src/main/java/*"
-			fi
-		fi
-	done < <(grep -v '\(batik-rasterizer-ext\|batik-squiggle-ext\|batik-test-old\)' "${FILESDIR}"/batik-1.14-modules)
-
-	local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
-	insinto "$(dirname "${java_policy_file}")"
-	newins - "$(basename "${java_policy_file}")" <<- _EOF_
-		grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
-			permission java.security.AllPermission;
-		};
-	_EOF_
-	java-pkg_register-environment-variable \
-		gjl_java_args \
-		"-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-java/batik/files/batik-1.14-modules b/dev-java/batik/files/batik-1.14-modules
deleted file mode 100644
index d9c964870901..000000000000
--- a/dev-java/batik/files/batik-1.14-modules
+++ /dev/null
@@ -1,33 +0,0 @@
-batik-constants
-batik-i18n
-batik-test
-batik-util
-batik-awt-util
-batik-css
-batik-ext
-batik-xml
-batik-dom
-batik-parser
-batik-svg-dom
-batik-anim
-batik-gvt
-batik-script
-batik-bridge
-batik-svggen
-batik-transcoder
-batik-codec
-batik-extension
-batik-gui-util
-batik-svgrasterizer
-batik-rasterizer-ext
-batik-rasterizer
-batik-slideshow
-batik-swing
-batik-svgbrowser
-batik-squiggle-ext
-batik-squiggle
-batik-svgpp
-batik-ttf2svg
-batik-test-swing
-batik-test-svg
-batik-test-old
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index dd2c8b272741..136a5510d990 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,3 @@
-DIST byte-buddy-1.12.21.tar.gz 1931819 BLAKE2B 6b37b21d5f31c1564a3cc4d30870a7eca3c4c0512815db881a20602dc7ac970145dd9cc2bd6af4f2fdca0ff542b43dc675376c91f7ea7fdf3ea306112eba842b SHA512 9513caa9a5fc0924aea46e8de21ad2ad90320a582ad17be93f6305eb27f98d3af2c3fa09565083b5d97c0d9f0a1b0a9c7105738c4b65616e78bf2e7657c4ee76
 DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
-EBUILD byte-buddy-1.12.21.ebuild 4845 BLAKE2B 1464adfb8d4e25f149a6125e95b2b1befceb4963f66df40d42546fc39874aeb70b93949616afee90098b2b473daa8e53cb7c2047399ff9bbf74902ca00cebe8f SHA512 4c1a8dec6ea9a423b5dd45926322c431347631ec50223cae1a0ba63b9667d361c44dc3118b5a2da4a9c6dbc7a5070b0b6e04adbb2fccf48a429169dbb36b5a19
 EBUILD byte-buddy-1.14.0.ebuild 4845 BLAKE2B e18ff465a87146c95e62a90951e52b390e4e3b5c25dfc6fbd8deb63c5050e9cbf20ceebd247c3f0448c8cfc9922572cbec892ab7b68aea7204f833fc8d196e26 SHA512 434691663d4381eedf6224ad0dd4dabf79a73ec6348bb8729069723ff246457bad62ff0024035a12abc536f05b1d148ae003f1e1241060c87545425679252c1e
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.21.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.21.ebuild
deleted file mode 100644
index df9099cd9224..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.12.21.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.21.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.21.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.21 net.bytebuddy:byte-buddy:1.12.21"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	dev-java/asm:9
-	dev-java/findbugs-annotations:0
-	dev-java/jna:4
-	dev-java/jsr305:0
-	test? (
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/byte-buddy-${P}"
-
-JAVA_CLASSPATH_EXTRA="
-	asm-9
-	findbugs-annotations
-	jsr305
-	jna-4
-"
-
-src_prepare() {
-	default
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
-	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy.agent {
-			requires java.instrument;
-			requires static jdk.attach;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			exports net.bytebuddy.agent;
-			exports net.bytebuddy.agent.utility.nullability;
-		}
-	EOF
-
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
-
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
-	local exports="$( \
-		sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \
-		byte-buddy/pom.xml \
-		| sed -e 's:^:exports :' -e 's:,:;:' \
-		| grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
-		)" || die
-	cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
-		module net.bytebuddy {
-			requires static java.instrument;
-			requires static java.management;
-			requires static jdk.unsupported;
-			requires static net.bytebuddy.agent;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			${exports}
-		}
-	EOF
-}
-
-src_compile() {
-	einfo "Compiling byte-buddy-agent.jar"
-	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
-	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
-	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
-	rm -r target || die
-
-	einfo "Compiling byte-buddy.jar"
-	JAVA_JAR_FILENAME="byte-buddy.jar"
-	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
-	JAVA_RESOURCE_DIRS=()
-	JAVA_SRC_DIR="byte-buddy/src/main/java"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
-	rm -r target || die
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		rm byte-buddy-agent/src/main/java/module-info.java || die
-		JAVA_SRC_DIR=(
-			"byte-buddy-agent/src/main/java"
-			"byte-buddy/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
-
-	# @Ignore one of 4 tests, https://bugs.gentoo.org/863386
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-e '/testIgnoreExistingField()/i @Ignore' \
-		-i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
-
-	# @Ignore one of 39 tests, https://bugs.gentoo.org/863386
-	sed \
-		-e '/import org.junit.Test/a import org.junit.Ignore;' \
-		-e '/testNoParameterNameAndModifiers()/i @Ignore' \
-		-i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
-
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-
-	einfo "Testing byte-buddy-agent"
-	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
-	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
-	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
-	java-pkg-simple_src_test
-
-	einfo "Testing byte-buddy"
-	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
-	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
-
-	JAVA_TEST_EXCLUDES=(
-		# all tests in this class fail, https://bugs.gentoo.org/863386
-		net.bytebuddy.build.CachedReturnPluginTest
-	)
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg_dojar "byte-buddy-agent.jar"
-	java-pkg_dojar "byte-buddy.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
-		java-pkg_dosrc "byte-buddy/src/main/java/*"
-	fi
-}
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 2fbd45ce2458..95ee32ee2057 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,6 +1,4 @@
 DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
-DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633
 DIST fop-2.8-src.tar.gz 22855369 BLAKE2B 183649f531068b8f7513613c89f9f66a48894ab97a659e110b91853d5dffc1664d3830a8ced9ba221e22ca02fc51aed991ddee0e927cab59b9160a504f6dab02 SHA512 22e1737b5cd87dc5e014838e2ad867ccf46bdc564fb5c231cc6b4c1f8a9862864679ea7ddf143126058553ed90045941fb07aa2657db9e3ed35660ce11169357
-EBUILD fop-2.7.ebuild 4192 BLAKE2B 605530413f1d44ee7604c6115b3448a54a7bd171f234fea0145e445c98e68bcdbb7bc989fcd01ee2c950932687547d2e4dcd20aa8a1006fc339c8dd014489459 SHA512 0a022f9c1238760823f66299c78d13267a7168273630ca42b7bcf5c18527fcaeec153bb171ad10bc7c187620568ac03fbe901321ab1c960db56fc36f951ad50f
 EBUILD fop-2.8.ebuild 4393 BLAKE2B 7c5aa2c102b5300d830f5d6e35441050eeffbf2f1e5d3532c765c56cad3d5015a4b50b643cb55dd60bd02572b6e21ae68d7d26713bf3a05b5213cc392cb3f9cf SHA512 1f0778c3411a729120de6d56cfe73f701a28c8849588c606fb5e091949f1d7a87330369bb7bf1336abef9a01c3e054139fec62c989687079da6b82aae44733fa
 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4
diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild
deleted file mode 100644
index a40189884199..000000000000
--- a/dev-java/fop/fop-2.7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.xmlgraphics:fop:2.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML Graphics Format Object Processor All-In-One"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-SRC_URI="
-	mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz
-	https://dev.gentoo.org/~flow/distfiles/fop/${P}-jars.tar.xz
-"
-
-LICENSE="Apache-2.0"
-SLOT="2.7"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/batik:1.14
-	dev-java/commons-io:1
-	dev-java/fontbox:0
-	dev-java/qdox:1.12
-	dev-java/sun-jai-bin:0
-	dev-java/xmlgraphics-commons:2
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/ant-core:0
-	dev-java/sun-jai-bin:0
-	test? (
-		dev-java/mockito:4
-		dev-java/pdfbox:0
-		dev-java/xmlunit:1
-	)
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( NOTICE README )
-
-S="${WORKDIR}/fop-${PV}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	JAVA_SRC_DIR="fop-util/src/main/java"
-	JAVA_JAR_FILENAME="fop-util.jar"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-util.jar"
-	rm -r target || die
-
-	JAVA_SRC_DIR="fop-events/src/main/java"
-	JAVA_RESOURCE_DIRS="fop-events/src/main/resources"
-	JAVA_JAR_FILENAME="fop-events.jar"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-events.jar"
-	rm -r target || die
-
-	JAVA_SRC_DIR="fop-core/src/main/java"
-	JAVA_RESOURCE_DIRS="fop-core/src/main/resources"
-	JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' fop-core/pom.xml )
-	JAVA_JAR_FILENAME="fop-core.jar"
-	# Code generation according to
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L150-L219
-	pushd fop-core/src/main/codegen/fonts >/dev/null || die
-		local fonts=$(find . -name "Courier*.xml" \
-			-o -name "Helvetica*.xml" \
-			-o -name "Times*.xml" \
-			-o -name "Symbol.xml" \
-			-o -name "ZapfDingbats.xml"
-			)
-		for font in ${fonts}; do \
-			xalan -XSLTC \
-				-IN $font \
-				-XSL font-file.xsl \
-				-OUT ../../java/org/apache/fop/fonts/base14/${font//.xml}.java || die
-		done
-		xalan -XSLTC \
-			-IN encodings.xml \
-			-XSL code-point-mapping.xsl \
-			-OUT ../../java/org/apache/fop/fonts/base14/CodePointMapping.java || die
-	popd
-	java-pkg-simple_src_compile
-	rm -r target || die
-
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":fop-core.jar"
-
-	# Update "fop-core.jar" with "event-mode.xml" files produced manually
-	# by running "mvn package".
-	mkdir event-model && pushd $_ >/dev/null || die
-		jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar"
-	popd
-	jar -uf "fop-core.jar" -C event-model . || die
-	# Upstream does this with maven-antrun-plugin:
-	# https://github.com/apache/xmlgraphics-fop/blob/fop-2_7/fop-core/pom.xml#L263-L284
-
-	# public class EventProducerCollectorTask extends Task {
-	#
-	#     private List<FileSet> filesets = new java.util.ArrayList<FileSet>();
-	#     private File destDir;
-	#     private File translationFile;
-
-	if use doc; then \
-		JAVA_SRC_DIR=(
-			"fop-util/src/main/java"
-			"fop-events/src/main/java"
-			"fop-core/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,pdfbox,xmlunit-1"
-
-	JAVA_TEST_SRC_DIR="fop-events/src/test/java"
-	JAVA_TEST_RUN_ONLY="org.apache.fop.events.BasicEventTestCase"
-
-	# This jar file was created manually from the output of "mvn test".
-	# Upstream does this with maven-antrun-plugin
-	jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die
-
-	java-pkg-simple_src_test
-
-	sed \
-		-e 's:verifyZeroInteractions:verifyNoInteractions:' \
-		-i fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java || die
-
-	JAVA_TEST_SRC_DIR="fop-core/src/test/java"
-	JAVA_TEST_RESOURCE_DIRS="fop-core/src/test/resources"
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	for module in fop-util fop-events fop-core ; do
-		java-pkg_dojar $module.jar
-		if use source; then
-			java-pkg_dosrc "$module/src/main/java/*"
-		fi
-	done
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	java-pkg_dolauncher "fop-${SLOT}" --main "org.apache.fop.cli.Main"
-	einstalldocs
-}
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 683242aa66ad..a63599d9bda6 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,7 +1,5 @@
 DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
-DIST jakarta-activation-2.1.0.tar.gz 118866 BLAKE2B 169457c88cb99bbcb712c9c6d2c6979bb48df7a84d5a2f302ceb56d21f4242042eef2408cfdcaccdc3fe76b78d5c417e49010885b7bf0a8955b080647cece175 SHA512 753437cfeb03ad15a66ec6895a992aba453cb4eea84042f31ed50c0b59b1299578bf1a8341d29fdf6bc5619d3a40233bf29b66aa5203ed54f295dc321a3fd6aa
 DIST jakarta-activation-api-2.1.1.tar.gz 127696 BLAKE2B d0f89e64a02fa88e251ab6f5eafa1001c987147c2163862e270b36e86c7c811bb32bfbab1aba32c8c4b8e7eab4eeed7478618974191b2f5386a0194a6a556a19 SHA512 95dd5b6696cf3ec66ce843334375740057c37dc5b4503173f607c95bd6020e8d0b8f87ec13b6d9be4d397096300cc0acb323b5700ad7ff0428a178272c1da41f
 EBUILD jakarta-activation-api-1.2.2-r1.ebuild 1318 BLAKE2B 71bb89fe608cd872d7e64983e23fb95d872c48b15c084578e1b9ee75fa3d0f082d683b3cd1cbe37878273c1dfd2a41ff503f4386a22bd02b29f2fa5e061b6417 SHA512 0bbc0afb65d84e25ee3fd9ea64fc9c629581f7553cc22c0b5c09a91cf272e4c60b7a6d352c88c4f8441d139849edbfd644b05f4595353f586578b80935df16fb
-EBUILD jakarta-activation-api-2.1.0-r1.ebuild 701 BLAKE2B c2db36550fec9ac2ff7cd6fc12d8e3fde9d9763ab8044844d339533374593306f86e2ab1e5817a9441a6eff9aebdcd670e17317d3f25d72a3fd9daa99d73d8f3 SHA512 0cbfff8f7e559bda9b6ec241c0c17624d1cb7b932396c580db35d670a5c83de65472f277b5ad357b97290d35297efd3818671f5d1331dbf894eb04c339f4d730
 EBUILD jakarta-activation-api-2.1.1.ebuild 681 BLAKE2B 07d24ea06ffe0e17b3c4645f04c85d385e5efeffab1f52f24b5fdcd58d71e438d0c09accada8d1c75acb181796dc7532ec5caf1f499ae1032d8c52860f33cb55 SHA512 f7b9ee69a3bb8a8637978d4fe25105084e0ca9744987bb99da2148fc853d79d083925f096aec44d0eb55c7c822c6414a040902734f59ea2ba58b8621077bbb6f
 MISC metadata.xml 364 BLAKE2B 448ad0f93216312753658b97fd1cd9ff50754cec6a892f36e228e515be0a360318fed182eb99b131d3ccece5e65bc09a0ec9ab6759a412e0a5f9de68b2c1557c SHA512 98caf2cfedd7ec5bbd34d650db5377ede7e44c3d2f359cb7e86f0412c2962f7a677761002910db9692cba6831a108e819888dce270eb63ed75d73d4835a580b3
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
deleted file mode 100644
index 91741f54c08c..000000000000
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://jakartaee.github.io/jaf-api/"
-SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
-S="${WORKDIR}/jaf-api-${PV}/api"
-
-LICENSE="EPL-1.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index d2d5dcd88c8e..e58d719a6bee 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1,5 +1,3 @@
-DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
 DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc
-EBUILD jakarta-mail-api-2.1.0-r1.ebuild 2293 BLAKE2B 1ec3e487f4e1f8792d0d7c8076d4a13360ebb75fcb7ec2c5f92f2d040b773986be280cf5ed900f63482b6f385d261d38120da6b863d8670f464f480eb95e6d75 SHA512 f3066baed89428e280d1e543077dae08c838714c88e3d7509edbc900f8b03e1b3bf8d3127296ff6ecf9d7456bb28f5e17fc9da847c51175a18ac70d90de5d52a
 EBUILD jakarta-mail-api-2.1.1.ebuild 1960 BLAKE2B c565b2472138787093cb687bac8eb13be959dee3813cf111780fe12a520145918b7a57b03ef6579818ad300337495087e8aaf7befd95dae5b9fe4077d91d4cf4 SHA512 15e693d6655c8e0d68c03bf4e4a166311823cbdfb24e0e0b72399da7add47b7d9f5af3a8c1e9ee1398ef2c0af02b1fffaf31b2a9429ad4bad0a84cfefadc42ec
 MISC metadata.xml 541 BLAKE2B 4cef0be3e1f59957b3e9c4d1fcabd325f72da186319c5637c7c39f77e1413a3d93c8735bcd197d9bb9503affe9a9fc3e1ec594af0c1007a56b63a97061b11d5e SHA512 834f676928f44a0d0a72c3726a90f7992ead5678e0215e5706501facc75e50fce4b630b09640562329417676a82e8b1c1a357c512517d72d28c37d4d8d939eed
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
deleted file mode 100644
index 987359f4550e..000000000000
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/mail/archive/2.1.0.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jakarta-mail-api-2.1.0-r1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jakarta Mail API 2.1 Specification API"
-HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
-SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Probably caused by --module-path missing @${test_sources}
-
-# warning: [options] system modules path not set in conjunction with -source 9
-# src/test/java/module-info.java:24: error: package is empty or does not exist: jakarta.mail.event
-#     exports jakarta.mail.event;
-#                         ^
-# src/test/java/module-info.java:29: error: cannot find symbol
-#     uses jakarta.mail.Provider;
-#                      ^
-#   symbol:   class Provider
-#   location: package jakarta.mail
-# src/test/java/module-info.java:30: error: cannot find symbol
-#     uses jakarta.mail.util.StreamProvider;
-#                           ^
-#   symbol:   class StreamProvider
-#   location: package jakarta.mail.util
-# src/test/java/module-info.java:32: error: cannot find symbol
-#     provides jakarta.mail.util.StreamProvider with jakarta.mail.util.DummyStreamProvider;
-#                               ^
-#   symbol:   class StreamProvider
-#   location: package jakarta.mail.util
-# 4 errors
-RESTRICT="test"
-
-DEPEND="
-	dev-java/jakarta-activation-api:2
-	>=virtual/jdk-11:*
-	test? (
-		>=dev-java/angus-activation-1.0.0-r1:0
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-
-S="${WORKDIR}/mail-${PV}/api"
-
-JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
-JAVA_SRC_DIR="src/main/"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_prepare() {
-	default
-	java-pkg_clean ..
-	java-pkg-2_src_prepare
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index aff1965160f9..a616c35522e4 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,6 +1,3 @@
-AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
-AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
-AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
diff --git a/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml b/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
deleted file mode 100644
index 585ed9f07843..000000000000
--- a/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<project name="Tomcat Serlvet API 2.5/JSP API 2.1" default="deploy" basedir=".">
-
-  <property name="compile.source" value="1.5"/>
-
-  <property name="tomcat.build"      value="${basedir}/output/build"/>
-  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
-  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
-  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
-  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
-
-  <!-- Just build Tomcat -->
-  <target name="build-prepare">
-
-    <available classname="junit.framework.TestCase" property="junit.present" />
-
-    <mkdir dir="${tomcat.build}"/>
-    <mkdir dir="${tomcat.build}/lib"/>
-    <mkdir dir="${tomcat.classes}"/>
-
-  </target>
-
-  <target name="compile">
-
-    <!-- Compile internal server components -->
-    <javac srcdir="java" destdir="${tomcat.classes}"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           optimize="${compile.optimize}"
-           excludes="**/CVS/**,**/.svn/**">
-      <exclude name="java/javax/annotation/**" />
-      <exclude name="java/javax/ejb/**" />
-      <exclude name="java/javax/mail/**" />
-      <exclude name="java/javax/persistence/**" />
-      <exclude name="java/javax/xml/**" />
-      <exclude name="org/**" />
-    </javac>
-    <tstamp>
-      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
-      <format property="TSTAMP" pattern="hh:mm:ss"/>
-    </tstamp>
-    <!-- Copy static resource files -->
-    <filter token="VERSION" value="${version}"/>
-    <filter token="VERSION_NUMBER" value="${version.number}"/>
-    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
-    <copy todir="${tomcat.classes}" filtering="true">
-      <fileset dir="java">
-        <include name="**/*.properties"/>
-        <include name="**/*.dtd"/>
-        <include name="**/*.tasks"/>
-        <include name="**/*.xsd"/>
-        <include name="**/*.xml"/>
-      </fileset>
-    </copy>
-
-  </target>
-
-  <target name="jar" depends="build-prepare,compile">
-    <!-- Servlet 2.5 Implementation JAR File -->
-    <jar  jarfile="${servlet-api.jar}">
-      <fileset dir="${tomcat.classes}">
-        <include name="javax/servlet/*" />
-        <include name="javax/servlet/http/*" />
-        <include name="javax/servlet/resources/*" />
-        <!-- Javadoc and i18n exclusions -->
-        <exclude name="**/package.html" />
-        <exclude name="**/LocalStrings_*" />
-      </fileset>
-    </jar>
-
-    <!-- JSP 2.1 Implementation JAR File -->
-    <jar  jarfile="${jsp-api.jar}">
-      <fileset dir="${tomcat.classes}">
-        <include name="javax/servlet/jsp/**" />
-        <!-- Javadoc and i18n exclusions -->
-        <exclude name="**/package.html" />
-        <exclude name="**/LocalStrings_*" />
-      </fileset>
-    </jar>
-
-    <!-- JSP 2.1 EL Implementation JAR File -->
-    <jar jarfile="${el-api.jar}">
-      <fileset dir="${tomcat.classes}">
-        <include name="javax/el/**" />
-      </fileset>
-    </jar>
-
-  </target>
-
-</project>
diff --git a/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest b/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest
deleted file mode 100644
index dfaa006ea009..000000000000
--- a/dev-java/tomcat-servlet-api/files/jsp-api-2.0-manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %bundleName

-Bundle-Vendor: %vendorName

-Bundle-Localization: plugin

-Import-Package: javax.servlet; version=2.4,javax.servlet.http; version=2.4,javax.servlet.resources; version=2.4

-Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; version=2.0, javax.servlet.jsp.resources; version=2.0,

- javax.servlet.jsp.tagext; version=2.0

-Bundle-Version: 2.0

-Bundle-SymbolicName: javax.servlet.jsp

-

diff --git a/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest b/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest
deleted file mode 100644
index 77e19f1d9ae8..000000000000
--- a/dev-java/tomcat-servlet-api/files/servlet-api-2.4-manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %bundleName

-Bundle-Vendor: %vendorName

-Bundle-Localization: plugin

-Export-Package: javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.resources;version="2.4"

-Bundle-Version: 2.4.0

-Bundle-SymbolicName: javax.servlet

-