gentoo auto-resync : 17:01:2024 - 14:06:19

9 files changed, 161 insertions, 6 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4dfe22481d8c..685c2c463e22 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 3fc9d00eb5ff..70672295b89e 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,3 +1,3 @@
 DIST aspectj-1.9.7.tar.gz 26472044 BLAKE2B a66605845e188903d50566df658fe636b8feb980bbafdc3b4c3e73e46558b24e4bbaf931790012266ac62bff70c3139f0034dafc7de4622827c0f09d4d626efa SHA512 5db2122d95e78056752bbca9adee72c0fa634963b4ea6979c0b75a9cc58b5ef4cf88b79ad640920363ebe7855311bedfa7e30eaba378274a0eebc31557dd57e7
-EBUILD aspectj-1.9.7.ebuild 2313 BLAKE2B 6ec1765f0b2018eb76c6d0d7094c907bd9cb07afbb0a03f45a218b477c01b6df5e8fede2564242cdef31927dcd5d08c1092ef44b3041a845658c41d89c4bea61 SHA512 daa24009e8c0d31da47b832f576edbe854c836819098487ba84d2e8618efb48e6b15440db0b0e1d76a0faa6b649f3a8f05f20c1bc6838089f7db63cb5ae376b2
+EBUILD aspectj-1.9.7-r1.ebuild 2307 BLAKE2B 83dd738335cb9647002b4bbc8ffbb755e8ccedc9c1df24ebd99358ef85551816af0d7b370aed7b1c2f57783643d06080219d1db14d4f5ac8c8f6b4e8c2dab0fa SHA512 d485e05aa3f99beee172fd42d966697d74f3add1ed6826a53444cb5b8c869e8b5b964364c135fda32b769d3e9c2d7b93729738bb2b93e5c01fb530ef3d2e86c2
 MISC metadata.xml 396 BLAKE2B 7e16ecf57d9457d8a88eb4c179ed0907d2fe1cacb084065cd2846de7250b959061c2e0c1ea9035c4d35a4db9ee7e96fde606ea9c9a114dab0a3edfbf7c4b37d1 SHA512 5f81510941874103c87b5816cc909eda8cab9fb7fd8c41055165f9291c0a46226d0053390405f629f4712ca071b0d56e18a06a3b33b253de48b6249e04f0cad1
diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
index 4f7ef2231ed2..e3b7c408c182 100644
--- a/dev-java/aspectj/aspectj-1.9.7.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 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-pkg-simple
 
 DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
 HOMEPAGE="https://eclipse.org/aspectj/"
-SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-aspectj/aspectj/archive/V${PV//./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/asm:9
 	dev-java/commons-logging:0
-	dev-java/ant-apache-regexp:0"
+	dev-java/jakarta-regexp:1.4"
 DEPEND="${CDEPEND}
 	>=virtual/jdk-1.8:*"
 RDEPEND="${CDEPEND}
@@ -26,7 +26,7 @@ BDEPEND="app-arch/zip"
 S=${WORKDIR}/org.${P//./_}
 
 JAVA_GENTOO_CLASSPATH_EXTRA="aspectjweaver.jar"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,ant-apache-regexp"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,jakarta-regexp-1.4"
 JAVA_ENCODING="iso8859-1"
 
 src_compile() {
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index 0f51af9bc819..84802700512b 100644
--- a/dev-java/xalan-serializer/Manifest
+++ b/dev-java/xalan-serializer/Manifest
@@ -1,4 +1,5 @@
 DIST xalan-j_2_7_3-src.tar.gz 13686458 BLAKE2B e19373aa22dad13945917d8f041f56e6ff9cc434a70e88b96764e0547a0a122a9197eeb23bb7757a5483beead334f4af62e7e1b70531b23c31199ec4733756ef SHA512 fe4b2b9471f95a2cd3607550a6c97b46b7d2576d1e814305f4564df88aaf4fdc9f88ba43dad4a5741521b2c2f5137e3e70d2d4e31b232d403a66dc1e889c8b6b
 DIST xalan-j_2_7_3-src.tar.gz.asc 849 BLAKE2B 623fefefa3ab88bfdef5376101f26a9c6602c30a34c0db369159bdb7af34ccb2602011071dd3e79304e6dd4e8b8a198729347f5dbee9a06ae12af12d351de82a SHA512 5c7ed7e71f8a0c2739a64f9ba34edb28d749924d1a581b9963bed3376151a090c2c1af2b1111612822cf20d27a814e22917660f034912e8e5fa913b434e66bf2
+EBUILD xalan-serializer-2.7.3-r1.ebuild 1465 BLAKE2B cac6ac6c335c121849e155f41a52bcc41d936ec0bfa8ba5e59144fb05fd6361d521208e1c19a9c84c288e19d7d426f9c2a514c3bd4d2eac64931911dc553c793 SHA512 4faabb6d05f493a788f459f21cdb5544cb134076b53bcd8985c000fef86469ab29d215ab6a1d59a6aea9a0cd15d93ac1a00450eb7e3250c4f4573b2eef3f571d
 EBUILD xalan-serializer-2.7.3.ebuild 1457 BLAKE2B 968462d9df0885456672789fb06bc14195c32b35973f1fe18f782bd1b5e8efae4008b18abae5b24a6b123da9be6aba86ae81151372b26dfaee68c60dbc2708ac SHA512 0b1d11f736d2d8373eac0174d11c4f5a72adc6afe4c9f59cb68781688924fdd02eb9435245e6ca24580195890ead42486e5aaa428796197314dd8d171311081b
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..a7d63b1cf700
--- /dev/null
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xalan:serializer:2.7.3"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
+HOMEPAGE="https://xalan.apache.org/"
+SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )"
+
+S="${WORKDIR}/xalan-j_${PV//./_}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc"
+
+JAVA_MAIN_CLASS="org.apache.xml.serializer.Version"
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# kill all non-serializer sources to ease javadocs and dosrc
+	find src/org/ -type f ! -path "src/org/apache/xml/serializer/*" -delete || die
+
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir -p resources || die
+	pushd src > /dev/null || die
+	find org -type f \
+		! -name '*.java' \
+		! -name 'Version.src' \
+		! -name 'package.html' \
+		| xargs cp --parent -t ../resources || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index e53bce1ba72a..bfb7cbcd2e86 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,4 +1,5 @@
 DIST xalan-j_2_7_3-src.tar.gz 13686458 BLAKE2B e19373aa22dad13945917d8f041f56e6ff9cc434a70e88b96764e0547a0a122a9197eeb23bb7757a5483beead334f4af62e7e1b70531b23c31199ec4733756ef SHA512 fe4b2b9471f95a2cd3607550a6c97b46b7d2576d1e814305f4564df88aaf4fdc9f88ba43dad4a5741521b2c2f5137e3e70d2d4e31b232d403a66dc1e889c8b6b
 DIST xalan-j_2_7_3-src.tar.gz.asc 849 BLAKE2B 623fefefa3ab88bfdef5376101f26a9c6602c30a34c0db369159bdb7af34ccb2602011071dd3e79304e6dd4e8b8a198729347f5dbee9a06ae12af12d351de82a SHA512 5c7ed7e71f8a0c2739a64f9ba34edb28d749924d1a581b9963bed3376151a090c2c1af2b1111612822cf20d27a814e22917660f034912e8e5fa913b434e66bf2
+EBUILD xalan-2.7.3-r1.ebuild 1247 BLAKE2B 24182ce1865def46f60a2a2987ce8adfa4e4f84faa5050ba11f8255cc042b68f3d990b08b76037d65af9bfd9e7407814a39376e02beff83a219831d274993f5d SHA512 4eb00095e2fe61858bc36787aca2b4bbc315e6b9076f2fe53d7342369e7a01031eee8e7c82d262ad7518415c569c9b5c2bf9bd6a958a77bebf42fe96e88496bd
 EBUILD xalan-2.7.3.ebuild 1239 BLAKE2B faafca7b29df8fa74401532b50f31c6b0f520d6e0e70096fdf32af0b82e5e74eebd105e1fb2c1ba9d9d0c49cd582dabc19da8e5f4d0be74cfba353309d5dff39 SHA512 2ec7538c7f95e41ea4816700a19ca99a151b8817e0428ada527eca074fbc11b88b847d7e3a1b77a608cbd2c3bd1196546df1d8ac94386ab231806f05738ec139
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xalan/xalan-2.7.3-r1.ebuild b/dev-java/xalan/xalan-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..a020d52b03ec
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xalan:xalan:2.7.3"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
+HOMEPAGE="https://xalan.apache.org/"
+SRC_URI="mirror://apache/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/xalan/xalan-j/source/xalan-j_${PV//./_}-src.tar.gz.asc )"
+
+S="${WORKDIR}/xalan-j_${PV//./_}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+CP_DEPEND="
+	dev-java/bcel:0
+	dev-java/javacup:0
+	~dev-java/xalan-serializer-${PV}:${SLOT}
+	dev-java/xerces:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xalan-j )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xalan-j.apache.org.asc"
+
+JAVA_MAIN_CLASS="org.apache.xalan.xslt.Process"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# serializer is packaged separately
+	rm -r src/org/apache/xml/serializer || die "cannot remove serializer"
+}
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index dc0bbdd6ea83..d0d0bd9afad2 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,4 +1,5 @@
 DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f SHA512 e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
 DIST Xerces-J-src.2.12.2.tar.gz.asc 849 BLAKE2B 58faca219413b5b13ded6bedb16acca5ffe53a6890c2ea6ec6f5b2b19b46b179bd74b225e608b936b0d6abad24b947930da24339256137a291e5bc863a11c416 SHA512 77cc480b9eff693ab7b5fe4c8a8963cbd53e895dd130bc0ef3fbaebce6d64e59c068806f10bbf650f51a4fb132a49d24c869c8a01e9922bf792bb479602b9846
 EBUILD xerces-2.12.2-r1.ebuild 2159 BLAKE2B 51a0546a723ac873aab87c7e83456f087ccb2667180560cad9e0ee19127608686ac916b8a05aeaf3b5e91766486db275055dfb3c50f683a386f5b421ac5badbe SHA512 2e11efb6107f6389f4c15131ff4559d0c0422d2fd8900bf7ece54070fdf8215b3549240604b4f064e8ee7589f0e9c35c69c3e298ba25314f291d244a3229a842
+EBUILD xerces-2.12.2-r2.ebuild 1762 BLAKE2B f012783aff2df8e14ab3f8736668af85788a519cb8ea5ede659794a52b5ca51c1e162e07682b02c88e97d6e66d351d39466b5f3babb40635915ae0bd437ef559 SHA512 139b12dc5fb1d83aff751d832168290716a6b562fbc6781ee98911526d097532c9330ec8b37b67e1712ce30ab3e72958219f774ab60a6b8fb75330b3e2ea60de
 MISC metadata.xml 1778 BLAKE2B 458bcbd9e8adfab1d2bd25a5fe9de0bee48292cb57e3591821fade58a987e59cb9811800273ac62b525738e7e955514b8b77c27fe97d9040bad0db203e6171a4 SHA512 ccbd7007ce2efe5b19d300ba939abe4e756d65eb1c910c74c5f3f13410de0d75e83bfd82d1e226e5dc1180982a1bfe231d30cb849f60142a177cc9aeb087c91f
diff --git a/dev-java/xerces/xerces-2.12.2-r2.ebuild b/dev-java/xerces/xerces-2.12.2-r2.ebuild
new file mode 100644
index 000000000000..4a694d86e922
--- /dev/null
+++ b/dev-java/xerces/xerces-2.12.2-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="xerces:xercesImpl:2.12.2"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Xerces Java XML parser"
+HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html"
+SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
+	verify-sig? ( https://downloads.apache.org/xerces/j/source/Xerces-J-src.${PV}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/xml-commons-external:1.4
+	dev-java/xml-commons-resolver:0"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xerces-j )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/xerces-j.apache.org.asc"
+
+DOCS=( LICENSE NOTICE README {LICENSE.resolver,LICENSE.serializer,NOTICE.resolver,NOTICE.serializer}.txt )
+HTML_DOCS=( {LICENSE.DOM-documentation,LICENSE.DOM-software,LICENSE-SAX,Readme}.html )
+
+S="${WORKDIR}/${P//./_}"
+
+JAVA_SRC_DIR="src"
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir -p "resources/META-INF/services"|| die
+	pushd "src" > /dev/null || die
+		find -type f \
+			\( -name 'javax.xml.*Factory' \
+			-or -name '*DOMImplementationSourceList' \
+			-or -name 'org.xml.sax.driver' \) \
+			| xargs mv -t ../resources/META-INF/services || die
+		find -type f \
+			! -name '*.java' \
+			! -name 'manifest.xerces' \
+			! -name 'package.html' \
+			! -name '*Configuration' \
+			! -name '*DOMImplementationSourceImpl' \
+			| xargs cp --parent -t ../resources || die
+	popd > /dev/null || die
+}