gentoo auto-resync : 09:12:2022 - 15:18:12

3 files changed, 11 insertions, 9 deletions

diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 868130bf1dac..164c831899f9 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,8 +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_4_0.tar.bz2 14706135 BLAKE2B 20bed2b10b6107e9af74dafd8f7c9db93be1c26e073a8f7d8b25a94b99a1e89659dd03ed9094c4a56fe8a9b8d206b00e3db35eb4074e16396292d2fe75c2bb41 SHA512 046b36fe664a58e65daca2e3820f431436f27242fb548723ec02e829637f4d27d3329edd5014d3c84855d827a2fb2a87107043951a83f4fee2e83d89bb0ba74d
+DIST asm-ASM_5_1.tar.bz2 16191369 BLAKE2B 30e0f97fe200f09c78b3ba743ad70f25715b411d5e0be330234d97dec98b997db78736b5e005fdac8ed5339c553783a4e12386c34cb2c5a45bd8d8b42d7e8465 SHA512 6e73fe0787cfa974c598be44b5d735bbd6cba88f64db24169ec481281aea2169bce65fb08a677aa99f0d71f876a204c86432d2a4a79e85cc5286eb2ccf7617d7
 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
+DIST asm-ASM_9_4.tar.bz2 1380417 BLAKE2B 612fc6669294f2926ec77522f642f2878a96a9c977579ceda9feb955041ff53fa698c75b26c27bae478a41dca59357d9cf824263df39d60ea5c6722e5f0efc75 SHA512 a59268808ac54a238bd6e117eb0164d28c5c3572c12d7ad42c2f3dbd32714c03056f330255756511db4f1ede8d66bf32c7347128b8ec179beba11cca27927687
+EBUILD asm-5.1-r1.ebuild 1282 BLAKE2B 03b95a3511830bdec2398707ef44c385a5dd7a08e44d39a75284475511a114208ceb4fc086aff740f2e606d786cb259e435b04266c762a7923f2138b6817afe3 SHA512 c53e72c7891c68ac732dc5c6c925f35f172d64fdb64667c7c028e323f9ff9e512c1f020db16dd9344a13026c397f6e7b851ef9c0561eeb73672341b5d74da42c
 EBUILD asm-9.3.ebuild 1580 BLAKE2B 13b2f9d3b02654e705ada53d6b25e0d8696f744adbe43cd3e75d0cd6e60f312538d79b381071920fb6707d2a84c7fc737728966076504d0b052950df628fa5e7 SHA512 87abca9f037edb1a196610ddb88f603d652919662f55baf3bbb84438b8511fce9690175ef493c4afce2227bcb3af928e6dca50ab53ba6752d77715db85cf270b
-EBUILD asm-9.4.ebuild 2265 BLAKE2B 4a6569086fad0c4c95ef73675ac33a2297f2a07cdf925dde74c5552a54b528f849f2fad407a544dcad053a73f50d2a1124b0841f626be266acdf395649a4dab9 SHA512 dabfc885d122e1928de2a471edb623afc140b3cd24738d59ac919bda7bbe799a54095f4807fd8fc01bebf120b8981d94cd887910dcc0b77ab16c48f7b64c6265
+EBUILD asm-9.4.ebuild 2351 BLAKE2B 33f0589b6bc493f234b00e775e83bf8b9d8a0614413c8ad1cfffff510087a7b17a2bb1627ac5d668c3f1fad655eae1d922d78b2562fe72f4f1406eabc9d46a0f SHA512 e55c2ec2c463c75d413b14513b42e2a8b8c5f608b3468ee2c317e13fb85abb4119ff1b9b825e7b11063737fc0d2b0a41f69affddf2516623d23a46048d57a057
 MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild
index ff2f2f95764b..c4beac9c0ac2 100644
--- a/dev-java/asm/asm-5.1-r1.ebuild
+++ b/dev-java/asm/asm-5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2
 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 https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.gz"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2 https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.bz2"
 
 LICENSE="BSD"
 SLOT="4"
diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.4.ebuild
index d2c90b565e02..872b14d0208c 100644
--- a/dev-java/asm/asm-9.4.ebuild
+++ b/dev-java/asm/asm-9.4.ebuild
@@ -14,7 +14,7 @@ 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"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="9"
@@ -64,10 +64,12 @@ src_compile() {
 	done
 
 	if use doc; then
+		einfo "Compiling javadocs"
 		JAVA_JAR_FILENAME="ignoreme.jar"
 		JAVA_SRC_DIR=()
 		for module in "${ASM_MODULES[@]}"; do
-			JAVA_SRC_DIR+="$module/src/main/java"
+			rm "$module/src/main/java/module-info.java" || die
+			JAVA_SRC_DIR+=("$module/src/main/java")
 		done
 		java-pkg-simple_src_compile
 	fi