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

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

[James Le Cuirot]

commit:     61cd29febe05704fe2a2ab0e88a3bf0dc3c98329
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Thu Sep 17 23:59:53 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:19:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cd29fe

dev-java/junit-addons: Updated dev-java/jdom slot from 1.0 -> 0 for v1

 .../{junit-addons-1.4.ebuild => junit-addons-1.4-r1.ebuild}           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-java/junit-addons/junit-addons-1.4.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
similarity index 98%
rename from dev-java/junit-addons/junit-addons-1.4.ebuild
rename to dev-java/junit-addons/junit-addons-1.4-r1.ebuild
index c0b8ddc..e657b2b 100644
--- a/dev-java/junit-addons/junit-addons-1.4.ebuild
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=5
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -17,7 +19,7 @@ KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos"
 COMMON_DEP="
 	=dev-java/junit-3.8*
 	dev-java/ant-core
-	~dev-java/jdom-1.0
+	dev-java/jdom:0
 	=dev-java/jaxen-1.1*
 	"
 

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

[James Le Cuirot]

commit:     1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 21:02:05 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:19:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1accda51

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

 dev-java/junit-addons/junit-addons-1.4-r1.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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 e657b2b..4df5fa1 100644
--- 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)" \
 		"${@}"
 }