gentoo auto-resync : 10:11:2024 - 21:02:06

3 files changed, 2 insertions, 101 deletions

diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index d870b3fbb614..59312272e64c 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,5 +1,3 @@
-DIST asm-ASM_9_7.tar.bz2 1376322 BLAKE2B 397a884b257edfd61f67909390c8fe07880d5a295b51dd3982ebbe9b6f8fbac200c46913e6c18e4efdcc80f0e1f0b8463ca9d912484b466ca174b55919a1c259 SHA512 9b7f2d4895f105f75e2c42d8882b176dba32defb17d8da4bdedb2bfe4e5413b03c05a9694114d171aa9623e86a65a677a24ab16a47aef774342d56224400274f
 DIST asm-ASM_9_7_1.tar.bz2 1378103 BLAKE2B f7da3a9c1bcf76398c9e9b9b86d60f8854e5248632a8b2d76605851e29ee1807713fb28c9e76012ec8f9444c44e3a151ed409cd120c34ab8d3495fdc9c84edcb SHA512 77ae76464eec97dbc8129c4a746d13f0d286d2033f909b65e0e34858e1785616b7bee22faa92128b91eb39cbd849e262efe574b73ed2859920add457d6422dd0
-EBUILD asm-9.7.1.ebuild 2495 BLAKE2B e0392658cf931ca9e06ca62784a6439d4a511865f4aa8ac58954722c5bfb92efa54a5a542801e5f2504ee3c6fad2fea34597560a7d21ba2c96ce20390d008fb9 SHA512 ab98c6409999edef85675a536a290600fce6d79a9f128edd6e053387ff187a5f4ab24639961df1dabdbdf223e67858816b65904487197389fdc0101cb16835e7
-EBUILD asm-9.7.ebuild 2494 BLAKE2B e9794021cd2084db38d0fb9d82e40605a9242e45fa726a03e355d15c4218d5766f48a36d598cb5288f2f0b394f5d32e29a01be32a35c39bfaf3a12262779adf1 SHA512 ac91397c239572967f50b8b5a82dd9d98ed545f47dd3ec6ac92d6a164b325b4edba42fc65a2b791ddd799132f9d9f3145374debf4895849ab74fe05be41e0c34
+EBUILD asm-9.7.1.ebuild 2494 BLAKE2B e9794021cd2084db38d0fb9d82e40605a9242e45fa726a03e355d15c4218d5766f48a36d598cb5288f2f0b394f5d32e29a01be32a35c39bfaf3a12262779adf1 SHA512 ac91397c239572967f50b8b5a82dd9d98ed545f47dd3ec6ac92d6a164b325b4edba42fc65a2b791ddd799132f9d9f3145374debf4895849ab74fe05be41e0c34
 MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-9.7.1.ebuild b/dev-java/asm/asm-9.7.1.ebuild
index f4f4074dfa03..a4632a9dad61 100644
--- a/dev-java/asm/asm-9.7.1.ebuild
+++ b/dev-java/asm/asm-9.7.1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/asm-${MY_P}"
 
 LICENSE="BSD"
 SLOT="9"
-KEYWORDS="amd64 ~arm64 ppc64 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/asm/asm-9.7.ebuild b/dev-java/asm/asm-9.7.ebuild
deleted file mode 100644
index a4632a9dad61..000000000000
--- a/dev-java/asm/asm-9.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# tests not enabled because of missing eclass support of junit-jupiter
-JAVA_PKG_IUSE="doc source"
-MAVEN_PROVIDES="
-	org.ow2.asm:asm-bom:${PV}
-	org.ow2.asm:asm:${PV}
-	org.ow2.asm:asm-analysis:${PV}
-	org.ow2.asm:asm-commons:${PV}
-	org.ow2.asm:asm-tree:${PV}
-	org.ow2.asm:asm-util:${PV}
-"
-
-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.bz2"
-S="${WORKDIR}/asm-${MY_P}"
-
-LICENSE="BSD"
-SLOT="9"
-KEYWORDS="amd64 arm64 ppc64 ~x64-macos"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
-JAVADOC_SRC_DIRS=(
-	asm/src/main/java
-	asm-tree/src/main/java
-	asm-analysis/src/main/java
-	asm-commons/src/main/java
-	asm-util/src/main/java
-)
-
-src_prepare() {
-	default
-	local module
-	touch 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 asm.module)
-				requires java.base;
-				exports org.objectweb.${module/analysis/tree.analysis};
-			}
-		EOF
-		echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
-			>> 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
-		einfo "Compiling javadocs"
-		for module in "${ASM_MODULES[@]}"; do
-			rm "${module}/src/main/java/module-info.java" || die
-			JAVA_SRC_DIR+=("${module}/src/main/java")
-		done
-		ejavadoc
-	fi
-}
-
-src_install() {
-	JAVA_JAR_FILENAME="asm.jar"
-	java-pkg-simple_src_install
-	local module
-	for module in asm-{analysis,commons,tree,util}; do
-		java-pkg_dojar ${module}.jar
-		if use source; then
-			java-pkg_dosrc "${module}/src/main/java/*"
-		fi
-	done
-}