gentoo auto-resync : 10:08:2022 - 14:18:00

2 files changed, 155 insertions, 0 deletions

diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 40ebca6945aa..8885b4e3a780 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,7 @@
 DIST byte-buddy-1.12.10-sources.jar 1331398 BLAKE2B 8732ac81514de40d3d2ffd67ddca05ab9b8a5d0a7f240ee4591fd02b41f410f9e834f389aa898829fbae6082e14a090f87052f537b2b6293c7f8f98d4a5d0583 SHA512 15cb4330598d9259afa29aac0317f8e0e003eb76fb26052bba0714ad30453db721938be7d46fcc6a0c7bbe124bffe68dfee6fcf11a3e4030e99ef01d0ae3d461
 DIST byte-buddy-1.12.12.tar.gz 149937318 BLAKE2B 1a1bd0de97b47ace4c64649da3ae80dcb421a4d46e9b4f66e121accad94a99a2b81fa9aeaca99ae14cf1ef56feff5248d5700d6b056d490563bbc7ae9f07ace9 SHA512 bd8dc5b86ce456d5a907dd23643233bb001c15df5419aeed177d3b4f8054ab172d13244d0b3fef734e8232dfdd9339745d8112fa69e0be566b62459c198bf67a
+DIST byte-buddy-1.12.13.tar.gz 1721038 BLAKE2B 60aadbbb3b56e5ac2ecc2bb162653b769f4d4b913bd675457ce2fbf12a5777addc4beb2bb2e347d5956dbf1fbe6a6dfce078a29c53b1f1e2a60585670897d4ee SHA512 88c221d0dccb248683069070e498c5d4320f4fce059c45f460e04fbd86c2c596c18a4c7f4e9b3a0480eaf96d93593d1f1af87d894a7c4b3d73511e88a95f4e92
 EBUILD byte-buddy-1.12.10.ebuild 1375 BLAKE2B 3d215a54ae80086b7e1a3f1a523546131c3a24db57106d13ef3d7f010a78e6a316bd01e10619c3b00c5a8fea84cad6cd942bca132b5e5fee9716d4645655fb0f SHA512 8e299b9c4ca17244c695e69ea50e7e40dbe6ef3eae116363c080ca4c3d4cae01411a1af9eb253973be3b50c1d51d78eb33d2ecc5c518a6a93ff21b93ac8c7d22
 EBUILD byte-buddy-1.12.12.ebuild 6645 BLAKE2B 1c791641004695ae56721b0b34d190477fbb08bb0eadb2d5688d495f2f57bcf2ccb1d9ebba6d77a0efcd252bb00ae875f3b3398f047bd678e00c49e63f0360be SHA512 a47a9b13cc084e550255fa6cd5afe34f2c8ce6ad5312419d90fa917596e5ee61e99d4e5c9697b762683e2987a02e19eb99e5de2f44afc069a25a22b353ab6a02
+EBUILD byte-buddy-1.12.13.ebuild 4579 BLAKE2B a9b851edb04f778f5085c998900fd48480d239096e593f36808c0513f764df9fbf3c0f992115beba81abf4a97da9b82d3b5afed870da6ba98f2cf61c03a21468 SHA512 7edd44092b056245708a072c19207480a63234f6670a1241fc1d19d43499db42f99c696247ae16a489ffd5a6c09d6107c7039911490b326eb2bff20cccfd3eb5
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
new file mode 100644
index 000000000000..c5c66b0dfca9
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.12.13.ebuild
@@ -0,0 +1,153 @@
+# 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.13.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.13.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.13"
+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.12/byte-buddy-agent/pom.xml#L132-L165
+	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
+
+	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
+}
+
+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
+
+# For pkgdiff to compare the content of module-info.class
+#	mkdir -p META-INF/versions/9 || die
+#	cp target/classes/module-info.class META-INF/versions/9/ || die
+#	jar -uf byte-buddy.jar -C . META-INF/versions/9/module-info.class || die
+
+	einfo "Compiling byte-buddy-dep.jar"
+	JAVA_SRC_DIR="byte-buddy-dep/src/main/java"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_JAR_FILENAME="byte-buddy-dep.jar"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-dep.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-dep"
+	JAVA_TEST_SRC_DIR="byte-buddy-dep/src/test/java"
+	JAVA_TEST_RESOURCE_DIRS=(
+		byte-buddy-dep/src/test/resources
+		byte-buddy-dep/src/test/precompiled*
+	)
+
+	# what "mvn test" does with java 17 is:
+	# Tests run: 9855, Failures: 0, Errors: 0, Skipped: 0
+	JAVA_TEST_EXCLUDES+=(
+		net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest	# 39 tests
+		# v1.12.13
+		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-dep.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-dep/src/main/java/*"
+	fi
+}