gentoo resync : 09.07.2022

3 files changed, 2 insertions, 92 deletions

diff --git a/dev-java/byte-buddy-agent/Manifest b/dev-java/byte-buddy-agent/Manifest
index c17e1049683a..1557ff735486 100644
--- a/dev-java/byte-buddy-agent/Manifest
+++ b/dev-java/byte-buddy-agent/Manifest
@@ -1,7 +1,4 @@
 DIST byte-buddy-1.12.10.tar.gz 149932619 BLAKE2B dce562c72fce2b4c6f7d7b49192297929c6828b5157db81825199eb6636a6aadfa27240cf69e6ebfef7e809b35aec0037461ec4b30c7633cb700f55458238058 SHA512 5f8c9e94e3661978e51134a65842e376b96acfe25e940c565a2647bec54bb7c40b12501b590019270ce470efc4ca8f4dd0a7ffe7c6d5d2854b768c28c84920a6
-DIST byte-buddy-1.12.8.tar.gz 149928045 BLAKE2B f1fceaea236a7d625739547556cd3775629250ab0cf6ead0643002895d432f06b84bdf193de3d4aa88de8cfdd3ff38a4aa1340076be918c0e5e0c217072cb8e0 SHA512 dffe3f557d29b9c0ac16e8314e2a1fc2b089bda000d5c1307ad2d8808f149f3bef90daa0f8dcc9815d255fc11824b28708b6fddfe942ea8f24ca61f9ea73a1d9
 DIST byte-buddy-agent-1.12.10-sources.jar 204651 BLAKE2B f3e0db8e6c8f3380ee3bfd8969555c331689990b97e91206567c01ffbaabc58eeb25b0879e792ebce1044afa8d3b5596830349d9c233ab1af84d13213e046f4d SHA512 8569531e5f5343378037cd9740bdc42b91becb9adaf0f2cacbdcb0e5ccafb3e47fce9c7b71d8d8d8df1c7373ffd44d798b8b164136d87913faed1e19474f803d
-DIST byte-buddy-agent-1.12.8-sources.jar 204430 BLAKE2B fe62b36fccc1000b63cf4fdc9a0eda0b767baedbb795ed55d28068ca9bd01f10b47e28edb2ee2d0fccd28e82f531f882091386b9c58f2ca929e17e89f996876a SHA512 576cad5aec60bb1623faf6f2460e9550aab392124579a0ed467128c3cdbc20fb0c4e51dfaa8d56c8f2f314bcc494068aae5c199a0551cbfce053633a2ffb5bd2
-EBUILD byte-buddy-agent-1.12.10.ebuild 3900 BLAKE2B 683f9d03bfe04810f6b946b71039af441dd2835cbe7c37c532fbaaba3748d1b30f05dce7e2b8d4370b8e6d99c4070f242a97648e35a7e55205a9dbd33c9d90e1 SHA512 2927b9d5303df5250ef6380359c8fb3265e784003d10d41512e9aad02c2b3dad2250b53de61d620da9df0541885a2fe1a40c698f75d50fada7570ecf9ce709c4
-EBUILD byte-buddy-agent-1.12.8.ebuild 3928 BLAKE2B efbc2379d5631c28281ee48b064646d9bb329dd3cbd590fc688520a478220fb0faff9f31e8aa455450b90083039fb4378e029cce6071fade49111450b20581fc SHA512 f6b00b5f5dbd9d3cff386afd1067a807cd6842b2107e8586af2e371558a375a1fa0213c2b335adc83ca2a74b2b06ce427de752a8ca59748f18f3d005281d4cdf
+EBUILD byte-buddy-agent-1.12.10.ebuild 3896 BLAKE2B 026356551487c0b98673d48fcc48f98ff5407d8934e3be3b212b5e71e908baa4e08e5d7dffd3ff785b551fa0edc587a036db5d549cd1abffeeadd68d66c29389 SHA512 53a612eb49dc6ddc972e784b9e339866bd07cfe514691741dc904d4a51b8e34a5da7ddfbcc7a67d14a4cc6575ecd50a3669c3ca25e0832e5e3aea84508ceec70
 MISC metadata.xml 298 BLAKE2B 914c744490ae973853ca6466984c1037b03e9fca047e413a4c6981122c796312f56510069c6ac3c7cbc4ade7f45d480b4aa6ad0dbeb5e9c19e552aa136308626 SHA512 6483fd3b6cf22d595b2d925d81b5450f1bbe5b0b371bf4bd221a7433d9eeec5824c2dc644a77cb4206a6bcc017172f764f050eda9dd6f479fe408d491b325f5a
diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
index 69968be0f8ce..dd14f79475bf 100644
--- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
+++ b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.10.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.j
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: ${P}.pom
diff --git a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild b/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
deleted file mode 100644
index 43c4d6ef258c..000000000000
--- a/dev-java/byte-buddy-agent/byte-buddy-agent-1.12.8.ebuild
+++ /dev/null
@@ -1,87 +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 byte-buddy-agent-1.12.8.pom --download-uri https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.8/byte-buddy-agent-1.12.8-sources.jar --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-agent-1.12.8.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.8"
-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://repo1.maven.org/maven2/net/bytebuddy/${PN}/${PV}/${P}-sources.jar
-	test? ( https://codeload.github.com/raphw/byte-buddy/tar.gz/byte-buddy-1.12.8 -> byte-buddy-${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: ${P}.pom
-# com.google.code.findbugs:findbugs-annotations:3.0.1 -> >=dev-java/findbugs-annotations-3.0.1:0
-# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
-# net.java.dev.jna:jna:5.8.0 -> >=dev-java/jna-5.10.0:4
-# net.java.dev.jna:jna-platform:5.8.0 -> !!!artifactId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/findbugs-annotations:0
-	dev-java/jna:4
-	test? ( dev-java/mockito:4 )
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-JAVA_CLASSPATH_EXTRA="findbugs-annotations,jna-4"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-# 1) testSystemProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path (target/test-classes:byte-buddy-agent.jar:/usr/share/findbugs-annotations/lib/findbugs-annotations.jar:/usr/share/jna-4/lib/jna.jar:/usr/share/jna-4/lib/jna-platform.jar:/usr/share/jsr305/lib/jsr305.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/mockito-4/lib/mockito.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar:/usr/share/byte-buddy/lib/byte-buddy.jar:/usr/share/byte-buddy-agent/lib/byte-buddy-agent.jar:/usr/share/objenesis/lib/objenesis.jar:/usr/share/opentest4j/lib/opentest4j.jar:/usr/share/junit-4/lib/junit.jar:/usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar)
-#         at com.sun.jna.Native.loadNativeDispatchLibraryFromClasspath(Native.java:1059)
-# --
-# 2) testAgentProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
-#         at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
-# --
-# 3) testMultipleProperties(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
-#         at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
-# --
-# 4) testAttachment(net.bytebuddy.agent.VirtualMachineAttachmentTest)
-# java.lang.reflect.InvocationTargetException
-# --
-# Caused by: java.lang.NoClassDefFoundError: Could not initialize class com.sun.jna.Native
-#         at net.bytebuddy.agent.VirtualMachine$ForHotSpot$Connection$ForJnaPosixSocket$Factory.<init>(VirtualMachine.java:879)
-# --
-# FAILURES!!!
-# Tests run: 51,  Failures: 4
-JAVA_TEST_EXCLUDES="net.bytebuddy.agent.VirtualMachineAttachmentTest"
-
-src_prepare() {
-	default
-	mkdir -p "src/main/java" || die
-	mv "net" "src/main/java" || die
-	if use test; then
-		mv "byte-buddy-byte-buddy-${PV}/byte-buddy-agent/src/test" "src" || die
-	fi
-}