gentoo resync : 20.03.2022

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index 4be6a6bfda8a..a97f5b7256db 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,5 +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-r1.ebuild 1306 BLAKE2B 38bb43db3acd2066491481a6fd5beff358cc99974e3bab281ca1697566bdace56b2509f50a4d630e2b07389b53deb6bc03d833e7c9b9e29a1701660740051e7f SHA512 4f776b751b9c2cd22f9f6e82a3f286ed2da4d81687fbe089e7f86cfda41a28db8121a906d8e8d740f9232ffb261d42142a96c4f10971143d4e029bf460af2085
-EBUILD cpptasks-1.0_beta5.ebuild 1085 BLAKE2B bf55abda854a6d085fa2787b0eccbbb6abef4c97c2675e80bf91b3aa09509314ba2943d4a9bd427010f190006273d79c4d1269f0fb2bbff058ccc1ae0955be70 SHA512 cc8dc1a06d7a7efae982e6f02e97050eec498d1ccf950d9041f4320deaa712487608c920d0ec492d756649f55032000237704aed24676b28e60659148bbc546d
+EBUILD cpptasks-1.0_beta5-r1.ebuild 1302 BLAKE2B ae0c062ef9ccbcb1c9af7ad35cd31a48e5c925d1dc7a2557d3cd2eff4ecabcaf0b052d181ed0f5810a3cd6ed1aa97daa3e273ed9f0212e4477c3b97d0978111e SHA512 e194312ce4f012548907e6d95d65eb261fe2d3a5f92fcaa68cd1bd76ce340ab04d485c156e79bdc59d975ddbdd375c5a3575fa1e9fe85ab0d8505764677d804d
 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
index d2302a4b865a..38a0c3f54a50 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_beta/b}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
deleted file mode 100644
index e72710bc3451..000000000000
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source examples"
-
-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"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/xerces:2"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
-EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
-
-src_prepare() {
-	default
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
-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/*
-}