Fix test suite to find hamcrest-core. Fixes bug #320347.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/dev-java/jaffl/ChangeLog b/dev-java/jaffl/ChangeLog
index e2de5bad7d09b74e969ddb2a3b607491e51440c0..e6ef2fc6d07a803bdb84b37df4e05fb46a2b150d 100644 (file)
--- a/dev-java/jaffl/ChangeLog
+++ b/dev-java/jaffl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jaffl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.3 2010/06/03 11:24:59 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.4 2010/06/26 15:06:13 betelgeuse Exp $
+
+  26 Jun 2010; Petteri Räty <betelgeuse@gentoo.org> jaffl-0.5.1.ebuild:
+  Fix test suite to find hamcrest-core. Fixes bug #320347.
 
 *jaffl-0.5.1 (03 Jun 2010)
 

diff --git a/dev-java/jaffl/Manifest b/dev-java/jaffl/Manifest
index defd9a854328cf516fea758429fb46e027cf3058..ddd025d9738024d104c18e2202fcdd1fc41753f3 100644 (file)
--- a/dev-java/jaffl/Manifest
+++ b/dev-java/jaffl/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX library-path-0.5.1.patch 445 RMD160 c1c7ce9fb217bcf1be800b5cda7bb0a335f138c1 SHA1 4db6768f2f00fb206b903282a58dad49c99ea26d SHA256 c8d08190ac6b5161630019cdb9abfd90941dab3e7b52086eca21718890cef43e
 AUX library-path.patch 450 RMD160 7246c5b43aef0691973084baf858e693b10c955f SHA1 0d6e064309a5f19b53ee312252f4be50a0202f68 SHA256 b50c0160914c64a1657a9b5b7743f86656b0ad9706465b14ab60be58fa87ef68
 DIST jaffl-0.3.tar.bz2 339479 RMD160 0767e14a4a67fb0332c808056c1fcc3819f0fd31 SHA1 785edabb6fec13a7bab6465765e98fe6111d8d55 SHA256 cb488709821dfa40e9eb7bb90784d3752f6034b4f02a2fcb43a8890f55a0d199
 DIST jaffl-0.5.1.tar.gz 558817 RMD160 dfd8fefb0860ef73aa2549f3f18af526ab5abe3f SHA1 3fc6f6891f91f61346e4ec394e5c00f5d0f0485a SHA256 ba392468edcac21f8765dea717bede0cf3ce6488c85471ce1010e4f6973b034f
 EBUILD jaffl-0.3.ebuild 1686 RMD160 a0bda4f8cd2cb7678e247ecbb223188eb0411469 SHA1 be86a5b0038765c6ac167cf1900f44319df0426f SHA256 2d7ef87372751dd50fcef57180326f24c74b1928bfddf489eb49f79c38196ed1
-EBUILD jaffl-0.5.1.ebuild 2047 RMD160 0ee600078adf2b92cefc33c30c345fd41f3519b0 SHA1 39450ad7d09329702c27c7c3e8e7c4cec3345cc8 SHA256 4271217f8867c9912140ed47f55a36989a57687f6f7916de0b1be35879f86db3
-MISC ChangeLog 621 RMD160 d062bce567c59054ee4f80cb8b61f27d39834caa SHA1 59aa855d458e1526d2e66e8c1e99b4cf83c4a083 SHA256 a26f98827b26478f55773cbbe95bdc644251ec4330d9e6dfab586bdbabfdf0bc
+EBUILD jaffl-0.5.1.ebuild 2066 RMD160 ca716da96efef16c37eb82b8b4f51b24527ea152 SHA1 25340e8aec85a62585b88524dba3761ea9482463 SHA256 3a1f5eb1b3000b197070b1dee16423ed3656c3c2fa82a997e39986010db9f559
+MISC ChangeLog 756 RMD160 7a4307c153cf743f734ab55484520f2beb8f627a SHA1 db530def9f425d4f32bd923184edb9e17b52ccbb SHA256 7c0cef872b5dce77f8e59048d80453576c4c00737ea89d4a766c2fda5a044980
 MISC metadata.xml 337 RMD160 c7c7040a09f42c80109ab31aba457dc91d3f6bc3 SHA1 982e1815e53a308fa70121badac66cc9cd9b0ddf SHA256 daa9f1959687f12b9dc19fbaf5fa8d32086655d6b0b236e584efeb1c47eed341
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwmF7MACgkQcxLzpIGCsLTe/gCfS6FBAwJD5uCpncXPN6aio7v4
+VBwAnj1cfDNi/FaahhpmY4UOPgeoTJnK
+=9jb/
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jaffl/jaffl-0.5.1.ebuild b/dev-java/jaffl/jaffl-0.5.1.ebuild
index d5232e8c382b0956654c84ee5d5e2685311fc0c9..e10ba1edd6e3453ada9f6794f07eb899635f8268 100644 (file)
--- a/dev-java/jaffl/jaffl-0.5.1.ebuild
+++ b/dev-java/jaffl/jaffl-0.5.1.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/jaffl/jaffl-0.5.1.ebuild,v 1.1 2010/06/03 11:24:59 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.1.ebuild,v 1.2 2010/06/26 15:06:13 betelgeuse Exp $
 
 EAPI="2"
 
@@ -30,6 +30,7 @@ DEPEND=">=virtual/jdk-1.5
        test? (
                dev-java/junit:4
                dev-java/ant-junit4:0
+               dev-java/hamcrest-core:0
        )"
 
 src_unpack() {
@@ -66,8 +67,8 @@ src_install() {
 }
 
 src_test() {
-       java-pkg_jar-from --build-only --into lib/junit_4 junit-4 junit.jar junit-4.1.jar
        local paths="$(java-config -di jnr-x86asm,jffi-0.4):${S}/build"
        ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-               -Drun.jvmargs="-Djava.library.path=${paths}" ${EANT_EXTRA_ARGS}
+               -Drun.jvmargs="-Djava.library.path=${paths}" \
+               -Dlibs.junit_4.classpath="$(java-pkg_getjars junit-4,hamcrest-core)" ${EANT_EXTRA_ARGS}
 }