From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B4D6138359 for ; Sun, 20 Sep 2020 01:12:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BF4FE0824; Sun, 20 Sep 2020 01:12:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C451E0824 for ; Sun, 20 Sep 2020 01:12:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD982340AA7 for ; Sun, 20 Sep 2020 01:12:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2074233A for ; Sun, 20 Sep 2020 01:12:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1600563665.140edacae039e66182857e0cfc4342d14d3aa44f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/cpptasks/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/cpptasks/cpptasks-1.0_beta5.ebuild X-VCS-Directories: dev-java/cpptasks/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 140edacae039e66182857e0cfc4342d14d3aa44f X-VCS-Branch: master Date: Sun, 20 Sep 2020 01:12:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b3e2413-79cc-40c9-9ad8-aef2a9b36816 X-Archives-Hash: 713939a2b2faf726c6e8cbfcaf86e9ef commit: 140edacae039e66182857e0cfc4342d14d3aa44f Author: Sam James gentoo org> AuthorDate: Sun Sep 20 00:31:53 2020 +0000 Commit: Sam James gentoo 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 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