gentoo auto-resync : 18:06:2024 - 00:10:02

3 files changed, 51 insertions, 34 deletions

diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index 3bb228ca0da3..b76520d51564 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,4 +1,4 @@
-AUX cpptasks-1.0_beta5-test-classpath.patch 1070 BLAKE2B eacc916610026d4eb25fe7a217ce23e6ca485400e9f90c8ac37a4fb614fd0ac59d622161f79854b664db0e1cc48d047655479d817fcade448952d4c231d33860 SHA512 4ce1d06f6cb1a32ff8807f9e9ad8deddef26d4ea6ed6b2826d80e3ca16c491ecefb0c850ad9a958fdae3cdbd764852ab3a5f0ad66464b928f4c12061e3cb3e73
 DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
 EBUILD cpptasks-1.0_beta5-r2.ebuild 1332 BLAKE2B 944ccd54edfe0de536f0f5462601da381ba52450008802fc4b9c09cd07d5b041bb045507ebc039bbccc3f5d2bb491c8dfb04edfe783cb3890a45df9f736d3919 SHA512 6c960a332ea92b88ce6b58c642ea3e328ae8732011e92fbc7a8cd0dfa1b7e9ee11ee05b556835ad580e1e910dfd186aae821ab1839db726105d9651cb464c5eb
+EBUILD cpptasks-1.0_beta5-r3.ebuild 1161 BLAKE2B f820bfb90e52a8f1b8807f29ce00340e5c04f962b76f188f7433613bec3e2f3fd0bd249ea7d71aced712b634738b5931eb23ca2bace176dc569e29f6f860ef71 SHA512 971faaca92bf8cb4a8a47424bb0ecfc968e5f8189bc9f43ed58773e0ba20eafbce0beb9dbf48e663e643529b23e0ac22811c754e433719fe1ad18216e50093d7
 MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
new file mode 100644
index 000000000000..c588ecf5dcc6
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="https://ant-contrib.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+S="${WORKDIR}/${P/_beta/b}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	>=dev-java/ant-1.10.14:0
+	dev-java/xerces:2
+"
+
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-1.10.14:0[junit]
+		dev-java/junit:0
+	)
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( NOTICE )
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RUN_ONLY=( net.sf.antcontrib.cpptasks.TestAllClasses )
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_register-ant-task
+	use examples && java-pkg_doexamples src/samples/*
+}
diff --git a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
deleted file mode 100644
index 02754ce7f1ed..000000000000
--- a/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 15 Jan 2022 10:58:28 -0800
-Subject: [PATCH] Prevent test classpath from being overwritten by
- java-ant-2.eclass
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index ed3a0f7..24a3114 100644
---- a/build.xml
-+++ b/build.xml
-@@ -176,8 +176,12 @@
-            deprecation="false"
-            target="${javac.target}"
-            source="${javac.source}"
--           optimize="false"
--           classpath="${build.lib}/${name}.jar;${java.class.path}"/>
-+           optimize="false">
-+        <classpath>
-+            <pathelement location="${build.lib}/${name}.jar" />
-+            <pathelement location="${java.class.path}" />
-+        </classpath>
-+    </javac>
-     <jar jarfile="${tests.build.lib}/${name}_test.jar">
-             <fileset dir="." includes="NOTICE LICENSE"/>
-             <fileset dir="${tests.build.classes}"/>
--- 
-2.34.1
-