gentoo auto-resync : 10:11:2024 - 03:03:09

16 files changed, 35 insertions, 44 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2ff6767fd6ff..9332791fd04e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 7585f307ac08..d870b3fbb614 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,5 +1,5 @@
 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 2497 BLAKE2B c091a844c3bb70ac578d73f160425c7bfb31415a3c479b861efa041e022625025c4259dafe69751f99243f3d10d0da96f3b6d38e4de4c8cb165de546ceb04300 SHA512 bb5d955496d62258f00a1171946d1242c5056ad765da0cd92e851c83c83dab60826da854407ccce136f0e9bdebd97f7e6bc29eda034b11386bc38cca62de4104
+EBUILD asm-9.7.1.ebuild 2495 BLAKE2B e0392658cf931ca9e06ca62784a6439d4a511865f4aa8ac58954722c5bfb92efa54a5a542801e5f2504ee3c6fad2fea34597560a7d21ba2c96ce20390d008fb9 SHA512 ab98c6409999edef85675a536a290600fce6d79a9f128edd6e053387ff187a5f4ab24639961df1dabdbdf223e67858816b65904487197389fdc0101cb16835e7
 EBUILD asm-9.7.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 60801aa85963..f4f4074dfa03 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/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 3e001b7acad8..e018a53b49b1 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -3,5 +3,5 @@ DIST commons-codec-1.16.1-src.tar.gz.asc 488 BLAKE2B d3f193b602339714728875189ae
 DIST commons-codec-1.17.1-src.tar.gz 456746 BLAKE2B 9bf33c183d4344bdccdffa1c573f9b2cfe34db227cbcffa66a7baed85778a516339a736ddade637859989055e2ab86abb5464ab9bc57782e3c972cc8ed2c4dbd SHA512 c98456664396d4d9cb794c185a479e6bb4a5055ed1f526a8e358fe3a59409c057dbb16f59c251bb52976995dbca14d8f15857074c9d19fbc7bdfed625a13abf0
 DIST commons-codec-1.17.1-src.tar.gz.asc 488 BLAKE2B 63bd00bcf69ab41e58e1eb2b2e56749211aa044e769a16fe2eea6acdeeac85d59c7465597aaec671b6efe22c68b05cd64c2e7a4bd2dc2f7f2b235dd27a125153 SHA512 6e9475773162193ce005635a5af926e0c7bfbaaca4c801a66bdabe73de0a2d17ec489a77d904d7d69e5749bc2af07d5b0b97d5aef2a319c614a3f1db632d424c
 EBUILD commons-codec-1.16.1.ebuild 1268 BLAKE2B e90e95babee8cb4b4e48d994365a68efe052d98ca4e63a0d8cb3462624588570085d7bf741e5ce543c49d3beffde3ce7220b3d28b909daf375421079cf9ae328 SHA512 6b5f81d4a44d4345f424691a8246a473416a2441cb363f7670eada7ccbb0e82fc06e01ed2dc2ca542075027087fea468efa461de057318efdee69bfb67b27592
-EBUILD commons-codec-1.17.1-r1.ebuild 1571 BLAKE2B cbbaeff2f2ea8a9231f76dc5fb48ff4d8bf2092405f862a484305a584821a7fd4d930c82506c6a3724ae6c52aefbf9c7a7fd2d3f5d33d9a155978b8f3434ca59 SHA512 d7dcca140fdfdcd16b8ea166cb53a1022c48c6f318ed230333fdbb528ae1c4afe4df0d69743d156cfe11c0db9c7092b18ccf055108fa9a3cd747b1983f36a795
+EBUILD commons-codec-1.17.1-r1.ebuild 1570 BLAKE2B 1fd99bde4534676f2eaef613d3d20763a4b871377b2ec3a678fff37eec945097203c3e3cfb93802e9b52f132c020f5746755c54b5502c8db76e2f0c75bdb509a SHA512 a564f99c98a87e139cf3d602fbd06b0e0ddd0ba205c22fd49a71178f2065e6a94b6aa72f82f88b3ca1a761a8047b7a4229b694be613f137ebaa4c87a8f453c51
 MISC metadata.xml 1443 BLAKE2B 9dc72c216ed78422e21ce8c25aab0ca901fe2947ab3d26076379701c7ed585def08c49d258e30d035ffb8e7f618540578cc34ca4246a30e21e1ebbab13c706bd SHA512 1ae390b599a1b817f1d7bc54e8d73dfe596de6a6829ef65554f4a27d16e79e1c99645302d1d761caefb48e46f54ba930cf0991985beedc93e7fb416b7146a920
diff --git a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
index e71c4cf42e8d..4c8494eca3c7 100644
--- a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux"
 RESTRICT="test" #839681
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 5c96aa99d468..6b6d61485a93 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -2,5 +2,5 @@ AUX README.gentoo-r2 452 BLAKE2B 81347eaa073b22f2b4ddb8c07dbdc07bbe81b2f848c2e86
 AUX README.gentoo-r3 554 BLAKE2B d29ff7518dec550796a885ca4af41cbe2b112f314ddc33697f4fff8bf6f3a19f2ac7c19ae3f811f209b870e3df18aca2e1be8327c7a2fab5e7beeebc02732ba8 SHA512 5499c13e4897f8fd72add9e98a9408b32dbc2f4692f5e165a1596bbbcb60355dff1251537f8fc0f09433164db8d887d1ae90340302f86ba6e1cf7f8e96d7827e
 DIST dunce-0.1.1.crate 4311 BLAKE2B 07b775c2e79d6414af5854282fdfbba26ac4675207f840cf627a33c7bdbca163283466011c641d62646fa77f8623f1f7143b5e3d87c34e0b9840e4807eea2df8 SHA512 3fa16c1d6d78374e6360b9e2349516859b617ac5532ade34359d952002a1fb6d5e70f27ce2c9b3d6e230c753218fcf6e9b3973161bf1f8dd9c08152fbda2f5ad
 DIST icedtea-web-1.8.8.tar.gz 2365638 BLAKE2B 39a19bd46a235d016f9192da7f15ffa17546dfbe8502df4991f6d45c6211723504c0d2dc0bc7aaa508e4b47295f244c65b6e7113666028824562b8d2b0ccf5b2 SHA512 99f246ce603e3edd4357a2c4d280f1ef92e1f760ca5d843eaccf7ca60950a47defec64eed87dac26c5c2e9776bed2f3e53f2c8793dabd47e1b5fc82823190dcc
-EBUILD icedtea-web-1.8.8-r1.ebuild 3572 BLAKE2B 0dc03c0b86545d5c5a3f7db4a9d2a8f7e360ecd90f7479e0d72c0dd0006e4db44577f02969b5593a0d535501e287a4a9f7934f17c212693efd25b502705b0446 SHA512 925bb3851cd6bfae5bfd2a13d091a1bfceee19d7e50ecdb8eb66fff60bc4ed5f68cd8118cbcdddba8b7e372fbf782500a173edb974d7dae4997d515746d7bd25
+EBUILD icedtea-web-1.8.8-r2.ebuild 3603 BLAKE2B 1348a031d7aead04cc35800fb826089d6cf2ba4e72cc321627ad20648a99311cfd89c74b323990094fdbd71f17347f8e680b4fdfa5c7608fdbacc32cf7c53f1a SHA512 89795279b560477b3537b2cc959f5669493ffae5abb65a1fd421bc6509a063ebfe234c811c0298ea5bca2ba802179a55f75b2798f0ddd3a445f3b26deafb0c04
 MISC metadata.xml 470 BLAKE2B ae3861fd34b819ef3889a6ca4f56702608b20fd74e4c856d934d8094649d2c19703010c0fc581154f77e6f82ec19b99fcb670b3bc16530c194a6e590084b8ccd SHA512 8911c14a652c2e24e0679263f040452513e4e018623169760953accedee778c6bab255ad78e07f43617907d4c6d8524f1493beaf48507d9743ee37d4aecea24d
diff --git a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.8.8-r2.ebuild
index 73754338cb33..ff395edab946 100644
--- a/dev-java/icedtea-web/icedtea-web-1.8.8-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.8.8-r2.ebuild
@@ -4,14 +4,16 @@
 EAPI=8
 
 README_GENTOO_SUFFIX="-r3"
-CRATES="dunce-0.1.1"
+CRATES="dunce@0.1.1"
 
 inherit autotools bash-completion-r1 cargo java-pkg-2 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
 HOMEPAGE="https://github.com/AdoptOpenJDK/IcedTea-Web"
 SRC_URI="https://github.com/AdoptOpenJDK/${PN}/archive/${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+	${CARGO_CRATE_URIS}"
+S="${WORKDIR}/IcedTea-Web-${P}"
+
 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
@@ -25,7 +27,6 @@ BDEPEND="
 	app-arch/zip
 	app-alternatives/bc
 	virtual/pkgconfig
-	virtual/rust
 	doc? ( app-alternatives/bc )
 "
 
@@ -58,10 +59,13 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}/IcedTea-Web-${P}"
-
 QA_FLAGS_IGNORED="usr/bin/.*"
 
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	rust_pkg_setup
+}
+
 src_prepare() {
 	eapply_user
 	sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die
diff --git a/dev-java/java-diff-utils/Manifest b/dev-java/java-diff-utils/Manifest
index 083ecba0fabc..8627b73aafbb 100644
--- a/dev-java/java-diff-utils/Manifest
+++ b/dev-java/java-diff-utils/Manifest
@@ -1,5 +1,5 @@
 DIST java-diff-utils-1.3.0-sources.jar 35161 BLAKE2B 365b2b3a8701a7bf63b1fc8c34f8a54d7a5f67b3b485e91ea3489303de821d5ac08aac4e2b13d140b045b6b45393d293a825e92e800cd34c3b84a17442d548bc SHA512 16426c13fde20c606ac5dc01b4ee368d10360c45c4569879c94d30ac41aba372e9865a7b5db3a68067ea26bdade538eeea4e3e38900f8627beb21d7e48968e62
 DIST java-diff-utils-parent-4.12.tar.gz 2080632 BLAKE2B 36cb824bd00e946484dc62b3d5739620eeff6f509cdfa3f521144c21ea9d5de43ccc838700d3d9d116817dc1256d90fe1bdb552b02a2c7cff1e6b702b889f8d0 SHA512 0ac8f633e01f70b6c0f243b65c95716a1237142abde96eed3211a5ee5afb5bf721e936a67b4e2ce27e1df34a8402d0fbcb830e0557bd32cd24a7529d80e61e5c
-EBUILD java-diff-utils-1.3.0.ebuild 970 BLAKE2B 4caaee7bb203d680ee91db6d81a1191fddacb23f51aea3ec03374c0a6a897b5c41934565deed34017cde9d9780a8d6b737c7da7ab5c8451452732acc852e7348 SHA512 f26f4f36a112cce1ebfdb0b94df202cb3a55099bd86c5ab3c51421ab8ac3d14a240e7e2607dddd638687863437ab767d8226d7a10582612823cb95e606ed7a8e
+EBUILD java-diff-utils-1.3.0-r1.ebuild 658 BLAKE2B 09c8caaeb7bfa1ba1314a9cf7347a4c78d71a368034dbd1a5def9a86e7be69873f80bb4326c261ee5b30f288f518950b815f64c21faf894d25ddfb0d3ef499cb SHA512 788cc882c2e9063f3f4e0ed0f28e8fde6348ded30e4cfa3147c496a4660424899eac5cf16d84987f5a54d4958b4df089b5d5e8d42030f4cb90654d38e917932e
 EBUILD java-diff-utils-4.12.ebuild 996 BLAKE2B 30cb16e29c33e093b01e1dad16c91a30e97b12e2757d1be85c23262a8ae540da9a26bb4ea5fe2a22efb9fd13e145c3a1dc159031b8154cba36890b83647118ee SHA512 c9a60bf8c68ea33531cb58799079ca7929144cc1a3cb58e7d8f4476a2d0f1af14c42e0565117945c28704719fdda986e5d999fe13a3ce40a4be7da1c8c20946d
 MISC metadata.xml 313 BLAKE2B d36ca69273ccafdd633c6f869c19781c4cef27c2947c7461b4c5285cb4f4f68d5896e63e2e12d069a6123b8ede70b891fd55fa583ff9aced04a1672c03a1982d SHA512 071ee6a67e35fc932046c8d22fdd7ba058bcb0630bb528ea8eab675b1df314635e9c8671313c1fef2139cb505f7fb6be2f229643f8833938dd86463fcaa7a056
diff --git a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild b/dev-java/java-diff-utils/java-diff-utils-1.3.0-r1.ebuild
index 067c0231d5dc..eca70cabdcf4 100644
--- a/dev-java/java-diff-utils/java-diff-utils-1.3.0.ebuild
+++ b/dev-java/java-diff-utils/java-diff-utils-1.3.0-r1.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom diffutils-1.3.0.pom.xml --download-uri https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0-sources.jar --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild java-diff-utils-1.3.0.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="com.googlecode.java-diff-utils:diffutils:1.3.0"
@@ -12,15 +9,13 @@ MAVEN_ID="com.googlecode.java-diff-utils:diffutils:1.3.0"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library for computing diffs, applying patches, generationg side-by-side view"
-HOMEPAGE="http://code.google.com/p/java-diff-utils/"
+HOMEPAGE="https://code.google.com/archive/p/java-diff-utils"
 SRC_URI="https://repo1.maven.org/maven2/com/googlecode/${PN}/diffutils/${PV}/diffutils-${PV}-sources.jar -> ${P}-sources.jar"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
+BDEPEND="app-arch/unzip"
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
diff --git a/dev-java/jnr-a64asm/Manifest b/dev-java/jnr-a64asm/Manifest
index 85f947aae69b..eb80efbf4f18 100644
--- a/dev-java/jnr-a64asm/Manifest
+++ b/dev-java/jnr-a64asm/Manifest
@@ -1,3 +1,3 @@
 DIST jnr-a64asm-1.0.0.tar.gz 29247 BLAKE2B d5b2dbdbee3d50e466d164a7b5f62ad5ea99eeb810c38bacbd5ec21f8ba57d28ed442846903e85ef771e2a4ca80c77f2beb558fb03b1b6996384e26f69731474 SHA512 16ab336e60d6bf5e6478ed4fd8144c7e1eb1aa23089927e34adcbd2f0b3fdaedfc0e5026545bfd69d8a6a030479342088fcb86657a007e9ac9ba7a08830aa858
-EBUILD jnr-a64asm-1.0.0.ebuild 842 BLAKE2B ac442bbe4b26e0f93b8c6a5b44511341c8ac984b0806a9d58c8645def74afb02bc94484c964c644c9ac94c4e4b69a2ec4a4a6a58a11378b96a202a267718dbb3 SHA512 f104b121252145b6f29e4c24fe5b099047ca57f117d515241682bfdb12e5fdc9ae178ffbdfc851f19b7eb2f00c9515ac03addbafe3e7682af5332fa58f98cb02
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+EBUILD jnr-a64asm-1.0.0-r1.ebuild 550 BLAKE2B 1dfe864a636aaba2d61baa2e045f41c7436e3f23d82505de68787b5194a5ff61795335c9c5f622c4f58fe6c5ccfee8724a44b44a113785542d92212ae23f4023 SHA512 666e54685aab0f7ecbd532cdf31b35fb8e01bd4aa2701056b586dd673a4fae799ac4d857476b3b38cd0a0b5140e03f4a81e94e43abb8ec9bdb93ef879015f171
+MISC metadata.xml 296 BLAKE2B c6b7c0be529929b2a292d08c58d9797759acf37a737385dbb74764f274cc07669d984134ca4f381ccfa5edaa3ddb94154f9b98b84bb6f05c9f17000897484a45 SHA512 e0bf893b2c8f31bfc6506863b60005c7c17bfe0d74f1eaaee0edcd402e53060351f0f44be851add2252962107cde529c7b489f81ee754819b872281a4e9ab212
diff --git a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0-r1.ebuild
index 9943cc56e9f8..e0c77ac2af16 100644
--- a/dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
+++ b/dev-java/jnr-a64asm/jnr-a64asm-1.0.0-r1.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-a64asm/archive/refs/tags/jnr-a64asm-1.0.0.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-a64asm-1.0.0.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="com.github.jnr:jnr-a64asm:1.0.0"
@@ -12,21 +9,15 @@ MAVEN_ID="com.github.jnr:jnr-a64asm:1.0.0"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A pure-java A64 assembler"
-HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm"
+HOMEPAGE="https://github.com/jnr/jnr-a64asm"
 SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="amd64 arm64 ppc64"
 
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${PN}-${P}"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jnr-a64asm/metadata.xml b/dev-java/jnr-a64asm/metadata.xml
index 75321cfb5598..ec84ffe0b483 100644
--- a/dev-java/jnr-a64asm/metadata.xml
+++ b/dev-java/jnr-a64asm/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jnr/jnr-a64asm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jnr-x86asm/Manifest b/dev-java/jnr-x86asm/Manifest
index 542c4fb7f03b..f2758febf155 100644
--- a/dev-java/jnr-x86asm/Manifest
+++ b/dev-java/jnr-x86asm/Manifest
@@ -1,3 +1,3 @@
 DIST jnr-x86asm-1.0.2.tar.gz 114138 BLAKE2B 4fd5d331e271e03771c1165823a3852b0ea9f5c45df26c7a009d356173050aabf99a7ef5a17559ef8fc907e521f8fae96b048867703bc901504fa21bcd24c3d1 SHA512 e3ad28b2d6be36b9e9d3e20bbe5cc6bf98361372fa02a40d0bbf64437fca351c3dac5cb04dfc8c2f08d73b9bffc8ca69276fb6a6fc00c7cc5cc3cf08fa2b6463
-EBUILD jnr-x86asm-1.0.2-r2.ebuild 590 BLAKE2B 71a3cbd5a648359257ed54deb577150a13aa0fff134e895f26fa8aebae60551f52c934e22dadb31f85d35421a48758e7c709de30dae4d80a2117bd4705917eaf SHA512 62d114b507bb4b2e2cc9b545a025bce564fa42b931d9a45a6517d4ca9d9d62c958901068d0a19fe28780f65ec298edcda22d38156626e8b9620e4dc454368b7b
+EBUILD jnr-x86asm-1.0.2-r3.ebuild 546 BLAKE2B 62910790a33587cf29dfdc39fe17afe8c3e2b5b6462c150da200bc362258d0e4805529ea2218e1ef9d12716a073a797acabf7f77cd9e101d17c2f1041ffe9108 SHA512 ae279ca7e68cfcb0f26ba96f84c5f0b805368c9feba554dbbc94b9a472e7a8c2ec59c5d29845ca845db429e44216f922c3badad9ffa7f440d5b6065b9d21f9d9
 MISC metadata.xml 326 BLAKE2B d21a275305a4fb768fb9d3de5852aa7af12456df54a67386f5cab01a16b999a7b59528729aae8b8bc285c134be3d1b63f0c4bce5d6c0c90467debce762da304f SHA512 769360259d3ea42979fd724dc2b0115b63d625e561377378f992313092ed2143ef80edd877d97e1923134d28966876e1e820e369347b89e0a8ebba15058855a1
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r3.ebuild
index 0888c3430d26..19f8951a3e12 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="com.github.jnr:jnr-x86asm:1.0.2"
 
@@ -9,17 +10,14 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A pure-java port of asmjit"
 HOMEPAGE="https://github.com/jnr/jnr-x86asm"
-SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="MIT"
 SLOT="1.0"
 KEYWORDS="amd64 arm64 ppc64"
-IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${P}"
-
 JAVA_SRC_DIR="src/main/java"
-JAVA_ANT_ENCODING="UTF-8"
diff --git a/dev-java/snappy-java/Manifest b/dev-java/snappy-java/Manifest
index 512452ef3aa6..eda060a73ee7 100644
--- a/dev-java/snappy-java/Manifest
+++ b/dev-java/snappy-java/Manifest
@@ -8,5 +8,5 @@ DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 66582661a1832cc54493fc9dcea9076eb0e
 DIST snappy-java-1.1.10.5.tar.gz 3917442 BLAKE2B 0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329 SHA512 f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea
 DIST snappy-java-1.1.10.7.tar.gz 3953515 BLAKE2B 40657085a25186b7c78024196406002a39afe26e97145f57a438d783fb512c0168b48ef3f38d9d123954458c56e593f8490a5069a1712bb7d4ec86cf425a828c SHA512 1d7f484202f6bfd59454d56a9f57b0795f0919ae607e0bfd4da0b58c0caae437ae3c3f8638699a94b0b4794197a03058c3b5e258c5cf87b95683587a3e8396fe
 EBUILD snappy-java-1.1.10.5-r2.ebuild 2913 BLAKE2B 4bef9197af7f575c9a99ba641fd22380da652780696d205166f8fc8d2aec17cb2893e9022b4faa8ab639220587a1ca890afb0102c85b53aad51aec5cee4b4d53 SHA512 e2d0e968cbed43c305d760969b25068c2c8260b6fd073d0f6975a5b982983b5a8b67aaf75e4c00eb0ccfcfcba5cccb907c9a03fa9427b99cad00bb4ad97b0f02
-EBUILD snappy-java-1.1.10.7.ebuild 2865 BLAKE2B bc5956643c3df3c7353349c6c9df27840c9a7fbf7c76711a390484d8333d1bda954a3ea3cd09adafbcc7a1deb48478338db5aad0264ba3ff9ebd8351dc17fc03 SHA512 bfb07325891361e57b45683471afb464be324527d036171ff4254a529752d473854d023fa6762e58e1a6392cd498f55fe4894a0c577e743d541373de340a9157
+EBUILD snappy-java-1.1.10.7.ebuild 2864 BLAKE2B d35c35255074a0978dc6d276dfddced4c012c8abf11511ad44c5fa74f3a4ab5254592806ab04ee6494e0319436d00fb50046c55a41ea1012f398c58c7063645e SHA512 af6620ef25c20d082645eca95a02d35c8947ed5583e405cc3121b883c999a950d5b6781101a93a66a4038f325db92210dd5f904e2bd7bad64bc86d637b910313
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild b/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
index 94a0296557b4..a00cca2357e1 100644
--- a/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
+++ b/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 CP_DEPEND="dev-java/osgi-core:0"