1 |
commit: 1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 29 21:02:05 2015 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 29 21:19:56 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1accda51 |
7 |
|
8 |
dev-java/junit-addons: Fix the jdom-1.0 reference that wltjr missed |
9 |
|
10 |
Also apply proper SLOT dependencies and change the src_unpack to |
11 |
java_prepare. |
12 |
|
13 |
Package-Manager: portage-2.2.20.1 |
14 |
|
15 |
dev-java/junit-addons/junit-addons-1.4-r1.ebuild | 14 ++++++-------- |
16 |
1 file changed, 6 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild |
19 |
index e657b2b..4df5fa1 100644 |
20 |
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild |
21 |
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2014 Gentoo Foundation |
24 |
+# Copyright 1999-2015 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
# $Id$ |
27 |
|
28 |
@@ -17,10 +17,10 @@ SLOT="0" |
29 |
KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos" |
30 |
|
31 |
COMMON_DEP=" |
32 |
- =dev-java/junit-3.8* |
33 |
- dev-java/ant-core |
34 |
+ dev-java/junit:0 |
35 |
+ dev-java/ant-core:0 |
36 |
dev-java/jdom:0 |
37 |
- =dev-java/jaxen-1.1* |
38 |
+ dev-java/jaxen:1.1 |
39 |
" |
40 |
|
41 |
RDEPEND=">=virtual/jre-1.4 |
42 |
@@ -29,9 +29,7 @@ DEPEND=">=virtual/jdk-1.4 |
43 |
app-arch/unzip |
44 |
${COMMON_DEP}" |
45 |
|
46 |
-src_unpack() { |
47 |
- unpack ${A} |
48 |
- cd "${S}" |
49 |
+java_prepare() { |
50 |
unpack ./src.jar |
51 |
rm -v *.jar || die |
52 |
# Not included so taken from cvs |
53 |
@@ -43,7 +41,7 @@ _eant() { |
54 |
eant \ |
55 |
-Djunit.jar="$(java-pkg_getjar junit junit.jar)" \ |
56 |
-Dant.jar="$(java-pkg_getjar ant-core ant.jar)" \ |
57 |
- -Djdom.jar="$(java-pkg_getjar jdom-1.0 jdom.jar)" \ |
58 |
+ -Djdom.jar="$(java-pkg_getjar jdom jdom.jar)" \ |
59 |
-Djaxen.jar="$(java-pkg_getjar jaxen-1.1 jaxen.jar)" \ |
60 |
"${@}" |
61 |
} |