gentoo auto-resync : 19:02:2024 - 11:39:43

9 files changed, 2 insertions, 163 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 94dcb9311ac3..832a418771c8 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 41334fb78801..1221fc14dfbd 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -19,5 +19,5 @@ DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c
 EBUILD openjdk-11.0.20.1_p1.ebuild 8856 BLAKE2B 47d0d96a0fae3aabc5c5a99df41978eb7d1667eef24211b1dd1a3a307d5124c0fe54cc0f4f05958087eb0cc93fe095de0a200c96937e8c83bce64f02f8d2c9f7 SHA512 9c449b1d5ed00b9b5c0196af86a9dd60a3dfc9e710aef9e58f17bd1b796f7fce97be1f67ea7a232978534cbb4b8a4b9435b4e2c5c9f071875c7283b9c4269da1
 EBUILD openjdk-17.0.8.1_p1.ebuild 9650 BLAKE2B 03a949b5cf796bd672dc41ccb3c80075046c240f989ed14ad2f697b420b36aafea2a8ae66852e51cf5eaf086e9ec091846bd62a0a8979600ef3a24fea630bd91 SHA512 bd729a0c4deb1c5e00fd81513e5cee3269d83ae417ffb359fe205ccf52f3943ae0b87c0d3858e88d560fcfc8f94289b13ccb006965d6af04fa061b50222c39ad
 EBUILD openjdk-21.0.1_p12.ebuild 9243 BLAKE2B abea83c696bf42e74fb4fe84bb19088af490646d527e6650ba2aa6f6c67e9682e650d2d3c6313703cc2dbb07f9ac3e0d4a7b8d612cc3166a0db4f2a97d1c6f17 SHA512 16c3aaa650d20bca1069959c625214b7ea9573a26e950ec0d3b557e0ea27eb83b771ad2b6125a896b742f3213c41c6cffd0fb8ea78c912a91dccc9ec899a8d99
-EBUILD openjdk-8.382_p05-r1.ebuild 6463 BLAKE2B a189f84b4d703c4859255f0cac44120df889f6e1d4a1f59442e1d56eb3bdb9ad4fb206d4d1ff0944af5edb1702180fcedb9b166ee028e43508d6c123915fda1f SHA512 e2b2796cc037bddedfd1a85ef62325c92e7cc30ff617e80df0b19a025858a6765ec283f5469ef5c07c2cc6f84ea5e167bdb8e848cb437fbad9656c38ce6c9387
+EBUILD openjdk-8.382_p05-r2.ebuild 6494 BLAKE2B 2a99d21d84dfd6d6113c7f4983cb74e1ebb4190f116bca7dc956fa41af8279edc839b7156b9161e12dcb8598538366a5669426982cf5a13733813376aa63cee8 SHA512 8f9909a88f201162e7472c07cab45d6c041e0da90eda4fb71052f827bd13b0fb9fc32aca7017c61afab30c1e2bd9b0b1bf15f8d9d4f5fe5e3499cdc468eee6e4
 MISC metadata.xml 1495 BLAKE2B af223deac1715bfcf1a02d0d9c387d2bb09b01985795a60472ffde2288c8e3a1f4541a20c24a230894a585f875246863749d79ce2195eb2378c9dff807079a60 SHA512 c6b568fcc3c07914a761225600aea1984c4bdcf95f1b23c773174eee29f63a3206856db483f80aca45669dd6dcb124db7ff00db7e7da15a2c7b574f4d3aa48de
diff --git a/dev-java/openjdk/openjdk-8.382_p05-r1.ebuild b/dev-java/openjdk/openjdk-8.382_p05-r2.ebuild
index 4ffbf386f2c7..a0f00644cae2 100644
--- a/dev-java/openjdk/openjdk-8.382_p05-r1.ebuild
+++ b/dev-java/openjdk/openjdk-8.382_p05-r2.ebuild
@@ -62,6 +62,7 @@ DEPEND="
 	x11-libs/libXtst
 	|| (
 		dev-java/openjdk-bin:${SLOT}
+		dev-java/icedtea-bin:${SLOT}
 		dev-java/openjdk:${SLOT}
 	)
 "
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index cb36038b3705..6e2ebe1984d0 100644
--- a/dev-java/xalan-serializer/Manifest
+++ b/dev-java/xalan-serializer/Manifest
@@ -1,5 +1,4 @@
 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 1461 BLAKE2B 474c6bd203ef68e374455cd9d19f8876f517df27737c06dfda77b7ae5b2fa18d3df28a5a144a96d81b2b6b29b2704fc37b9b3440b346345392e00435eef07313 SHA512 4a3242d441df85b03d11ddf5036d0470d85ab45d9c51f5850d294bf21e805e694537fbc3d5ced11959afeddd9cc74b013e4c8c197558615e7e33c15a47f65b9f
-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.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
deleted file mode 100644
index ac8cfa2b4bc9..000000000000
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
+++ /dev/null
@@ -1,46 +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="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 5db5dda88e3d..c70cf7deede9 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,5 +1,4 @@
 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 1243 BLAKE2B 1fd140152841bf91522aca40f30f73ff24b1b7b63a8b939e0aedeac3f56a441932eefcac1ffd468a78f45fccc60dfaec4ae1997dc1cec2715db3458273422075 SHA512 b31b34b6875e10c7c051fd4307751e32b4f8874315878d65a234c7d7a31883d3f2fb657a2cf8c4407d38b357cbbd8b43d8e6ee9f8d2f3314955afd385c7a03e7
-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.ebuild b/dev-java/xalan/xalan-2.7.3.ebuild
deleted file mode 100644
index 523e44d542b7..000000000000
--- a/dev-java/xalan/xalan-2.7.3.ebuild
+++ /dev/null
@@ -1,45 +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="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 c9ef691b4fd9..2855b72f42b6 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,5 +1,4 @@
 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 1791 BLAKE2B b11867720e697a6098f75d22ffc9d3dbbf1068da57e2f5a8720c2df8ddfc0aaecf5041b528d4523b429f6958cb1193074121aa68a82a064475072763bcba530e SHA512 a407c5c5f2cd381415cd016aad8876e73887f7bf3362493840f8e9199b5dfaa5e0903de726e1a3991c497c0a7756181ab54eaad0baa8677c6c560225b5ecb5d6
 MISC metadata.xml 1778 BLAKE2B 458bcbd9e8adfab1d2bd25a5fe9de0bee48292cb57e3591821fade58a987e59cb9811800273ac62b525738e7e955514b8b77c27fe97d9040bad0db203e6171a4 SHA512 ccbd7007ce2efe5b19d300ba939abe4e756d65eb1c910c74c5f3f13410de0d75e83bfd82d1e226e5dc1180982a1bfe231d30cb849f60142a177cc9aeb087c91f
diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild b/dev-java/xerces/xerces-2.12.2-r1.ebuild
deleted file mode 100644
index c74ab4cdedaa..000000000000
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ /dev/null
@@ -1,68 +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="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"
-
-# JDK 11+ already privides the following file and the compilation
-# fails if xerces provides it too. On contrary, compilation on 1.8
-# fails if we don't provide the file because it's not part of 1.8.
-# By restricting compilation to 1.8 and providing the file we build
-# a jar that should work both on 1.8 and also on the newer versions
-# of JDK.
-# the file: "org/w3c/dom/html/HTMLDOMImplementation.class"
-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
-}