[gentoo-commits] repo/gentoo:master commit in: dev-java/byte-buddy/

["Florian Schmaus" <flow@gentoo.org>]

commit:     c282d0ed151e5d4988e419bb0c8ac77f90e4462c
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jan 18 08:14:47 2025 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 13:58:02 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c282d0ed

dev-java/byte-buddy: add 1.17.5

Simplifies ebuild by generating module-info with eclass functionality.

Switches to dev-java/jna:0 (from dev-java/jna:4)

Closes: https://bugs.gentoo.org/837233
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/40336
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/byte-buddy/Manifest                 |   1 +
 dev-java/byte-buddy/byte-buddy-1.17.5.ebuild | 117 +++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 450d00e8c659..8d0cb84e1205 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1 +1,2 @@
 DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8
+DIST byte-buddy-1.17.5.tar.gz 2091889 BLAKE2B 160e2c6dfe5ec5dee63c6417cb5f13462fa7ca4cfdd27cd304fb4e4bf0510be1c02dcc2d67642a734d353fe0042134d249da98aba2e5c6ddecdd9eae80daeff4 SHA512 14f0989c038489b91c05e5804a32e98f66a4a5ad95c67571416426b85e45af9ab3ce744d180d0b8fbb6447820aaec28f3b224e3d9fa2f80fca20d53c37e95b5a

diff --git a/dev-java/byte-buddy/byte-buddy-1.17.5.ebuild b/dev-java/byte-buddy/byte-buddy-1.17.5.ebuild
new file mode 100644
index 000000000000..8c3cb65c3e38
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.17.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:${PV} net.bytebuddy:byte-buddy:${PV}"
+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/byte-buddy/archive/${P}.tar.gz"
+S="${WORKDIR}/byte-buddy-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# KEYWORDS="~amd64" # Not keyworded bacause of dependency on asm-jdk-bridge
+
+DEPEND="
+	>=dev-java/asm-9.8:0
+	dev-java/asm-jdk-bridge:0
+	dev-java/findbugs-annotations:0
+	>=dev-java/jna-5.17.0:0
+	dev-java/jsr305:0
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/asm-jdk-bridge:0
+		>=dev-java/mockito-2.28.2-r1:2
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch" )
+
+JAVA_CLASSPATH_EXTRA="
+	asm
+	asm-jdk-bridge
+	findbugs-annotations
+	jna
+	jsr305
+"
+JAVADOC_CLASSPATH="${JAVA_CLASSPATH_EXTRA}"
+JAVADOC_SRC_DIRS=(
+	"byte-buddy-agent/src/main/java"
+	"byte-buddy/src/main/java"
+)
+
+src_prepare() {
+	default #780585
+	java-pkg_clean ! -path "./byte-buddy-dep/src/test/*"	# Keep test-classes
+	java-pkg-2_src_prepare
+
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+}
+
+src_compile() {
+	einfo "Compiling byte-buddy-agent.jar"
+	JAVA_INTERMEDIATE_JAR_NAME="net.bytebuddy.agent"
+	JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+	JAVA_MODULE_INFO_OUT="byte-buddy-agent/src/main"
+	JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+	JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+	rm -r target || die
+
+	einfo "Compiling byte-buddy.jar"
+	JAVA_INTERMEDIATE_JAR_NAME="net.bytebuddy"
+	JAVA_JAR_FILENAME="byte-buddy.jar"
+	JAVA_MODULE_INFO_OUT="byte-buddy/src/main"
+	JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
+	JAVA_RESOURCE_DIRS=()
+	JAVA_SRC_DIR="byte-buddy/src/main/java"
+	java-pkg-simple_src_compile
+	JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
+	rm -r target || die
+
+	use doc && ejavadoc
+}
+
+src_test() {
+	# instead of shading byte-buddy-dep we move it into byte-buddy.
+	mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+	JAVAC_ARGS="-g"
+	JAVA_TEST_GENTOO_CLASSPATH="asm-jdk-bridge,junit-4,mockito-2"
+
+	einfo "Testing byte-buddy-agent"
+	# https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
+	JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna/" )
+	JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+	java-pkg-simple_src_test
+
+	einfo "Testing byte-buddy"
+	JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
+	JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
+
+	JAVA_TEST_EXCLUDES=(
+		# all tests in this class fail, https://bugs.gentoo.org/863386
+		net.bytebuddy.build.CachedReturnPluginTest
+	)
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg_dojar "byte-buddy-agent.jar"
+	java-pkg-simple_src_install
+
+	if use source; then
+		java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+		java-pkg_dosrc "byte-buddy/src/main/java/*"
+	fi
+}