[gentoo-commits] repo/gentoo:master commit in: dev-java/plexus-classworlds/

[Miroslav Šulc]

commit:     b4daa5c4d131a4ccfc450a7744a6ac1bd3c556f4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 16:29:00 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <fordfrog <AT> 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() {