diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-04-05 23:42:07 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-05 23:42:07 +0000 |
| commit | 07b8334dcd76899ca0c72a5dfc9f3d75cff3c559 (patch) | |
| tree | 6b5af5dd6bb3939ada3fa654b7067223467357a7 /dev-java/dom4j | |
| parent | Bump to EAPI=3 (when needed), add prefix keywords (diff) | |
| download | historical-07b8334dcd76899ca0c72a5dfc9f3d75cff3c559.tar.gz historical-07b8334dcd76899ca0c72a5dfc9f3d75cff3c559.tar.bz2 historical-07b8334dcd76899ca0c72a5dfc9f3d75cff3c559.zip | |
Actually enable tests execution, and remove a test that fails with 1.6 JDK, in order to stop depending on 1.5.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-java/dom4j')
| -rw-r--r-- | dev-java/dom4j/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/dom4j/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/dom4j/dom4j-1.6.1-r3.ebuild | 12 |
3 files changed, 15 insertions, 7 deletions
diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog index c5a4aeb45e76..8be34c9c195f 100644 --- a/dev-java/dom4j/ChangeLog +++ b/dev-java/dom4j/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/dom4j # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.51 2010/01/15 17:36:13 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.52 2010/04/05 23:42:07 caster Exp $ + + 05 Apr 2010; Vlastimil Babka <caster@gentoo.org> dom4j-1.6.1-r3.ebuild: + Actually enable tests execution, and remove a test that fails with 1.6 + JDK, in order to stop depending on 1.5. 15 Jan 2010; Fabian Groffen <grobian@gentoo.org> dom4j-1.6.1-r3.ebuild: Marked ~x64-solaris diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest index 7bffde6e6087..0a8c40678684 100644 --- a/dev-java/dom4j/Manifest +++ b/dev-java/dom4j/Manifest @@ -1,6 +1,6 @@ DIST dom4j-1.6.1-java5.patch.bz2 2900 RMD160 cb153194e3b5d13626486d8f376b76f0925448c8 SHA1 468330fe079e8c1c13e935da18a49b10163dcb86 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d DIST dom4j-1.6.1.tar.gz 9687211 RMD160 d990d712a6b58c799366c526b32eb6c84a81e29c SHA1 8a2ab8af1dd039c449032ad50f3dd050647d7ce8 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f EBUILD dom4j-1.6.1-r2.ebuild 2119 RMD160 4b34ec4e608a147e4b506ffb2523b2d660b733b5 SHA1 15c388350d63b3ac0ded920bb48c3473e742f6d9 SHA256 629422623b31b4e3b97c213c8be6367525643d716803838e1ab2864873647b35 -EBUILD dom4j-1.6.1-r3.ebuild 2055 RMD160 e080374ffbb0a8fdb43284a815cdbc0e8874ad0b SHA1 f69e8ed8bcc9e5dad6d951a85ab3c35e88fe2d57 SHA256 57410e438d3c12a906c98e122a9eb6e1fa7d57ce7afbf81f939b4b8ae62aff32 -MISC ChangeLog 5971 RMD160 a2f0befe4f9cc8d9c6a51d75c0b056ae7eeba8c5 SHA1 39d9b556cf517ecc13e429e264b91b3f0e9fd723 SHA256 41ece8809fde3dd4e5156c0d80fa46b8b3c11ab40c8746a038a52371e11a7457 +EBUILD dom4j-1.6.1-r3.ebuild 2092 RMD160 c05330b3d5074c2f81034cc228038f50ed39b5f3 SHA1 34bbf933187bcb0eddb10c0b2205258d56b95001 SHA256 f50c7d5bb9f282d3138f91c1f1c23954f393aee70273cff7a86ec51fd2547c8c +MISC ChangeLog 6160 RMD160 4b310582eb3f5ddcf8733652001d27a7dd6bd161 SHA1 841820941ba7b0ef00401773620093ab7da9d9ae SHA256 81521becbd0bff054ff8dd972f2e1b7352929373ebfd7847ada9be4987ac22e1 MISC metadata.xml 376 RMD160 ab4f5ef01e92c40a24cc41a50e56948c5454ed3e SHA1 96b1c474f7dc9fe9915f6d58dd4ec1be2badb82f SHA256 1b7f4f99476e5a8b0f24104d0bd3d6c717ee3a32011851d32a8d3f5674e5d2c4 diff --git a/dev-java/dom4j/dom4j-1.6.1-r3.ebuild b/dev-java/dom4j/dom4j-1.6.1-r3.ebuild index 61428ddeee80..28253fae090a 100644 --- a/dev-java/dom4j/dom4j-1.6.1-r3.ebuild +++ b/dev-java/dom4j/dom4j-1.6.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=1 JAVA_PKG_IUSE="doc source test" @@ -25,17 +25,19 @@ RDEPEND=">=virtual/jre-1.4 dev-java/xerces:2 >=dev-java/xsdlib-20050627-r2:0 dev-java/xml-commons-external:1.3" -# Should look into why the tests fail with other versions DEPEND=" - !test? ( >=virtual/jdk-1.4 ) + >=virtual/jdk-1.4 test? ( - =virtual/jdk-1.5* dev-java/ant-junit:0 dev-java/xalan:0 dev-java/junitperf:0 ) ${RDEPEND}" +src_test() { + java-pkg-2_src_test +} + src_unpack() { unpack ${A} cd "${S}" @@ -45,6 +47,8 @@ src_unpack() { # Needs X11 rm -v ./src/test/org/dom4j/bean/BeansTest.java || die + # fails with a 1.6 JDK for some reason + rm -v src/test/org/dom4j/io/StaxTest.java || die rm -v *.jar || die cd "${S}/lib" #circular deps with jaxen |