gentoo auto-resync : 09:12:2022 - 09:17:42

6 files changed, 92 insertions, 25 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9213ae045659..56e8119dc010 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index c62585d40d4d..868130bf1dac 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,6 +1,8 @@
 DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
 DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_9_3.tar.gz 1666740 BLAKE2B 6905233f666159f861dda68a855e8f5632817b0627c2006d3a8e61340cd4afca9310860dd1eff46173ca7356583e6c44027e674f7e17eacaaf0dbcc24b92198e SHA512 401a4dd7c2638bbad940ca92c42b7ec6f44e1d19c407bba3cd6a081e0b51969cf62a0fbcc407ef4889d3c7d6c7b9893e77642c058f812e9d10b9d67c5215be42
+DIST asm-ASM_9_4.tar.gz 1678751 BLAKE2B 6054d9ae58144a5928560ccbae9695163f031fc95e40ad93724a0d2cf84cf221939d127c5e961b1f87534a083d2bbbeff16af0cb046f9485f65cb648342d7cdb SHA512 585ff091dad8b4b08b180da57ed770de3a77dae6d221defdf0ff731a181ffcdc8b3ac56a6d7c3b9662d7bc85d2a1d47ea0d14c1ca4439e7d7e43f3fbea91c1ca
 EBUILD asm-5.1-r1.ebuild 1280 BLAKE2B 9b4395b97760514e0f54c72ab1df3a0751991d13caf567a0441fb16c05f4a89559b1347b19a820ea79871123895a4f86431230fd41bd4735aa1e0d4e57c7d128 SHA512 78fa99694b9a1156a85067bab400bfb99f83f4908cd0e6f03eb64e067b15fe757f3cf4cd6b8b109227d6c42b1e3bc2900fc798d3e35d7323cf18a6dde9605c69
 EBUILD asm-9.3.ebuild 1580 BLAKE2B 13b2f9d3b02654e705ada53d6b25e0d8696f744adbe43cd3e75d0cd6e60f312538d79b381071920fb6707d2a84c7fc737728966076504d0b052950df628fa5e7 SHA512 87abca9f037edb1a196610ddb88f603d652919662f55baf3bbb84438b8511fce9690175ef493c4afce2227bcb3af928e6dca50ab53ba6752d77715db85cf270b
-MISC metadata.xml 1231 BLAKE2B c61d8566d1a337e99616013267474cf4fc92afdfed38f1c2183d41980528fd1b8994bd6ce5a06b4fa85f54819d560379bb1b505c62f26f7421bd1965cbcf7244 SHA512 c0b4d632146cab80755c18a6e15e9e9673c7adc60addac523bbf98e8fb0f771b526fbaa65906914984d27658a7ee390e90d164e855f5bc5601bfef7b89d902a2
+EBUILD asm-9.4.ebuild 2265 BLAKE2B 4a6569086fad0c4c95ef73675ac33a2297f2a07cdf925dde74c5552a54b528f849f2fad407a544dcad053a73f50d2a1124b0841f626be266acdf395649a4dab9 SHA512 dabfc885d122e1928de2a471edb623afc140b3cd24738d59ac919bda7bbe799a54095f4807fd8fc01bebf120b8981d94cd887910dcc0b77ab16c48f7b64c6265
+MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.4.ebuild
new file mode 100644
index 000000000000..d2c90b565e02
--- /dev/null
+++ b/dev-java/asm/asm-9.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests because:
+# package org.junit.jupiter.api does not exist
+# package org.junit.jupiter.params does not exist
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="org.ow2.asm:asm-bom:9.4 org.ow2.asm:asm:9.4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
+
+S="${WORKDIR}/asm-${MY_P}"
+
+src_prepare() {
+	default
+	local module
+	touch "${T}/asm.module" || die
+	for module in "${ASM_MODULES[@]}"; do
+		module=${module/-/.}
+		cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die
+			open module org.objectweb.${module/analysis/tree.analysis} {
+				$(cat ${T}/asm.module)
+				requires java.base;
+				exports org.objectweb.${module/analysis/tree.analysis};
+			}
+		EOF
+		echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
+			>> "${T}/asm.module" || die
+	done
+	sed -e '/^$/d' \
+		-e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \
+		-i  asm/src/main/java/module-info.java || die
+	sed -e '/analysis/d' \
+		-i  asm-commons/src/main/java/module-info.java || die
+	sed -e '/commons/d' \
+		-i  asm-util/src/main/java/module-info.java || die
+}
+
+src_compile() {
+	local module
+	for module in "${ASM_MODULES[@]}"; do
+		einfo "Compiling $module"
+		JAVA_JAR_FILENAME="$module.jar"
+		JAVA_SRC_DIR="$module/src/main/java"
+		java-pkg-simple_src_compile
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+		rm -r target || die
+	done
+
+	if use doc; then
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		JAVA_SRC_DIR=()
+		for module in "${ASM_MODULES[@]}"; do
+			JAVA_SRC_DIR+="$module/src/main/java"
+		done
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	local module
+	for module in "${ASM_MODULES[@]}"; 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
+	default
+}
diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml
index a14dfc10700a..930ec624c680 100644
--- a/dev-java/asm/metadata.xml
+++ b/dev-java/asm/metadata.xml
@@ -25,6 +25,6 @@
 	</longdescription>
 	<upstream>
 		<doc>https://asm.ow2.io/documentation.html</doc>
-		<bugs-to>https://gitlab.ow2.org/asm/asm/issues</bugs-to>
+		<bugs-to>https://gitlab.ow2.org/asm/asm/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index b75e213aa394..312eb247adab 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,6 +1,4 @@
-DIST commons-net-3.8.0.jar 437325 BLAKE2B 92bdbf2f95cc54f6a791a9de0a56878fe12b6d956d47a4116ae21df35f3dcc4d7b10f5c03c081fc7012a06416f5f9f6555060784bfe22ec9c8d70b17ee7ea215 SHA512 a16ed8c2966541cc052fe963338efcc6f9c42ccd6fefe246547e66d9f46c35cf42bc6d13cb983a1829a378ebd7a676bcb812acbc3aa0ed30e6fa206748dae620
 DIST commons-net-3.9.0-src.tar.gz 440911 BLAKE2B d7f24bff2e36d727bc12bf700b5a5ba9bf6b34a1d63cf892124b81ced113e4b66ebdb8b1eb54fbac33b76efcfc7333150c8d5ce87039cc7204ebf16bb64c8044 SHA512 a2d4ef4937701f28304fdb9a39a0d4a8fdd5fd7ae84c6d647a6b9e05eee68cb4fde8ae9eedd94f45fdc0194d160dd9f64b3c1cfbdd8bcea2214e9826ace32877
 DIST commons-net-3.9.0-src.tar.gz.asc 488 BLAKE2B 7999c63348fdb63de670cf1ace3c928796c663aa960494e0d4a398529b19c4834e9c3d2d8dbdb13e2ba392909e1761458c99332f35e39e0efb0f212b3c0f32de SHA512 72da1fe78bc6c0dea70d171c3c60c7eee8387bb28244f8b67bf38b66c3e7f2c183e4413c3f090a5b1a591ce64a6d43434093425f44c10a9dd03f0b354306e017
-EBUILD commons-net-3.8.0.ebuild 651 BLAKE2B 337169f22e210a515ff4db7f0c96c2da698fd22750f1c2f1170150b8f38efdbd779666a6c02403556f5263ccb1e0795a5b7af81b7448c36b862fe5825ffda6d3 SHA512 6e62d9b6e9606cd94be5a0ec0131010b28f30ddcb87aa2af593bc7af700d9d1de8182fa73694baba21ec35f9a011fb4797b5a5d0270296667d76a26611931d31
 EBUILD commons-net-3.9.0.ebuild 1290 BLAKE2B edddc8fa446706d1ced4bfc456bbaf8494bcf0515a1e6c911d5ca38e30572c47a8f00919d3b7ddb7e084654d5ead39abcef208b2be76a7cb0db5beb7bb8c5e69 SHA512 f094e12388c6efe53f8a9b7bfd134afe8c5c4a658c9b0996bb021b04f9a7218db8df38108553f33df69c684c455308ef00d85d6a61c2177668a066dcc3dd03bb
 MISC metadata.xml 393 BLAKE2B 344ccb7c8387f2d977c30219cefde70b31255c859898f243ecfde94643641474047299f2438a4067f70cd77ace99fb754ff6dfc2ccdedd2772081870f1444d8f SHA512 75b957e0f6a08377b402e23f49b081ed9add10ff7b3a5d9f52009d48ef4f8d49bb78f48310b93a579b29857562af2d5261f5b4fe4405edd566c1f320ec729046
diff --git a/dev-java/commons-net/commons-net-3.8.0.ebuild b/dev-java/commons-net/commons-net-3.8.0.ebuild
deleted file mode 100644
index f05db9b3a131..000000000000
--- a/dev-java/commons-net/commons-net-3.8.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${P}-sources"
-
-DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
-HOMEPAGE="https://commons.apache.org/net/"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"