dev-java/junit-addons: Fix the jdom-1.0 reference that wltjr missed

Also apply proper SLOT dependencies and change the src_unpack to
java_prepare.

Package-Manager: portage-2.2.20.1

diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
index e657b2ba81a9a53500a0cbd87007e46cac24406d..4df5fa14ad18d38f4b038b5fcd8425cbe9ff566c 100644 (file)
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,10 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos"
 
 COMMON_DEP="
-       =dev-java/junit-3.8*
-       dev-java/ant-core
+       dev-java/junit:0
+       dev-java/ant-core:0
        dev-java/jdom:0
-       =dev-java/jaxen-1.1*
+       dev-java/jaxen:1.1
        "
 
 RDEPEND=">=virtual/jre-1.4
@@ -29,9 +29,7 @@ DEPEND=">=virtual/jdk-1.4
                app-arch/unzip
                ${COMMON_DEP}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+java_prepare() {
        unpack ./src.jar
        rm -v *.jar || die
        # Not included so taken from cvs
@@ -43,7 +41,7 @@ _eant() {
        eant \
                -Djunit.jar="$(java-pkg_getjar junit junit.jar)" \
                -Dant.jar="$(java-pkg_getjar ant-core ant.jar)" \
-               -Djdom.jar="$(java-pkg_getjar jdom-1.0 jdom.jar)" \
+               -Djdom.jar="$(java-pkg_getjar jdom jdom.jar)" \
                -Djaxen.jar="$(java-pkg_getjar jaxen-1.1 jaxen.jar)" \
                "${@}"
 }