From 188fe3627a3523e453f73600b924dfa920860f29 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Tue, 12 Mar 2024 08:19:07 +0100
Subject: dev-java/plexus-classworlds: switch dependency to dev-java/ant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35723/commits/a3043a5e8da31324cdfb434f089a0886be439f45
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 .../plexus-classworlds-2.7.0-r1.ebuild             | 47 ++++++++++++++++++++++
 .../plexus-classworlds-2.7.0.ebuild                | 47 ----------------------
 2 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
 delete mode 100644 dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild

(limited to 'dev-java')

diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..b61697448e9a
--- /dev/null
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0-r1.ebuild
@@ -0,0 +1,47 @@
+# 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.codehaus.plexus:plexus-classworlds:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The class loader framework of the Plexus project"
+HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
+SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-1.10.14-r3:0
+		dev-java/commons-logging:0
+		dev-java/xml-commons-external:1.4
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
+JAVA_SRC_DIR="src/main/java/"
+
+# Invalid test class, No runnable methods
+JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/test-data"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test(){
+	# java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar
+	mkdir -p target/test-lib || die
+	java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar
+	java-pkg_jar-from --into target/test-lib ant ant.jar ant-1.9.0.jar
+	java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
deleted file mode 100644
index 5d46ae9f6f12..000000000000
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.codehaus.plexus:plexus-classworlds:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The class loader framework of the Plexus project"
-HOMEPAGE="https://codehaus-plexus.github.io/plexus-classworlds/"
-SRC_URI="https://github.com/codehaus-plexus/plexus-classworlds/archive/plexus-classworlds-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-core:0
-		dev-java/commons-logging:0
-		dev-java/xml-commons-external:1.4
-	)
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-JAVA_MAIN_CLASS="org.codehaus.plexus.classworlds.launcher.Launcher"
-JAVA_SRC_DIR="src/main/java/"
-
-# Invalid test class, No runnable methods
-JAVA_TEST_EXCLUDES="org.codehaus.plexus.classworlds.TestUtil"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/test-data"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test(){
-	# java.io.FileNotFoundException: target/test-lib/xml-apis-1.3.02.jar
-	mkdir -p target/test-lib || die
-	java-pkg_jar-from --into target/test-lib xml-commons-external-1.4 xml-commons-external.jar xml-apis-1.3.02.jar
-	java-pkg_jar-from --into target/test-lib ant-core ant.jar ant-1.9.0.jar
-	java-pkg_jar-from --into target/test-lib commons-logging commons-logging.jar commons-logging-1.0.3.jar
-	java-pkg-simple_src_test
-}
-- 
cgit v1.2.3-65-gdbad