gentoo auto-resync : 10:12:2022 - 21:21:18

9 files changed, 6 insertions, 236 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3ce567475472..2dd48b9897e5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index ee8aef60c201..110c8f0cbf5c 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,6 +1,4 @@
 AUX byte-buddy-1.12.18-not-java20.patch 2497 BLAKE2B e63fa330e65aa9038a0f0f9e732c39114c62df845a6d481300b0fa8cc1a03e5fe9e057838ab945d9de50f0c2b22db14f0f3fdba95073f793e5c6f627e0e9bbe1 SHA512 c856eda61f8ee64245185431f6a0646fda16a5a8d632710e94abdffb7cebaca8e630f52d4027b81154dec7905290d7730c85a2452960ee485df3296c8d305174
-DIST byte-buddy-1.12.14.tar.gz 1857258 BLAKE2B 6957246f6689d1bdfdc6277ad752e03df0ae47c62b0afded77c94cdd41e00cc736517d0e4e5d5f8c59be519262a03864cde9bffa4ae53e5a7daeed84a519967f SHA512 5035be16fbdf2f7e8e2c93b87ee5f9adc927a19fd3b7d9fcd262906d8d21532cef8111084c3d6d0b75e101df0bfee19bf9177bc6a7d4b18cf0f26146fba4f147
 DIST byte-buddy-1.12.18.tar.gz 1924438 BLAKE2B 278ac97d60e62c7d44142a01da94113b29b483bff532f08fca7e345f383a4ddf83cb8c4d0544bce1879bb26909d048a76562cd816c4e9cb06695127ed849f08c SHA512 637e041f97981b85cd13ffecb0de47206b5c99d8b98561561414d8a599f5d53a6e047ba3ad9bc88ca030125221df3ebe49d6eff18a4093f4027d8cbf34a483b0
-EBUILD byte-buddy-1.12.14.ebuild 6733 BLAKE2B ce062dbe393a761d43e64cc4cf41edea638a3eaf31ff6151cc2c6a9ac2737e878f0718b41486d5766286b824ba7d8092aa112bd5f373e5b87f8a0cec2baf2b19 SHA512 5568d986f73bf6ff41b538a7816cca17f3bdc7128656f0601655dfb259ff88255a3961880cf2a005050e4d831238e657e9c8a6fd934e59ee9dd7fc0ab0cfcc1a
-EBUILD byte-buddy-1.12.18.ebuild 5309 BLAKE2B a34d85127fa87efd7873e0676d402e3230267e0a0a5efd99b83c32fb4b691edc273e602f98b99c2a813280f49a846a1cc42bf612f9f35329daed3ef349b27a54 SHA512 0d3415a98eaee84dd4653e9c6477936a190609940783248c6efbcfafb8c30fcb7149aaca7d4b021ea7c8802b46f35e84f2c5f1e5aa7d0ed332e0b88ea2046364
+EBUILD byte-buddy-1.12.18.ebuild 5307 BLAKE2B 1f4b9a8266ae9ee4e279f048f565502ee7534b99b24ad72ecdb5c3bbe44b2531fbcba3601a2e30caf4b84e543121a4ad54d12864a687354ef5c97031dd93a772 SHA512 a14dd8ba20210163841caf6c27d63b4df564689876ff7ebb8850e25a0c18fabc0c3227d00ba3bc09d77242869af014cff7a7484d3c9e168cfc31b551c4e2e3c5
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild
deleted file mode 100644
index 76862e0b7298..000000000000
--- a/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2022 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/raphw/byte-buddy/archive/byte-buddy-1.12.14.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.14.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.14"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
-HOMEPAGE="https://bytebuddy.net"
-SRC_URI="https://github.com/raphw/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-11:*
-	dev-java/asm:9
-	dev-java/findbugs-annotations:0
-	dev-java/jna:4
-	dev-java/jsr305:0
-	test? (
-		dev-java/mockito:4
-	)
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_CLASSPATH_EXTRA="
-	asm-9
-	findbugs-annotations
-	jsr305
-	jna-4
-"
-
-src_prepare() {
-	default
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.14/byte-buddy-agent/pom.xml#L132-L166
-	cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF
-		module net.bytebuddy.agent {
-			requires java.instrument;
-			requires static jdk.attach;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			exports net.bytebuddy.agent;
-			exports net.bytebuddy.agent.utility.nullability;
-		}
-	EOF
-
-	# adjustment for recent mockito versions
-	sed \
-		-e 's:verifyZeroInteractions:verifyNoInteractions:g' \
-		-i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \
-		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \
-		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \
-		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \
-		-i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \
-		|| die
-
-	# instead of shading byte-buddy-dep we move it into byte-buddy.
-	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
-	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
-
-	# https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.14/byte-buddy/pom.xml#L159-L195
-	cat > byte-buddy/src/main/java/module-info.java <<-EOF
-		module net.bytebuddy {
-			requires static java.instrument;
-			requires static java.management;
-			requires static jdk.unsupported;
-			requires static net.bytebuddy.agent;
-			requires static com.sun.jna;
-			requires static com.sun.jna.platform;
-			requires java.base;
-			exports net.bytebuddy;
-			exports net.bytebuddy.agent.builder;
-			exports net.bytebuddy.asm;
-			exports net.bytebuddy.build;
-			exports net.bytebuddy.description;
-			exports net.bytebuddy.description.annotation;
-			exports net.bytebuddy.description.enumeration;
-			exports net.bytebuddy.description.field;
-			exports net.bytebuddy.description.method;
-			exports net.bytebuddy.description.modifier;
-			exports net.bytebuddy.description.type;
-			exports net.bytebuddy.dynamic;
-			exports net.bytebuddy.dynamic.loading;
-			exports net.bytebuddy.dynamic.scaffold;
-			exports net.bytebuddy.dynamic.scaffold.inline;
-			exports net.bytebuddy.dynamic.scaffold.subclass;
-			exports net.bytebuddy.implementation;
-			exports net.bytebuddy.implementation.attribute;
-			exports net.bytebuddy.implementation.auxiliary;
-			exports net.bytebuddy.implementation.bind;
-			exports net.bytebuddy.implementation.bind.annotation;
-			exports net.bytebuddy.implementation.bytecode;
-			exports net.bytebuddy.implementation.bytecode.assign;
-			exports net.bytebuddy.implementation.bytecode.assign.primitive;
-			exports net.bytebuddy.implementation.bytecode.assign.reference;
-			exports net.bytebuddy.implementation.bytecode.collection;
-			exports net.bytebuddy.implementation.bytecode.constant;
-			exports net.bytebuddy.implementation.bytecode.member;
-			exports net.bytebuddy.matcher;
-			exports net.bytebuddy.pool;
-			exports net.bytebuddy.utility;
-			exports net.bytebuddy.utility.nullability;
-			exports net.bytebuddy.utility.privilege;
-			exports net.bytebuddy.utility.visitor;
-		}
-	EOF
-	# We don't bundle, hence cannot export them
-			# exports net.bytebuddy.jar.asm;
-			# exports net.bytebuddy.jar.asm.signature;
-			# exports net.bytebuddy.jar.asm.commons;
-}
-
-src_compile() {
-	einfo "Compiling byte-buddy-agent.jar"
-	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
-	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
-	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
-	rm -r target || die
-
-	einfo "Compiling byte-buddy.jar"
-	JAVA_SRC_DIR="byte-buddy/src/main/java"
-	JAVA_RESOURCE_DIRS=()
-	JAVA_JAR_FILENAME="byte-buddy.jar"
-	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
-	rm -r target || die
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_SRC_DIR=(
-			"byte-buddy-agent/src/main/java"
-			"byte-buddy-dep/src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-
-	# einfo "Setting -Djava.library.path"
-	# This would work only after manually adding libjnidispatch.so to /usr/share/jna-4/lib/jna.jar,
-	# done with ( jar -uf /usr/share/jna-4/lib/jna.jar -C . com/sun/jna/linux-x86-64/libjnidispatch )
-#	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path+="$(java-config -i jna-4)" com.sun.jna.Native )
-	# Otherwise fails with:
-	# Exception in thread "main" java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
-
-	einfo "Testing byte-buddy-agent"
-	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
-	# Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path
-	JAVA_TEST_EXCLUDES=(
-		net.bytebuddy.agent.VirtualMachineAttachmentTest
-	)
-	java-pkg-simple_src_test
-
-	einfo "Testing byte-buddy"
-	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
-	JAVA_TEST_RESOURCE_DIRS=(
-		byte-buddy/src/test/resources
-		byte-buddy/src/test/precompiled*
-	)
-
-	# what "mvn test" does with java 17 is:
-	# Tests run: 10022, Failures: 0, Errors: 0, Skipped: 0
-	JAVA_TEST_EXCLUDES+=(
-		net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest	# 39 tests
-		net.bytebuddy.build.CachedReturnPluginTest	# 44 tests
-		net.bytebuddy.build.CachedReturnPluginOtherTest	# 4 tests
-	)
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg_dojar "byte-buddy-agent.jar"
-	java-pkg_dojar "byte-buddy.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
-		java-pkg_dosrc "byte-buddy/src/main/java/*"
-	fi
-}
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
index a13d6726a174..c535d83e1432 100644
--- a/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.12.18.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-11:*
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 17d2cc19162e..66830d232b89 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-3.29.1.tar.gz 1291658 BLAKE2B 4064401ad01c1e1c9aa4a219a81f0fc2e67b1d4cb85cb98b4a996dd2bf789ee1feb790e5bb332205ef2fafe1c7ac0ea82e5e25afff4d9960c54dfe2cb895d0fd SHA512 5788a4a50b803b2a4520340ceae9fd47466d2004cce4138fd861b57fd760109c61c375a28bd907bb9dfeb56bd44734f003ddd1b550571f101a7d1bc04096b5f8
 DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc
 EBUILD javassist-3.29.1.ebuild 2072 BLAKE2B 61ba2d0d93672979234c09fe36e610fd0c58015516458367d7995bbe0a985068d4216effdc01d8363105716513bf448e56f0432435f26cdd8a3b185390dbeda5 SHA512 fd4911cafbbe4e528a2610e72bf438cfc592a9d0f0f164d1547c80863522b624d54991ffe5cd2077dca6c71dda66a2c9f3f4f74ddb7288d7e430785514022de1
-EBUILD javassist-3.29.2.ebuild 2499 BLAKE2B 4f08d062e8388a7f050f6b1a23b5593d7ce28f79b9ada6ea61ff85fc82d9d9c803ba7312bdc9f0f9e47cb984fa8cb97423c4c514c19be335b7285db852fb3385 SHA512 1a1e141408932a93c309bf53a251ac80114a916f4c0ffdb15e75d8a1cc39d3a8449f5cd7289b67a3fb4575886c1ef52a19262202b3bf6f1720d35fedcb79146a
+EBUILD javassist-3.29.2.ebuild 2497 BLAKE2B ba0551443870a130e4bd4de2f37684961b569f3f1e529f5494a277021143329fe6a781035db9bd3ce627e106fdeff154871f7b04c09113f753ee5e238a4d2a3c SHA512 ea82bd70b282cab0a694fd420feda0d79eb366d705242a9e1c84a6d9f338b03b6c06ec6add9ee2cd80706f81c9bf37b9d69fee81d831df08f101666feaa05ea0
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.2.ebuild b/dev-java/javassist/javassist-3.29.2.ebuild
index 9f1dedcd7c97..0d7ace3e1511 100644
--- a/dev-java/javassist/javassist-3.29.2.ebuild
+++ b/dev-java/javassist/javassist-3.29.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index b4bbdf2c85d0..4a3d8f2370c5 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1,5 +1,3 @@
 DIST lzma-22.01.7z 1261282 BLAKE2B 31bfa505626c6d22f84562d927cb8b7f0c6f9d7cfe9e38f49b33866957ad81f7bd1e6fb7b02a3e001edf9d64fc499b396e73738585e7d3a29fcd7d41dc65d1d7 SHA512 83e320242a51cb37caefd386a5768e64c6872101fd3c3cf4d3318bf834d27e84d8a92e3252987520a578b19ce3e2cddcbf9e10b909f5263c5cdc0710c2f26797
-DIST lzma1900.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
-EBUILD lzma-19.00.ebuild 530 BLAKE2B 62247d6619732917c5def4e3f4b09fd33627e4bad2b182aa73a61ebb9323f6a2c56cfd524d9727c00039d2700b6ffabaa52cfa55d6c4b203832255528c1b8c65 SHA512 59a25996592341650e323fe6c123d8bbee6ba16d0c725bfc444010cb3d255f0a3fc669a114fc739fbdb99900d5465000196a939d654dd658bf839e93887c89f6
-EBUILD lzma-22.01.ebuild 547 BLAKE2B f035228a03904d55f178a959249bd0e11cd8a2c39498c13fdfc3b4c65fe0ec8b2410b1726c811457eee1d4ee31470a5175f88093ddf0f3fc29704c4780176090 SHA512 560b4651518ddba9870a4bfc1966c33023d46aaec82284c8032d6154b4b2a9682b3b34842ff5f1a612485c472dcdf282ca117c6b84129b8704a30300c2ab7ce5
+EBUILD lzma-22.01.ebuild 546 BLAKE2B d762479323e2cbde0250355da12f312cab1e2a0fa65b7c3739b919fa80d18ddff067a1bd768b215c8ae742b0cd84ded3c4c79b3504687ee9928a9e25273714de SHA512 009ee57213fb36c82677f35cf1b5e67faccc94fbf83e2c120a6e8c282e11a78b66ce84fd2cde7050104b88f4a7cb23cf46322d6e2ed843eb9e0408d0cd76eb6e
 MISC metadata.xml 432 BLAKE2B 998874250825748d38aff4d525a9aaceab9cf55299f8fc3960fb0bfedeafc82fee0a9c2570d262678e5fb7949400673fe10b4d9f43a5a02aa1d02907f2d7a57a SHA512 0bfa574b8bea1f0e6f0f29331fdc6caa379729ff27e603af6bf20a895dcdfd233830dd35d2a14c032abd5c5d8feae101747aa344a9e2d08ec1eb3d98daa36939
diff --git a/dev-java/lzma/lzma-19.00.ebuild b/dev-java/lzma/lzma-19.00.ebuild
deleted file mode 100644
index 90c6674d85f3..000000000000
--- a/dev-java/lzma/lzma-19.00.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java code for LZMA compression and decompression"
-HOMEPAGE="https://www.7-zip.org/"
-SRC_URI="https://www.7-zip.org/a/${PN}${PV/./}.7z"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-BDEPEND="app-arch/p7zip"
-
-S="${WORKDIR}/Java"
-
-JAVA_SRC_DIR="SevenZip"
diff --git a/dev-java/lzma/lzma-22.01.ebuild b/dev-java/lzma/lzma-22.01.ebuild
index cf0560bbef68..69ea039791a5 100644
--- a/dev-java/lzma/lzma-22.01.ebuild
+++ b/dev-java/lzma/lzma-22.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://7-zip.org/a/lzma${PV/./}.7z -> ${P}.7z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"