From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 dev-java/cpptasks/Manifest                  |  2 +-
 dev-java/cpptasks/cpptasks-1.0_beta5.ebuild | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'dev-java/cpptasks')

diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index e90c6ed5e2ee..1a5359e9e8a5 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,3 +1,3 @@
 DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
-EBUILD cpptasks-1.0_beta5.ebuild 1086 BLAKE2B e64dccaa56ccf4293296d7f3e3867cab2f8e42eba14e838208ae1ba462b2f66b51eec1721e7f6aa462412d435d24fca25275abde92999a760d3054c8c656cb6c SHA512 ebd302f4af84c292eb974ab6f1968e702934ef7504458507c54931116af6fdbb640ab143ee061f471bea1b8ac16f23af337087b94a562663c2dd0b4545e4c07a
+EBUILD cpptasks-1.0_beta5.ebuild 1073 BLAKE2B bd8f1f109f6b759054cea5712ecccc32a824782b5a5504152d2d7aaa944fc8a9bfb5f5fccd788f49df87639859f5852284717171395ffae295a19599f3b7322e SHA512 311f5b5ffb5cc8bdb5a64ddbba2af248d68b4017c84dbb2dbd149dc20c21a6f94049cd4d5e2af84ad7c49ece0b249f49dfcccdc33fc064a0a68f9baef5f4245f
 MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index fd8f96b943c7..c0dade630289 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source examples"
 
-inherit eutils java-pkg-2 java-ant-2
+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 x86"
-IUSE=""
 
 CDEPEND="
 	dev-java/ant-core:0
@@ -24,18 +24,17 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	>=virtual/jdk-1.6"
 
-S="${WORKDIR}/${P/_beta/b}"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
 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
 
-- 
cgit v1.2.3