From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1709456-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CB7E15813A for <garchives@archives.gentoo.org>; Wed, 15 Jan 2025 06:13:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F1ACE07F1; Wed, 15 Jan 2025 06:13:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47471E07EF for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2025 06:13:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7540A343010 for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2025 06:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 119941F9A for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2025 06:13:52 +0000 (UTC) From: "Miroslav Šulc" <fordfrog@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org> Message-ID: <1736921621.9e01ad9c241f2f2ed184ef8b442592b486062241.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/byte-buddy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/byte-buddy/Manifest dev-java/byte-buddy/byte-buddy-1.15.10.ebuild X-VCS-Directories: dev-java/byte-buddy/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 9e01ad9c241f2f2ed184ef8b442592b486062241 X-VCS-Branch: master Date: Wed, 15 Jan 2025 06:13:52 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 25661520-df44-473a-b929-a38ea034f40b X-Archives-Hash: b13361ae60f1e1df3d76f9140dae0f69 commit: 9e01ad9c241f2f2ed184ef8b442592b486062241 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Jan 14 15:43:32 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Jan 15 06:13:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e01ad9c dev-java/byte-buddy: drop 1.15.10 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/byte-buddy/Manifest | 1 - dev-java/byte-buddy/byte-buddy-1.15.10.ebuild | 144 -------------------------- 2 files changed, 145 deletions(-) diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest index b9be7b28c952..450d00e8c659 100644 --- a/dev-java/byte-buddy/Manifest +++ b/dev-java/byte-buddy/Manifest @@ -1,2 +1 @@ -DIST byte-buddy-1.15.10.tar.gz 2057524 BLAKE2B 7f5e178b3ea31fb30379e49d69f34ba1b9953d705a54c3609bb771f66962af776dee95ea10ab7049e50351362ff87c164782bc4b1b782985ac8f122e5833cb4e SHA512 3b7a02475433193efe8a8e20378369ec18f10c81dd90b428d5393c45fe261f678b1707c92923381b8a3030f8a2e8525fe95e3337ca7e5455cdc5fc2647416d2a DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8 diff --git a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild deleted file mode 100644 index f082462e97d5..000000000000 --- a/dev-java/byte-buddy/byte-buddy-1.15.10.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# 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 arm64 ppc64" - -DEPEND=" - >=dev-java/asm-9.7.1:9 - dev-java/findbugs-annotations:0 - dev-java/jna:4 - dev-java/jsr305:0 - >=virtual/jdk-11:* - test? ( - >=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-9 - findbugs-annotations - jna-4 - 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 - # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176 - cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die - 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 - - # instead of shading byte-buddy-dep we move it into byte-buddy. - mv byte-buddy{-dep,}/src/main/java || die "cannot move sources" - - # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195 - local exports="$( \ - sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \ - byte-buddy/pom.xml \ - | sed -e 's:^:exports :' -e 's:,:;:' \ - | grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \ - )" || die - cat > byte-buddy/src/main/java/module-info.java <<-EOF || die - 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} - } - EOF -} - -src_compile() { - einfo "Compiling byte-buddy-agent.jar" - JAVA_JAR_FILENAME="byte-buddy-agent.jar" - 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_JAR_FILENAME="byte-buddy.jar" - 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 - - einfo "Building javadocs" - rm byte-buddy{,-agent}/src/main/java/module-info.java || 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="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-4/" ) - 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 -}