| 1 |
caster 10/04/05 23:42:08 |
| 2 |
|
| 3 |
Modified: ChangeLog dom4j-1.6.1-r3.ebuild |
| 4 |
Log: |
| 5 |
Actually enable tests execution, and remove a test that fails with 1.6 JDK, in order to stop depending on 1.5. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.52 dev-java/dom4j/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/dom4j/ChangeLog?rev=1.52&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/dom4j/ChangeLog?rev=1.52&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/dom4j/ChangeLog?r1=1.51&r2=1.52 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v |
| 18 |
retrieving revision 1.51 |
| 19 |
retrieving revision 1.52 |
| 20 |
diff -u -r1.51 -r1.52 |
| 21 |
--- ChangeLog 15 Jan 2010 17:36:13 -0000 1.51 |
| 22 |
+++ ChangeLog 5 Apr 2010 23:42:07 -0000 1.52 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-java/dom4j |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.51 2010/01/15 17:36:13 grobian Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.52 2010/04/05 23:42:07 caster Exp $ |
| 28 |
+ |
| 29 |
+ 05 Apr 2010; Vlastimil Babka <caster@g.o> dom4j-1.6.1-r3.ebuild: |
| 30 |
+ Actually enable tests execution, and remove a test that fails with 1.6 |
| 31 |
+ JDK, in order to stop depending on 1.5. |
| 32 |
|
| 33 |
15 Jan 2010; Fabian Groffen <grobian@g.o> dom4j-1.6.1-r3.ebuild: |
| 34 |
Marked ~x64-solaris |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.9 dev-java/dom4j/dom4j-1.6.1-r3.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild?rev=1.9&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild?rev=1.9&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild?r1=1.8&r2=1.9 |
| 43 |
|
| 44 |
Index: dom4j-1.6.1-r3.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild,v |
| 47 |
retrieving revision 1.8 |
| 48 |
retrieving revision 1.9 |
| 49 |
diff -u -r1.8 -r1.9 |
| 50 |
--- dom4j-1.6.1-r3.ebuild 15 Jan 2010 17:36:13 -0000 1.8 |
| 51 |
+++ dom4j-1.6.1-r3.ebuild 5 Apr 2010 23:42:07 -0000 1.9 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild,v 1.8 2010/01/15 17:36:13 grobian Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r3.ebuild,v 1.9 2010/04/05 23:42:07 caster Exp $ |
| 57 |
|
| 58 |
EAPI=1 |
| 59 |
JAVA_PKG_IUSE="doc source test" |
| 60 |
@@ -25,17 +25,19 @@ |
| 61 |
dev-java/xerces:2 |
| 62 |
>=dev-java/xsdlib-20050627-r2:0 |
| 63 |
dev-java/xml-commons-external:1.3" |
| 64 |
-# Should look into why the tests fail with other versions |
| 65 |
DEPEND=" |
| 66 |
- !test? ( >=virtual/jdk-1.4 ) |
| 67 |
+ >=virtual/jdk-1.4 |
| 68 |
test? ( |
| 69 |
- =virtual/jdk-1.5* |
| 70 |
dev-java/ant-junit:0 |
| 71 |
dev-java/xalan:0 |
| 72 |
dev-java/junitperf:0 |
| 73 |
) |
| 74 |
${RDEPEND}" |
| 75 |
|
| 76 |
+src_test() { |
| 77 |
+ java-pkg-2_src_test |
| 78 |
+} |
| 79 |
+ |
| 80 |
src_unpack() { |
| 81 |
unpack ${A} |
| 82 |
cd "${S}" |
| 83 |
@@ -45,6 +47,8 @@ |
| 84 |
|
| 85 |
# Needs X11 |
| 86 |
rm -v ./src/test/org/dom4j/bean/BeansTest.java || die |
| 87 |
+ # fails with a 1.6 JDK for some reason |
| 88 |
+ rm -v src/test/org/dom4j/io/StaxTest.java || die |
| 89 |
rm -v *.jar || die |
| 90 |
cd "${S}/lib" |
| 91 |
#circular deps with jaxen |
Archives