gentoo auto-resync : 15:06:2024 - 00:09:17

6 files changed, 87 insertions, 21 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index db8133b4739c..0c0e8e0ef640 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index da7ffe0854b9..c948eb7ecfd4 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -4,4 +4,5 @@ DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccd
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r3.ebuild 1043 BLAKE2B 49cd6ce20f03ffad87b428f59be7ee797e51727d0640d6131e42047bb3d233923d3a99acd289f24a9d4cf3a0b2a0a05a389c1b281702d3f4dac30a3101f4da82 SHA512 64789d10c642a204fa3bb2444efd891c184888d28c60c24a470733bdaa07f85f19afcd6e941d745f05fcbae546ae33d05c55891021460c28599423d38fc3bfd4
 EBUILD saxon-9.2.0.6-r4.ebuild 2010 BLAKE2B 457aacad3407f5b271d2106f9b783ad36d7eed0f92d5186ae9fc3662e13177e42fbb771472692ac932dfcfeaf8c919d8d2ecab1db16c41008d0d4a9f3b6a854c SHA512 cad6bd60cebe438e2ad1c868a5fd5065c9fb52347e219b14c19e1d489e1c2c48971869f3669f1e75e1539c6d8ca1a12c25e4fb244e5bc52ed3fe93d577025be2
-MISC metadata.xml 312 BLAKE2B 819738845b7b0a9a9fcc19e4997fdfdaf55b820253d58ea32b1fac35dab2b5760e4cdadd38607b54df2f3bc2b10eee0d747d59c6785ecb3f1b3ca3a68e428be7 SHA512 f798aabc41fc786a18b25c42ac3201b8f2d3e665397f53bc1988531f8ea75ce0d8517af43dadf6fac433d8f689f25dc7f6593c83d941feac5a2d14fe58c82fd1
+EBUILD saxon-9.2.0.6-r5.ebuild 1621 BLAKE2B c6b1d6cc2d93cc7c69ef0f6019846f60588533a64c5d7db1c05a676b52aadb0fc688da8f9c80326ad26687db36eb8cf4fb4261841b7de6ba92d545b86a7f2c82 SHA512 12bf571f08171510178498fbcf7bd0b7aabdaeea8353f159ddb5ca42a97c4d55993e1b27984263d44bdb92a9ed7fbffd623307bc945379abada292a73aa850fe
+MISC metadata.xml 390 BLAKE2B 41b48e05888618320dd9f41627184a0483c753bc8150a0c304aebe18eb512395abbb2250087782784347ff19cc7011f0066d2bc01b4ba1a57144ee3063004bb0 SHA512 a34072ff9c96b6e167cbf3f8e922fdce358c567491e03eaa10b5f1e5107154cc084aff67f3f50e4cc0b8242e24e606bd74c5c2986a59cd2d1608c0763703c274
diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml
index 4a2440bdfc71..796069569107 100644
--- a/dev-java/saxon/metadata.xml
+++ b/dev-java/saxon/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="sourceforge">saxon</remote-id>
 	</upstream>
+	<use>
+		<flag name="ant-task">BUILD and register the ant-task</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-java/saxon/saxon-9.2.0.6-r5.ebuild b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
new file mode 100644
index 000000000000..474bdfb14787
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6-r5.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+DESCRIPTION="A XSLT and XQuery Processor"
+HOMEPAGE="https://www.saxonica.com/index.html https://saxon.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
+
+LICENSE="MPL-1.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="ant-task"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="
+	dev-java/dom4j:1
+	dev-java/jdom:0
+	dev-java/xom:0
+"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*
+	ant-task? ( >=dev-java/ant-1.10.14-r3:0 )"
+
+JAVA_ENCODING="iso-8859-1"
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# Fedora-inspired removal.
+
+	# deadNET.
+	rm -rv net/sf/saxon/dotnet || die
+
+	# Depends on XQJ (javax.xml.xquery).
+	rm -rv net/sf/saxon/xqj || die
+
+	# This requires a EE edition feature (com.saxonica.xsltextn).
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
+
+	if use ant-task; then
+		JAVA_GENTOO_CLASSPATH+="ant"
+	else
+		rm net/sf/saxon/ant/AntTransform.java || die
+	fi
+
+	mkdir resources || die
+	cat > "resources/edition.properties" <<-EOF
+		config=net.sf.saxon.Configuration
+		platform=net.sf.saxon.java.JavaPlatform
+	EOF
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
+	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
+	use ant-task && java-pkg_register-ant-task
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 41732dd1df60..9adcb7b3950c 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 1027 BLAKE2B bac0575699baa8ae15b931f50d951bef48ab7ae81c2b7bae38ad47614d67fa70e25a67bc0e8ae1b485457da0550732f7afeb11cb86aebf924e677623da16e019 SHA512 1d2b631f71b83fd69491317fa75a77ffa812f04372cb73f684a398eb8804d40a911330b82828482f6b84a7fa2b6918a5b0930685ceafb80b732682e656540ee8
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
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-r1.ebuild
index 4cddc788557a..6e708992ad86 100644
--- 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-r1.ebuild
@@ -1,11 +1,11 @@
-# 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="doc source"
 
-inherit java-pkg-2 java-ant-2
+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"
@@ -19,20 +19,15 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 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
+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
 }