Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/commons-betwixt: ChangeLog commons-betwixt-0.8.ebuild
Date: Wed, 20 Jun 2012 07:29:49
Message-Id: 20120620072938.9E04C2004B@flycatcher.gentoo.org
1 sera 12/06/20 07:29:38
2
3 Modified: ChangeLog commons-betwixt-0.8.ebuild
4 Log:
5 Use eclass src_test instead of custom one. Fixes test failures due to missing xerces deps in test classpath. #422457
6
7 (Portage version: 2.1.10.65/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.25 dev-java/commons-betwixt/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-betwixt/ChangeLog?rev=1.25&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-betwixt/ChangeLog?rev=1.25&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-betwixt/ChangeLog?r1=1.24&r2=1.25
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v
19 retrieving revision 1.24
20 retrieving revision 1.25
21 diff -u -r1.24 -r1.25
22 --- ChangeLog 20 Mar 2010 10:53:03 -0000 1.24
23 +++ ChangeLog 20 Jun 2012 07:29:38 -0000 1.25
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-java/commons-betwixt
26 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.24 2010/03/20 10:53:03 betelgeuse Exp $
28 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.25 2012/06/20 07:29:38 sera Exp $
30 +
31 + 20 Jun 2012; Ralph Sennhauser <sera@g.o> commons-betwixt-0.8.ebuild:
32 + Use eclass src_test instead of custom one. Fixes test failures due to missing
33 + xerces deps in test classpath. #422457
34
35 20 Mar 2010; Petteri Räty <betelgeuse@g.o>
36 -commons-betwixt-0.7-r1.ebuild, -commons-betwixt-0.7-r2.ebuild:
37
38
39
40 1.8 dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild?rev=1.8&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild?rev=1.8&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild?r1=1.7&r2=1.8
45
46 Index: commons-betwixt-0.8.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild,v
49 retrieving revision 1.7
50 retrieving revision 1.8
51 diff -u -r1.7 -r1.8
52 --- commons-betwixt-0.8.ebuild 9 Feb 2010 11:30:04 -0000 1.7
53 +++ commons-betwixt-0.8.ebuild 20 Jun 2012 07:29:38 -0000 1.8
54 @@ -1,6 +1,6 @@
55 -# Copyright 1999-2010 Gentoo Foundation
56 +# Copyright 1999-2012 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild,v 1.7 2010/02/09 11:30:04 pacho Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild,v 1.8 2012/06/20 07:29:38 sera Exp $
60
61 EAPI=2
62 JAVA_PKG_IUSE="doc test source"
63 @@ -24,7 +24,7 @@
64 DEPEND=">=virtual/jdk-1.4
65 ${COMMON_DEP}
66 test? (
67 - dev-java/ant-junit
68 + dev-java/ant-junit:0
69 >=dev-java/xerces-2.7:2
70 )"
71
72 @@ -40,9 +40,10 @@
73 epatch "${FILESDIR}/${PN}-0.8-test-dtd.patch"
74 }
75
76 +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},xerces-2"
77 +
78 src_test() {
79 - java-pkg_jar-from --into target/lib xerces-2,junit
80 - ANT_TASKS="ant-junit" eant test -DJunit.present=true
81 + java-pkg-2_src_test
82 }
83
84 src_install() {