restore test functionality when possible, stub out for later opencl fixes

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

3 files changed, 32 insertions, 35 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index b463f6f207de..ce685dc72981 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.145 2012/10/06 23:28:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.146 2012/10/08 23:17:21 zerochaos Exp $
+
+  08 Oct 2012; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r5.ebuild:
+  restore test functionality when possible, stub out for later opencl fixes
 
   06 Oct 2012; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r5.ebuild:
   restricting test per 437426, happy to add it back if it ever works right
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index e39ccf9dc628..c1e5a283f6e1 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -18,24 +18,24 @@ EBUILD johntheripper-1.7.9-r1.ebuild 5207 SHA256 e6edc0814d6a35c4b7e7feddfd06bf4
 EBUILD johntheripper-1.7.9-r2.ebuild 5344 SHA256 39e87b2ddd7f8c4d5aa2603761c2783a64d1b216d0021af53b81d503dc4e061d SHA512 cc4204dde8e6ccdec7476479a36ae5fb1df842972e0557052e08402c62d20b68efc045d917b39f6c437f583ef2a4a3e46585790062dd8a7c4441f491abd1b2f2 WHIRLPOOL 5f331813603a042be01034385f7433812546e915da8da219a72f814ce0bce7ee9850cd11facbc8fe9599e2c835fd2cae997b12a632e4733a12b043be28113c23
 EBUILD johntheripper-1.7.9-r3.ebuild 5280 SHA256 c5132eba337f0bfd7b6b3e51bef38e5383f38522e04622246b429bf3028aa6f5 SHA512 765cdcd244a8e042540db4f267bde0348de35eeccd70c5f8451a6fb1bf406fc3eea3837d3f7502d6163716664daae53d57cb2d10b6404d6ff9d07ca644d1ed1e WHIRLPOOL 4c3881962f691a3f96d88bee94778ca73d25eb742e530dcd25b6599139ef8043459350479a1c17e95a870b78a11337fa853af8ed3a73e5b65239eb557306566d
 EBUILD johntheripper-1.7.9-r4.ebuild 6129 SHA256 83858e9f54b2b376f7ef0c50742c15a854e7c75f4ad2761229886cb7d48910fe SHA512 422afe0e045c41ff28246843b262340b737e7bc88b82ab11caf80acfeeaed6b20b21e77103248abab62e17d318265e18c9efc622a9832550109c285d9f3306be WHIRLPOOL ad6ca8bbb2393a5666fbef8785d47cf200c1deb46c4079124e14fdf505ac70973ca9be01f5ba9131b6ea8f4f2a53b2c389680f1ae1238f919504b4144c91dc2a
-EBUILD johntheripper-1.7.9-r5.ebuild 6109 SHA256 b13eb5ce57afc63a51c9ac06816734c2675fa7199c8a66eeb2480bbe5c85c413 SHA512 30a116d5dec3c758233bd4f77302e48d90bee905bb170f491e91eb44051ce70456d3f5655ce7a8e87f6476a1f340452448ebe90005785609aac415954548e520 WHIRLPOOL 2df84f363eb905716da7dc04bdedea793c9780e6f5738910fe398e358a9ec81d4ad089540cbb0d9b65d65d5cbe85e035da2dc013637ce788088f900d0fb676bb
+EBUILD johntheripper-1.7.9-r5.ebuild 5779 SHA256 bf31917ff280dc5be753f1eee4b38c9e785d6ab23cd549397760c7bc0c94e040 SHA512 563d8551add61b31c0927b2a9afec0686f9468a3573647be6e7185154b61440141f4beba7deb6b5d92a1b78795226569c116bd5065d65fbb0deebc516206cb74 WHIRLPOOL 370d635ec702c4ed767bb1fb6b5115ea49c4fdd06a62512f638bf02001f0926fc0c40670d7f18415b0f61cbd8be2976fa53a832a4a15a153b1b0f3d1a9f2c5dc
 EBUILD johntheripper-1.7.9.ebuild 5154 SHA256 591d62091f1b13bab26d888cabaf680a1ff85367947244328ff22caf06d502c9 SHA512 d5cf9a32409fa70642403133a11b9d201c2c17e2958197a9bec7da3a1bbefb56e76de4ba35e65ec1b1588a1eb2f2a9e0bc0e24f61736ca791a5c3111bd9d1377 WHIRLPOOL d5b2033b553fa887df16e2b014406013fd4db509c7336e8b0b8b2d5c6562761df7ac8196af972e809f46d8253c3e504a16efb9e0d9c4cdea5d8d4df508a0068e
-MISC ChangeLog 24272 SHA256 595aa1a34364788f57196b466245e39fb7449df8732cfd00655846a5c87cbebf SHA512 4ea15a5227f3ea7b8e48de8b703080a4360c9b7ae209f6d3de81d530ee7f2866a0bbbd8bf746c896f86710a4cae4eea608b5bc54e95600e29bffc27ea9099aac WHIRLPOOL 30d74b7b6d61c74b03a1789be650fd35ab08f2c7ce1619dc44a882737527fa11b283d989bf7f5353621d1cbdece688dd06729490b7f07a0eb83f691d4e495871
+MISC ChangeLog 24430 SHA256 da8db9aeb78da5b6ea08d926756eea456e8c90a8e38f1a4f93da4a2ff1c82012 SHA512 e58f58d4c2a43d89eb5cd57ffbfcd483fdfaae0efbc23f11e3ee24d455176c4e87260033b0b0583ccd6956064ef7c9aa4b325819925fd3a720cac7368e6e0a90 WHIRLPOOL 8e14244687057edb3c1643726f8d4555acaf5b88387eb2a8b0920524dd2fddc3fbd32937ba7bb0ec77fbeda732d9ecdb21a1e170f54b782cf7a4ac2d75217e6d
 MISC metadata.xml 531 SHA256 bb4c0e9b5d1434c7873905469d1fa40f42db99babc475a08cf68d5d23d49d583 SHA512 357b9ab90cf72fb443cf98b0905f80adbd920d21c5b696c68a91f4936c7f8ced9895f1daeb74d813ddcc53d26c05cc82a9e83644c1f80afb8aad76bb1a7dd540 WHIRLPOOL e5497c9fbb9a8313d652b113a7d4090c4aadc45fb7b2ee87a7eca493a11b87b16194e094b956ac7142d94b58ddd9f72b90f405db4c9e5bc909c61be8698a4916
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQcL7KAAoJEKXdFCfdEflKh7wQAJgnZz9lmgGxst/lXpNnzqVx
-Dfu8PP+XUWrjw/kDQVfspNbzjeKZaKgu19IdnRhuiupZFd7o8JaEqgCLch2kwo8q
-h1DXj6fEMDh5DbNM7qJijQhjiAVjIK2ig7D3i4v+3vKu3WIsmbq/PnSDQdE+HBX9
-XRGlgqyD/XoDJWK7s3BqNkbsbnwRuZ+mEhua2qo1cZFpXVhy0Ei8bFJzxGcboob0
-RSf9OuRKhPpgc+5prOXtXfpmXrYqm7flvkIgnrE59xlIUC3AFY6JokNuTiaYidTQ
-qmgwVrFOavLRjztyZJvIPMn+r9Ws7eEXE0Gybkgb2RuwfYJ6FPNv9sW5TZ66geOd
-QsSkGb82CV0edax3vP8McxSixamlLd/2iT0o13Wdfj0DDHtJX8qchIIZ/AZybYwn
-DnsP2dpwh6u+aI1j0u7NtPdH9vcong1Ut8VcFhXNEb6KLLI65sFIwmpgMb0PGKUg
-pjewslF7IJwCFIlC1P4WvxYvsMdL2D1dQIwHfMsd5oGQ6SXmkNSf+NeOIW/b3nrL
-1j2ex30TP6yfF8XfN9GEpAelLYUQPSNo/l9J2hp8IQHk2h7WIAGKCJrqsMtY6jli
-3RtiNpTpHrOsk2PRvC2XWKf269iokGrwhxFnrIki0NApVC7sgId8KKDLZk7sth/M
-GeBQzwnVTDFf0A2NV1FQ
-=Hg60
+iQIcBAEBCgAGBQJQc19CAAoJEKXdFCfdEflKOCYP/AoJacnzN6ZgMHYktUQOiyDJ
+qf9bINSsq0WjkwE0/aTwEyE1IyC8/szqGKOsYhlQ0srq3HFcCM5DPRTrNvtjtU/3
+CDceIEJ5p9mqfXK8wraz/z9eVLaiM5ah+E84Pcy5L3HzAnlz40zkepyh1p13pcJm
+R9Dz/T7dbnCbEJe5sdKCE4fke3oOG4RyY9z7BOsSUOe93eyOF1ID7C58mmk150PL
+icSTyuY8Nxz5ILrCyQ4qfL9i5dpVAr0c8x5BOrRIpKXLDVWYF2YCimaFIsfAwv7m
+86tAN+QJENdTm2HcsVA2suNxjXpFtoo+Q0dG1QrSFRm2s/rztNUJ90Bdol1AtSqm
+2QTD3z3wSc93CRWXYMsC+yH29VAc89KjjZkNDiM0lQUzJUfYpQPxsF6QrRNwce77
++VsQA8BFbsFeW0gYc2RBZZyU8VTuwfqrxyO0FcQsOSYw/6KA0mnKunDUSuxJTCxW
+iTF+5YY9Qn2XUvLYOcutidkRgfY8x4pKcSmqSD7fOrRyXkVvV/O8/eFV6AUp3+bA
+m/vEl8o1QhWA/a4xqqKIB8RQRZTTLoPXeZfWAUtIDYzoT/dexBAEZXtcqdNdN5q+
+iqXRRtx0aznATaQSyNzdxbYF4SozJGZ4v+h3rINlcVaHmFSHmu92NNxlH3HXkUUP
+1/OfEw5/xBMStHo/mW3+
+=e6DB
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
index 373d5f29d57b..a595ecbb928b 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild,v 1.2 2012/10/06 23:28:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild,v 1.3 2012/10/08 23:17:21 zerochaos Exp $
 
 EAPI="4"
 
@@ -33,9 +33,6 @@ RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 	opencl? ( virtual/opencl )"
 DEPEND="${RDEPEND}"
 
-#per bug #437426
-RESTRICT="test"
-
 S="${WORKDIR}/${MY_P}"
 
 has_xop() {
@@ -193,21 +190,18 @@ src_compile() {
 		$(get_target)
 }
 
-#src_test() {
-#	cd run
-#	if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]] ; then
-		# This requires that MPI is actually 100% online on your system, which might not
-		# be the case, depending on which MPI implementation you are using.
-		#if use mpi; then
-		#	mpirun -np 2 ./john --test || die "self test failed"
-		#else
-
-#		pax-mark -mr john
-#		./john --test || die 'self test failed'
-#	else
-#		ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'"
-#	fi
-#}
+src_test() {
+	if use opencl; then
+		cp src/opencl/*.cl run/
+		cp src/opencl_*.h run/
+	fi
+	pax-mark -mr run/john
+	if use opencl || use cuda; then
+		ewarn "GPU tests fail, skipping all tests..."
+	else
+		make -C src/ check
+	fi
+}
 
 src_install() {
 	# executables