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 5C601138359 for ; Thu, 27 Aug 2020 16:29:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28819E09D7; Thu, 27 Aug 2020 16:29:23 +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 0B211E09D7 for ; Thu, 27 Aug 2020 16:29:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7863733BF5D for ; Thu, 27 Aug 2020 16:29:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 024F6331 for ; Thu, 27 Aug 2020 16:29:20 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1598545754.b4daa5c4d131a4ccfc450a7744a6ac1bd3c556f4.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild X-VCS-Directories: dev-java/plexus-classworlds/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: b4daa5c4d131a4ccfc450a7744a6ac1bd3c556f4 X-VCS-Branch: master Date: Thu, 27 Aug 2020 16:29:20 +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: 5d1e64ac-8394-4f11-9b15-4a44233fd1bc X-Archives-Hash: ae8a91aa7fa613bdefaeb4bbba1699e4 commit: b4daa5c4d131a4ccfc450a7744a6ac1bd3c556f4 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Aug 27 16:29:00 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Aug 27 16:29:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4daa5c4 dev-java/plexus-classworlds: eapi7, min java 1.8, ant task via var Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> .../plexus-classworlds/plexus-classworlds-2.2.3.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild index b9bea04df15..49465eea7b4 100644 --- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild +++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc source test" +WANT_ANT_TASKS="ant-junit4" inherit java-pkg-2 java-ant-2 @@ -17,16 +18,15 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND=">=virtual/jdk-1.6 - test? ( dev-java/ant-junit4 )" -RDEPEND=">=virtual/jre-1.6" +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_TEST_GENTOO_CLASSPATH="junit-4" -EANT_TEST_ANT_TASKS="ant-junit" -java_prepare() { +src_prepare() { cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die + + default } src_install() {