gentoo auto-resync : 09:12:2024 - 02:07:41

4 files changed, 113 insertions, 34 deletions

diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index a4e5b35d9058..fdd44a7f755a 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,3 +1,6 @@
+AUX javassist-3.29.2-gentoo.patch 2017 BLAKE2B 7febb5f77737ba747a0431f6e324867df2fc978d95b209a2e3d019a3da5f128cfc4442a393882f3e5d5ae924dcbb63d455a12edf66d4acc32a3a343e6fee079c SHA512 02e884234be315e40e333ca6978a2c1399610a0fe1a7d352c694ea943069c97c87bc1b34492033d30e4c39b03bbcbc80bf63f25161a97e6a6f64ef1273a4dd7a
 DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc
-EBUILD javassist-3.29.2.ebuild 2488 BLAKE2B a66a27d625b25f0e3cf764ef27f7e8dd30a04d58c64e16ae9663765a614110df999594f8db80bb2011c9b66e0f474d09d8d8858316fdb1edd8c19981dfad7032 SHA512 1bfd58b3c483304b7258ee96959b58c68d17be14843f9e1971330a4f9f479ee64922bbf915590b08fbb96b482e4eef1044ebb953efb5c4785da64277f316dec8
+DIST javassist-3.30.2.tar.gz 1295788 BLAKE2B e54fc5eb0b61c3f706d3d91169fc2ed76b8b5f43c8b4ef9eca3fa8c0001d30fd700bfc3f92c2d1a6e0960910977e6086dfda37602bbc36addaaad9cab253333f SHA512 d4bcfc1dbf94f6727eceb2aa33c9c7b9bfd2087d91e3b8b38df86f79975c26b677301eca900e6fef5415f995428d107f93cb5ee5a0d634a82e14bc0199b49a62
+EBUILD javassist-3.29.2.ebuild 1407 BLAKE2B 8746f2546201642f469c3120b947ffd1813d05400273737bced86a6d887f02233a3890ac47cf9bb8e7ab8aca89db4c163e2561c0314c2be8a5e6eb04249a212d SHA512 94ab51dc8e4ecb7596fd79867f79968709b6c553cc58f92211e624138341246c7bc7ce368f10385329a3cc811bb64ef348e71a78f313bdc3a5ddb9ac9f185625
+EBUILD javassist-3.30.2.ebuild 1409 BLAKE2B c7d2b2711c17ed3b5dc5257dc734f3b7d273eb10e5fd250a3166b6b2abe20b1e9365adb9b6b21c04287661035ee442d56b6ceaa0ab8e15e64a782c8e7da45755 SHA512 d40c77adb6f50797f92b1fc1842cf625ec1d7666146dfabf0e1e0c29e46018c4866c1d5c0da3429721539167170990b42edff57f1f66e70c009324e69455ace2
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/files/javassist-3.29.2-gentoo.patch b/dev-java/javassist/files/javassist-3.29.2-gentoo.patch
new file mode 100644
index 000000000000..27ae390d465b
--- /dev/null
+++ b/dev-java/javassist/files/javassist-3.29.2-gentoo.patch
@@ -0,0 +1,46 @@
+adjust BASE_PATH, PATH and JAR_PATH for java-pkg-simple.eclass
+
+--- a/src/test/javassist/JvstTest4.java
++++ b/src/test/javassist/JvstTest4.java
+@@ -635,10 +635,10 @@ public class JvstTest4 extends JvstTestRoot {
+         assertEquals(packageName, obj.getClass().getPackage().getName());
+     }
+ 
+-    public static final String BASE_PATH = "../../";
++    public static final String BASE_PATH = "";
+     public static final String JAVASSIST_JAR = BASE_PATH + "javassist.jar";
+-    public static final String CLASSES_FOLDER = BASE_PATH + "build/classes";
+-    public static final String TEST_CLASSES_FOLDER = BASE_PATH + "build/test-classes";
++    public static final String CLASSES_FOLDER = BASE_PATH + "target/classes";
++    public static final String TEST_CLASSES_FOLDER = BASE_PATH + "target/test-classes";
+ 
+     public static class Inner1 {
+         public static int get() {
+--- a/src/test/javassist/JvstTestRoot.java
++++ b/src/test/javassist/JvstTestRoot.java
+@@ -5,10 +5,10 @@ import java.lang.reflect.Method;
+ 
+ public class JvstTestRoot extends TestCase {
+     // the directory where all compiled class files are found.
+-    public static final String PATH = "../../target/test-classes/";
++    public static final String PATH = "target/test-classes/";
+ 
+     // the directory where javassist.jar is found.
+-    public static final String JAR_PATH = "../../";
++    public static final String JAR_PATH = "";
+ 
+     ClassPool sloader, dloader;
+     Loader cloader;
+--- a/src/test/javassist/JvstTest2.java
++++ b/src/test/javassist/JvstTest2.java
+@@ -333,8 +333,8 @@ public class JvstTest2 extends JvstTestRoot {
+ 
+         url = cp.find("javassist.CtMethod").toString();
+         System.out.println("testURL: " + url);
+-        assertTrue(url.startsWith("file:"));
+-        assertTrue(url.endsWith("/javassist/CtMethod.class"));
++        assertTrue(url.startsWith("jar:file:"));
++        assertTrue(url.endsWith("javassist.jar!/javassist/CtMethod.class"));
+ 
+         assertNull(cp.find("javassist.TestURL"));
+ 
diff --git a/dev-java/javassist/javassist-3.29.2.ebuild b/dev-java/javassist/javassist-3.29.2.ebuild
index a26a44d09cbc..87d13e19f38e 100644
--- a/dev-java/javassist/javassist-3.29.2.ebuild
+++ b/dev-java/javassist/javassist-3.29.2.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2024 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/jboss-javassist/javassist/archive/rel_3_29_2_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.2.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,29 +12,26 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="A class library for editing bytecodes in Java."
 HOMEPAGE="https://www.javassist.org"
 SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux"
 
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
-# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
-
-DEPEND=">=virtual/jdk-11:*
-	test? ( dev-java/hamcrest-library:1.3 )"
+DEPEND="
+	>=virtual/jdk-11:*
+	test? ( dev-java/hamcrest-library:1.3 )
+"
 
 RDEPEND=">=virtual/jre-1.8:*"
 
 DOCS=( Changes.md README.md )
 HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
 
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+PATCHES=( "${FILESDIR}/javassist-3.29.2-gentoo.patch" )
 
 JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
 JAVA_MAIN_CLASS="javassist.CtClass"
-JAVA_NEEDS_TOOLS=1
 JAVA_SRC_DIR="src/main"
 
 JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
@@ -46,28 +40,9 @@ JAVA_TEST_RUN_ONLY="javassist.JvstTest" # pom.xml, line 167
 JAVA_TEST_SRC_DIR="src/test"
 
 src_prepare() {
-	default
+	default #780585
+	java-pkg-2_src_prepare
 	java-pkg_clean javassist.jar
-	sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die
-
-	# Tests run: 432,  Failures: 6
-	# https://bugs.gentoo.org/856364
-	# Cannot solve those test failures.
-	# replacing test... with notTest... for those tests
-	sed \
-		-e '/public void/s:testInsertAt:notTestInsertAt:' \
-		-e '/public void/s:testInsertLocal:notTestInsertLocal:' \
-		-e '/public void/s:testNewArray:notTestNewArray:' \
-		-e '/public void/s:testURL:notTestURL:' \
-		-i src/test/javassist/JvstTest2.java || die
-
-	sed \
-		-e '/public void/s:testMethodParameters:notTestMethodParameters:' \
-		-i src/test/javassist/JvstTest4.java || die
-
-	sed \
-		-e '/public void/s:testLocalVarAttribute:notTestLocalVarAttribute:' \
-		-i src/test/javassist/bytecode/BytecodeTest.java || die
 }
 
 src_test() {
@@ -75,5 +50,6 @@ src_test() {
 	einfo "Testing"
 	JAVA_PKG_WANT_SOURCE=11
 	JAVA_PKG_WANT_TARGET=11
+	JAVAC_ARGS="-g -parameters"
 	java-pkg-simple_src_test
 }
diff --git a/dev-java/javassist/javassist-3.30.2.ebuild b/dev-java/javassist/javassist-3.30.2.ebuild
new file mode 100644
index 000000000000..fd3122df656a
--- /dev/null
+++ b/dev-java/javassist/javassist-3.30.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.javassist:javassist:3.30.2-GA"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A class library for editing bytecodes in Java."
+HOMEPAGE="https://www.javassist.org"
+SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
+
+LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	test? ( dev-java/hamcrest-library:1.3 )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( Changes.md README.md )
+HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
+
+PATCHES=( "${FILESDIR}/javassist-3.29.2-gentoo.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
+JAVA_MAIN_CLASS="javassist.CtClass"
+JAVA_SRC_DIR="src/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY="javassist.JvstTest" # pom.xml, line 167
+JAVA_TEST_SRC_DIR="src/test"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./src/test*"
+}
+
+src_test() {
+	einfo "Testing"
+	JAVA_PKG_WANT_SOURCE=11
+	JAVA_PKG_WANT_TARGET=11
+	JAVAC_ARGS="-g -parameters"
+	java-pkg-simple_src_test
+}