commit:     140edacae039e66182857e0cfc4342d14d3aa44f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 00:31:53 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 01:01:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=140edaca

dev-java/cpptasks: port to EAPI 7

Closes: https://bugs.gentoo.org/740994
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/cpptasks/cpptasks-1.0_beta5.ebuild | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild 
b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index fd8f96b943c..c0dade63028 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
 

Reply via email to