dev-java/jarjar: Housekeeping wrt EAPI 5 compliance.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index d193ad2dc35ac25640d22ea9369fd9af0465fd25..81386bc1af1deb04d055c8e0486c7816f3f17565 100644 (file)
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -14,56 +14,48 @@ LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="amd64 ~arm x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
+RESTRICT="test"
 
 CDEPEND="
        dev-java/asm:4
        dev-java/gnu-regexp:1
        dev-java/java-getopt:1
        dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-       ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-       app-arch/unzip
-       ${CDEPEND}"
 
-RESTRICT='test'
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
 
-# FIXME: tests fail to pass.
-#src_test() {
-#      # regenerates this
-#      cp -i dist/${P}.jar "${T}" || die
-#      cd lib || die
-#      java-pkg_jar-from junit
-#      cd ..
-#      ANT_TASKS="ant-junit" eant test
-#      cp "${T}/${P}.jar" dist || die
-#}
+DEPEND="
+       ${CDEPEND}
+       >=virtual/jdk-1.6
+       app-arch/unzip"
 
-src_unpack() {
-       unpack ${A}
-
-       cd "${S}" || die
-       rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jar-nojarjar"
+EANT_GENTOO_CLASSPATH="
+       asm-4
+       gnu-regexp-1
+       java-getopt-1
+       ant-core
+"
 
-       cd "${S}/lib" || die
-       rm -v *.jar || die
+ANT_TASKS="none"
 
-       java-pkg_jar-from asm-4
-       java-pkg_jar-from gnu-regexp-1
-       java-pkg_jar-from ant-core ant.jar
-       java-pkg_jar-from java-getopt-1
-}
+PATCHES=(
+       "${FILESDIR}/0.9-system-jars.patch"
+       "${FILESDIR}/0.9-bootclasspath.patch"
+)
 
-src_prepare() {
-       epatch "${FILESDIR}/0.9-system-jars.patch"
+JAVA_RM_FILES=(
+       src/main/com/tonicsystems/jarjar/JarJarMojo.java
+)
 
-       # bug #191378
-       epatch "${FILESDIR}/0.9-bootclasspath.patch"
+java_prepare() {
+       java-pkg_clean
+       epatch "${PATCHES[@]}"
 }
 
-ANT_TASKS="none"
-EANT_BUILD_TARGET="jar-nojarjar"
-
 src_install() {
        java-pkg_newjar dist/${P}.jar ${PN}.jar
        java-pkg_register-ant-task