gentoo resync : 16.01.2021

4 files changed, 101 insertions, 3 deletions

diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index a3afc38d2e75..c9bf087ebe3b 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,3 +1,5 @@
+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.ebuild 1073 BLAKE2B bd8f1f109f6b759054cea5712ecccc32a824782b5a5504152d2d7aaa944fc8a9bfb5f5fccd788f49df87639859f5852284717171395ffae295a19599f3b7322e SHA512 311f5b5ffb5cc8bdb5a64ddbba2af248d68b4017c84dbb2dbd149dc20c21a6f94049cd4d5e2af84ad7c49ece0b249f49dfcccdc33fc064a0a68f9baef5f4245f
+EBUILD cpptasks-1.0_beta5-r1.ebuild 1259 BLAKE2B 9b087463e02110d1ba06782702f7590269fbcfe281159221d840b65f3ebd2615d7958e7fe1756928072f468a13f84cf88e47b7f2eaf3ad36e98ab5126eabc3ad SHA512 6f4f83a1ee8d704703c52514e14528a25e7d9d3eb0e086c07c434da479727eca7da9ac68faced4276704d3b3f42db04911c278fcfd2f044a2b874371a1aee289
+EBUILD cpptasks-1.0_beta5.ebuild 1085 BLAKE2B bf55abda854a6d085fa2787b0eccbbb6abef4c97c2675e80bf91b3aa09509314ba2943d4a9bd427010f190006273d79c4d1269f0fb2bbff058ccc1ae0955be70 SHA512 cc8dc1a06d7a7efae982e6f02e97050eec498d1ccf950d9041f4320deaa712487608c920d0ec492d756649f55032000237704aed24676b28e60659148bbc546d
 MISC metadata.xml 318 BLAKE2B 53f5719585c7a4f0479017c4410975aefadcedd17db45949c351329e28761f05ebd89ef0557505a9a3ae03967b9baefe3e2c5b1edf0116a10434755a8d76fbe3 SHA512 b89f13a465ae0f1cad3352319206dc922badf513f63af878b118577e1f6da322b824dd14ca9220cf10aa5c5463c30399f001395a36c45c3b69228a375be379ee
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
new file mode 100644
index 000000000000..f754a3db0200
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/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 ~x86"
+
+CP_DEPEND="
+	dev-java/ant-core:0
+	dev-java/xerces:2
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="run-tests -Djunit-available=true"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+
+src_prepare() {
+	java-pkg_clean
+	use test && eapply "${FILESDIR}/${P}-test-classpath.patch"
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+
+	dodoc NOTICE
+	use doc && java-pkg_dojavadoc build/api
+	use examples && java-pkg_doexamples src/samples/*
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index c0dade630289..e72710bc3451 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 CDEPEND="
 	dev-java/ant-core:0
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
new file mode 100644
index 000000000000..02754ce7f1ed
--- /dev/null
+++ b/dev-java/cpptasks/files/cpptasks-1.0_beta5-test-classpath.patch
@@ -0,0 +1,33 @@
+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
+