Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/rome/
Date: Tue, 29 Sep 2015 21:20:33
Message-Id: 1443561597.de974d1d6946cfa95795d3c9ef54488f298ea8e6.chewi@gentoo
1 commit: de974d1d6946cfa95795d3c9ef54488f298ea8e6
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 29 21:11:11 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 29 21:19:57 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de974d1d
7
8 dev-java/rome: Fix the jdom-1.0 reference that wltjr missed
9
10 Also change the src_unpack to java_prepare and use classpath rewriting
11 to avoid explicit dependency on junit.
12
13 Package-Manager: portage-2.2.20.1
14
15 dev-java/rome/rome-0.9-r1.ebuild | 19 ++++++++-----------
16 1 file changed, 8 insertions(+), 11 deletions(-)
17
18 diff --git a/dev-java/rome/rome-0.9-r1.ebuild b/dev-java/rome/rome-0.9-r1.ebuild
19 index cb20ae0..30702d2 100644
20 --- a/dev-java/rome/rome-0.9-r1.ebuild
21 +++ b/dev-java/rome/rome-0.9-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 @@ -20,22 +20,20 @@ IUSE=""
29 COMMON_DEPEND="dev-java/jdom:0"
30 DEPEND=">=virtual/jdk-1.4
31 app-arch/unzip
32 - test? ( dev-java/ant-junit )
33 + test? ( dev-java/ant-junit:0 )
34 ${COMMON_DEPEND}"
35 RDEPEND=">=virtual/jre-1.4
36 ${COMMON_DEPEND}"
37
38 -src_unpack() {
39 - unpack ${A}
40 - cd "${S}"
41 +JAVA_ANT_REWRITE_CLASSPATH="true"
42 +EANT_GENTOO_CLASSPATH="jdom"
43
44 +java_prepare() {
45 # Patch build.xml so the tests pass
46 epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
47
48 - # Symlink jars
49 - mkdir -p target/lib
50 - cd target/lib
51 - java-pkg_jar-from jdom-1.0
52 + # Keep Ant happy.
53 + mkdir -p target/lib || die
54 }
55
56 src_install() {
57 @@ -46,6 +44,5 @@ src_install() {
58 }
59
60 src_test() {
61 - java-pkg_jar-from --into target/lib junit
62 - ANT_TASKS="ant-junit" eant test
63 + java-pkg-2_src_test
64 }