summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-06-20 07:29:38 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-06-20 07:29:38 +0000
commita7e85e65c3feab261e3ff384004ff39eead29958 (patch)
tree15524575ce042b42cfe90f08b4621340d4be0d08 /dev-java/commons-betwixt
parentold (diff)
downloadhistorical-a7e85e65c3feab261e3ff384004ff39eead29958.tar.gz
historical-a7e85e65c3feab261e3ff384004ff39eead29958.tar.bz2
historical-a7e85e65c3feab261e3ff384004ff39eead29958.zip
Use eclass src_test instead of custom one. Fixes test failures due to missing xerces deps in test classpath. #422457
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'dev-java/commons-betwixt')
-rw-r--r--dev-java/commons-betwixt/ChangeLog8
-rw-r--r--dev-java/commons-betwixt/Manifest16
-rw-r--r--dev-java/commons-betwixt/commons-betwixt-0.8.ebuild11
3 files changed, 22 insertions, 13 deletions
diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index e3ae89ebf1f0..d64fa1eae403 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/commons-betwixt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.24 2010/03/20 10:53:03 betelgeuse Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.25 2012/06/20 07:29:38 sera Exp $
+
+ 20 Jun 2012; Ralph Sennhauser <sera@gentoo.org> commons-betwixt-0.8.ebuild:
+ Use eclass src_test instead of custom one. Fixes test failures due to missing
+ xerces deps in test classpath. #422457
20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org>
-commons-betwixt-0.7-r1.ebuild, -commons-betwixt-0.7-r2.ebuild:
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index 54de93a3dc97..9b35a3132701 100644
--- a/dev-java/commons-betwixt/Manifest
+++ b/dev-java/commons-betwixt/Manifest
@@ -5,13 +5,17 @@ AUX commons-betwixt-0.6-noget.patch 980 RMD160 4949187d6428dfc3798c8638cb709c8be
AUX commons-betwixt-0.7-notests.patch 1171 RMD160 16aaa9d2789e38196f4f2390712a205bd46229bb SHA1 f6f3f4c1950a08e848ec7f33903d322398bfdf34 SHA256 9531b8d4d3b0a6df887bbb661899236c3d6d0411459799c7f6838052cb8b0ac9
AUX commons-betwixt-0.8-test-dtd.patch 549 RMD160 b7ae30ababddf70e79585cc59e48e978e2cfd96d SHA1 5bc2d4400cbc8b0548dae987f887b7d779db3dcb SHA256 3a417a51dc2ee0822a4a579b1daec2b7876ee5ba334e005b890ca0c645b941e3
DIST commons-betwixt-0.8-src.tar.gz 359821 RMD160 9c71588cd1ca7475d798e45ecd870f0784bdc52f SHA1 95d2897da653cbe52a2f77961898732c05fc8dba SHA256 86db2d772c5ffe134a96a6d79410896ec7ec75ed6d8824b39a5be6d2df384af2
-EBUILD commons-betwixt-0.8.ebuild 1359 RMD160 2968b809d683cb2c7379c46f07ba4e8caa64f79d SHA1 47cef48b20143aad440b6fbc03cbfbaa542cc890 SHA256 72b67d98066ea803bf2b6e5d2591a35a7b5f45ad3684eab057df9530a15fd8a7
-MISC ChangeLog 3922 RMD160 d9710e2d272ad02ba9f592de4aab5a729a8c06ed SHA1 569768e0321038544547675622631c0fd7c31468 SHA256 654604678e536d45ba6c36b1faadb5bd3bf0b1278f3dacc4403f05654c8054ad
+EBUILD commons-betwixt-0.8.ebuild 1339 RMD160 1d2a6b4a0e2078a331e36caa0bc6670ddf8f75f8 SHA1 10cae741a8d810aff4f46f6960fcbca6cde7dd77 SHA256 64e03d9b9d4a049dc38258d4bf8069926e2850d9f6c05cd6b1897c5e2b320d57
+MISC ChangeLog 4116 RMD160 a5f561c57f5c32ba0ae8106168a0608ade427afb SHA1 02fe199ff735e4bfe54c28fa7d448343f287aeac SHA256 b25baac796659b965c7d6b507c2f17c2f2c4e6243cc303fc28c6e6b2f8a4189e
MISC metadata.xml 737 RMD160 b7634227bcc834bf0098f6d452e27d8e892bbdb1 SHA1 7c110757602c2388ed24c18cb469801a93c0143f SHA256 bfa7bd01e5bd7fabad8dbbef4ad43ec8c9afe870ddaa0f1ebc4c325800046d7b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkukqRQACgkQcxLzpIGCsLRIoACglcx7lPCzZP5bttx+MlhbSo/d
-xAMAoIU02ndoCgIFCMa1MfGk4pezczmF
-=I+NR
+iQEcBAEBAgAGBQJP4Xv6AAoJEIUJ+svaV163Nk4H/0crqZatSUaSgxZfkJVmvGOL
+JyjzDaONoYIAEnw48XTOyZtKF0mgM1yaJeA1CX52O1LjTQmBLjtcZqnzZ1wGSrIO
+CZlFLb+bucSKr7jZApdP5pZtGjcvR0rCxGSo2zMNES601xXsdFCnsnCcrXWH+Ki8
+N/kkXsguweMcH7573g4YYItmBXXR8ypn+xnaTIdopr3RPijcxlBLeusCxIgT2Sjo
+ygX2Sq+NwD/uVFgU3ZDtG9R6HWUeYL+TvFfeYc62cnoZ9Tl3ExKy9VdxyYF/qh5W
+hfSEHZPnFKAn+IcZr8K5TEquFbLEYSK3QQs0h0yl+eL0s7LOIN0qT2/fvUY31iA=
+=H+zK
-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
index ea78b9d15184..4f8b339eac01 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=2
JAVA_PKG_IUSE="doc test source"
@@ -24,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4
DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}
test? (
- dev-java/ant-junit
+ dev-java/ant-junit:0
>=dev-java/xerces-2.7:2
)"
@@ -40,9 +40,10 @@ java_prepare() {
epatch "${FILESDIR}/${PN}-0.8-test-dtd.patch"
}
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},xerces-2"
+
src_test() {
- java-pkg_jar-from --into target/lib xerces-2,junit
- ANT_TASKS="ant-junit" eant test -DJunit.present=true
+ java-pkg-2_src_test
}
src_install() {