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

["Michał Górny" <mgorny@gentoo.org>]

commit:     081ca95a8710c73f0bfeec037fb5c83c9a650bfe
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 21:06:11 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 21:33:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=081ca95a

dev-java/radeox: Bump to EAPI 7

Closes: https://bugs.gentoo.org/697358
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-java/radeox/radeox-1.0_beta2-r1.ebuild | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
index 8b728eddce5..76aa9507000 100644
--- a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -1,49 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
+MY_P="${P/_beta/-BETA-}"
 DESCRIPTION="Radeox Wiki render engine"
 HOMEPAGE="http://www.radeox.org"
-MY_PV="${PV/_beta/-BETA-}"
-MY_P="${PN}-${MY_PV}"
 SRC_URI="ftp://snipsnap.org/radeox/${MY_P}-src.tgz"
-LICENSE="LGPL-2.1"
+
+LICENSE="LGPL-2.1+"
 SLOT="1"
 KEYWORDS="amd64 x86"
 IUSE=""
+
 RDEPEND=">=virtual/jre-1.4
-	=dev-java/commons-logging-1*"
+	=dev-java/commons-logging-1*:0"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+EANT_BUILD_TARGET="jar jar-api"
+
+src_prepare() {
+	default
 
 	# TOOD:
 	# these would get bundled to the final jar
 	# we should try to run the tests though
 	rm -rf  src/org/radeox/example/ \
-		src/test/ src/org/radeox/test/
+		src/test/ src/org/radeox/test/ || die
 
 	rm -v lib/*.jar || die
 	rm -v src/org/radeox/filter/*.class || die
 	rm -v src/org/radeox/*/*/*.class || die
-	cd lib
+
+	cd lib || die
 	java-pkg_jar-from commons-logging
 }
 
-EANT_BUILD_TARGET="jar jar-api"
-
 src_install() {
-	dodoc Changes.txt README Radeox.version || die
+	dodoc Changes.txt README Radeox.version
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc src/org
 	java-pkg_dojar lib/{radeox,radeox-api}.jar