commit: f1b06e6b7b9ba5e501d7085ffaeb0a03356fce88 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Jun 5 07:49:30 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Jun 17 08:58:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b06e6b
dev-java/cpptasks: rewrite with java-pkg-simple, #852956 Bug: https://bugs.gentoo.org/852920 Bug: https://bugs.gentoo.org/852956 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36770/commits/3fefd512ff4d9716fc9f7af3b1d7e6c07f7cae52 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/cpptasks/cpptasks-1.0_beta5-r3.ebuild | 50 ++++++++++++++++++++++ .../files/cpptasks-1.0_beta5-test-classpath.patch | 33 -------------- 2 files changed, 50 insertions(+), 33 deletions(-) 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 <[email protected]> -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 <[email protected]> ---- - 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 -
