From c15acf374d4b25ba5afcb52435da6090f2d98a20 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Dec 2022 09:20:14 +0000 Subject: gentoo auto-resync : 10:12:2022 - 09:20:14 --- dev-java/asm/Manifest | 6 +++--- dev-java/asm/asm-5.1-r1.ebuild | 1 + dev-java/asm/asm-9.3.ebuild | 16 ++++++++-------- dev-java/asm/asm-9.4.ebuild | 16 ++++++++-------- 4 files changed, 20 insertions(+), 19 deletions(-) (limited to 'dev-java/asm') diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index 164c831899f9..e5f608c048d0 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -2,7 +2,7 @@ DIST asm-ASM_4_0.tar.bz2 14706135 BLAKE2B 20bed2b10b6107e9af74dafd8f7c9db93be1c2 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.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 2351 BLAKE2B 33f0589b6bc493f234b00e775e83bf8b9d8a0614413c8ad1cfffff510087a7b17a2bb1627ac5d668c3f1fad655eae1d922d78b2562fe72f4f1406eabc9d46a0f SHA512 e55c2ec2c463c75d413b14513b42e2a8b8c5f608b3468ee2c317e13fb85abb4119ff1b9b825e7b11063737fc0d2b0a41f69affddf2516623d23a46048d57a057 +EBUILD asm-5.1-r1.ebuild 1291 BLAKE2B 725d3131119c130036a1d9ba211731c75700c62dfca02b9fca40125dabb8b6cc8233d3df6f29edaa4341d5412d695e8ebd7c70f3e0bd84a0b2091f3d7375fb51 SHA512 ccceba8cf7a50559aa3a505cf8450d695da2a927e0044fcead1878c156c17eae7ff25cbe25d84b4ed780f930b4b669b30d0ab65289bd141272eaf4febd4ee002 +EBUILD asm-9.3.ebuild 1596 BLAKE2B c14991f2292a3c005e176f714c5f75798824284aac7563902c876ae38bf738d548b999d30b6ac21be9c3512de1e56736dcb3d0a30155cdcedcef6750d9bd9372 SHA512 787f4c1949ace552c29dd4a739c51d02814e8500c42c8108f6bcc5b88c48f67b21afd091928806e69713600bb56ab627e6b3accc793300c5cffcedb9369fdd22 +EBUILD asm-9.4.ebuild 2367 BLAKE2B 1703a204f3acda73637408d224886f71458abba801cbc04809cd9cf24e35837cdc268fb6307e5aef0ea497664deb025dbf304691b0c5c0ac329ec36f5c5334f5 SHA512 31f2468a2958eb4760f29242be8fb2c5dda12621908be79028951cae5e7a9319177b0cecc57b8c2616b2838eeb79cb6f0e5be9ccea34b3786e6b56d6361bcc98 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 c4beac9c0ac2..1caebff74cf0 100644 --- a/dev-java/asm/asm-5.1-r1.ebuild +++ b/dev-java/asm/asm-5.1-r1.ebuild @@ -39,6 +39,7 @@ src_prepare() { } src_install() { + local x for x in output/dist/lib/*.jar ; do java-pkg_newjar "${x}" $(basename "${x%-*}.jar") done diff --git a/dev-java/asm/asm-9.3.ebuild b/dev-java/asm/asm-9.3.ebuild index 08fac0e70b42..6777ac94ec5f 100644 --- a/dev-java/asm/asm-9.3.ebuild +++ b/dev-java/asm/asm-9.3.ebuild @@ -29,14 +29,14 @@ src_compile() { einfo "Compiling ${module}" JAVA_RESOURCE_DIRS=() JAVA_MAIN_CLASS="" - JAVA_SRC_DIR="$module/src/main/java" - JAVA_JAR_FILENAME="$module.jar" + JAVA_SRC_DIR="${module}/src/main/java" + JAVA_JAR_FILENAME="${module}.jar" # Not all of the modules have resources. - if [[ -d $module/src/main/resources ]]; then \ - JAVA_RESOURCE_DIRS="$module/src/main/resources" + if [[ -d ${module}/src/main/resources ]]; then \ + JAVA_RESOURCE_DIRS="${module}/src/main/resources" fi java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar" + JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" rm -r target || die done @@ -44,7 +44,7 @@ src_compile() { JAVA_SRC_DIR=() JAVA_JAR_FILENAME="ignoreme.jar" for module in "${ASM_MODULES[@]}"; do - JAVA_SRC_DIR+=( "$module/src/main/java" ) + JAVA_SRC_DIR+=( "${module}/src/main/java" ) done java-pkg-simple_src_compile fi @@ -54,9 +54,9 @@ src_install() { einstalldocs # https://bugs.gentoo.org/789582 local module for module in "${ASM_MODULES[@]}"; do - java-pkg_dojar $module.jar + java-pkg_dojar ${module}.jar if use source; then - java-pkg_dosrc "$module/src/main/java/*" + java-pkg_dosrc "${module}/src/main/java/*" fi done if use doc; then diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.4.ebuild index 872b14d0208c..a53653b4d749 100644 --- a/dev-java/asm/asm-9.4.ebuild +++ b/dev-java/asm/asm-9.4.ebuild @@ -55,11 +55,11 @@ src_prepare() { 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" + 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" + JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" rm -r target || die done @@ -68,8 +68,8 @@ src_compile() { JAVA_JAR_FILENAME="ignoreme.jar" JAVA_SRC_DIR=() for module in "${ASM_MODULES[@]}"; do - rm "$module/src/main/java/module-info.java" || die - 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 @@ -78,9 +78,9 @@ src_compile() { src_install() { local module for module in "${ASM_MODULES[@]}"; do - java-pkg_dojar $module.jar + java-pkg_dojar ${module}.jar if use source; then - java-pkg_dosrc "$module/src/main/java/*" + java-pkg_dosrc "${module}/src/main/java/*" fi done if use doc; then -- cgit v1.2.3