From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 dev-java/odfdom/Manifest               |  2 +-
 dev-java/odfdom/odfdom-0.8.6-r1.ebuild | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'dev-java/odfdom')

diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
index 7179e549f373..339fe3637b38 100644
--- a/dev-java/odfdom/Manifest
+++ b/dev-java/odfdom/Manifest
@@ -1,4 +1,4 @@
 AUX build-0.8.6.xml 11328 BLAKE2B 73af33dddbcb829fa0a5e6354a8ac176836fbc975336f633709fb6519e834cc237af80b8bfc4822af58a85dbc89e452e891dcbbc16425f3c245ecc2ad6de5943 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef
 DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0
-EBUILD odfdom-0.8.6-r1.ebuild 1723 BLAKE2B 147f3d9e28f450021423afa80df2b199553a9ce4942215c8c3b32a4d19fdb83fb028838894596d0d4c29acf80aedce40fa21fd70d5385d33c57a4ad55c77a472 SHA512 5218670fe7e049b62384d6eaaf3508897cee0068c0577e85032595a0c688da445a3877147b9a1ecbdab7d714bb4f68e3e8606c52279860003c3929b5187a8d68
+EBUILD odfdom-0.8.6-r1.ebuild 1749 BLAKE2B 391c697aeecfc789c220f45b5ff4121baaeec096ed0d8d43839b9204a27a02b977eec72b90cf5d428e75faaff60a2514e5222dff1cfd3d1748bef46e753bb590 SHA512 53ac95ef66ff012522d82a428ff139604005fec01c83f2f1290e56f0f56cbe3bfbce2ac422f1984473c95e26a21a97c177a78cf3d298827c63e105ee02ff00eb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
index 647424a452f2..ac419a17aa66 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() {
-- 
cgit v1.2.3