3 files changed, 36 insertions, 39 deletions
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 41732dd1df60..f223305f507e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,3 +1,3 @@
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
-EBUILD tomcat-servlet-api-4.1.40.ebuild 979 BLAKE2B 4a397aa3643ee673e454ca42c924200ec44441523b1c004c5537e2f2ae4133eedc4fa0ed05a35c3cbc700c72a1536d31e8efc1e25d6b251d29af06ed8cabc7e6 SHA512 6abaff35c0518c1c335d15b785f0df3a82b7899fd7c8b34461497de14c056c6d4c51657a9b88a322d6d0da7f479e760cbd32d3ac8dc293c41ae53de0811b74d7
+EBUILD tomcat-servlet-api-4.1.40-r1.ebuild 1017 BLAKE2B 16b4a89ad85189c5d9947c419ece03700171f4ede57775ec5ac5a46ec5fd8464f32b733c3d9cd3ae6473aec36769ff08681cd49a2042fdd69df80a681c3cc399 SHA512 f316c2a89e48924a9380f11df65eb1d0e0a79d198ce24a99c7ddb41153cdabb24155b761d959afa4fdea291f5bd156ce9bfe7141d4c230f2d066bef191cd105f
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
new file mode 100644
index 000000000000..aa60f541a8f7
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="apache-${P/-servlet-api/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+JAVA_RESOURCE_DIRS="res/src/share"
+JAVA_SRC_DIR="src/share"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir src/share/javax/servlet/{,jsp/}resources || die
+	mv src/share/dtd/web-app* src/share/javax/servlet/resources || die
+	mv src/share/dtd/* src/share/javax/servlet/jsp/resources || die
+	mkdir res || die
+	find src -type f ! -name '*.java' ! -name '*.gif' \
+		| xargs cp --parent -t res || die
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
deleted file mode 100644
index 4cddc788557a..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-${P/-servlet-api/}-src"
-DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz"
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-S="${WORKDIR}/${MY_P}/servletapi"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	einfo "Removing bundled jars and classes"
-	find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-EANT_BUILD_TARGET="all"
-
-src_install() {
-	java-pkg_dojar dist/lib/servlet.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use source && java-pkg_dosrc src/share/javax
-	dodoc dist/README.txt
-}