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

["Sam James" <sam@gentoo.org>]

commit:     d98679e55f33e4f7e2cc1221ca92b215c29b8d90
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 01:37:41 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 02:03:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98679e5

dev-java/odfdom: port to EAPI 7

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

 dev-java/odfdom/odfdom-0.8.6-r1.ebuild | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
index 647424a452f..ac419a17aa6 100644
--- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -1,7 +1,7 @@
-# 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 test"
 
@@ -13,11 +13,11 @@ SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-versio
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 CDEPEND="dev-java/xerces:2
 	dev-java/xml-commons-external:1.4"
 
+BDEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.5
@@ -31,9 +31,13 @@ DEPEND=">=virtual/jdk-1.5
 S="${WORKDIR}/${P}-sources"
 
 EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4"
+EANT_BUILD_TARGET="package"
+EANT_JAVADOC_TARGET="javadoc"
+EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
-java_prepare() {
+src_prepare() {
 	cp "${FILESDIR}/build-${PV}.xml" build.xml || die
 
 	mkdir lib || die
@@ -43,17 +47,14 @@ java_prepare() {
 		  src/test/java/org/odftoolkit/odfdom/doc/PresentationTest.java \
 		  src/test/java/org/odftoolkit/odfdom/doc/ImageTest.java \
 		  src/test/java/org/odftoolkit/odfdom/incubator/meta/MetaDocumentStatisticTest.java \
-		  src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java
-}
+		  src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java \
+	|| die
 
-EANT_BUILD_TARGET="package"
-EANT_JAVADOC_TARGET="javadoc"
-EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
+	default
+}
 
 src_test() {
-	EANT_EXTRA_ARGS="" \
-		java-pkg-2_src_test
+	EANT_EXTRA_ARGS="" java-pkg-2_src_test
 }
 
 src_install() {