minor updates and fixes for tests (which still don't pass)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 29 insertions, 26 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index e4c5e46e6abe..9e1c73b1b3ab 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.91 2014/04/25 16:48:54 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.92 2014/04/28 16:37:39 zerochaos Exp $
+
+  28 Apr 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild:
+  minor updates and fixes for tests (which still don't pass)
 
   25 Apr 2014; Rick Farina <zerochaos@gentoo.org> +files/bug-8792.patch,
   metasploit-9999.ebuild:
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 639b7cb9e5fb..51ab62490974 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -19,23 +19,23 @@ DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f8
 DIST framework-4.9.2.tar.bz2 36150330 SHA256 0371cbaf5d5f7c66e3e8eb5cc7ee10ffeb043a2c2622550a5d79852b4a09777d SHA512 5b5c89b0f81ac551bb6b7f78eee322aa149a16df9f56696ec9c8df2ca68b7f9d09203d073f71fe97422e1e2c85755295fe53a0e07169ef52d39ccbbf92008c0d WHIRLPOOL 01627530a2e62fec41bb0e5201f1defdf37b1648f890048e2f44f870aed34ddbb4749a85066f1397d2fbc309fe8400604122fabb1ebdac761b8b458fd69da4ef
 EBUILD metasploit-2.7.ebuild 1448 SHA256 4e186ca7e1133568ae38e62584b86600cfc65c7b7bec691b85418151901ea984 SHA512 a31c2dfc5a32eabad32dd50ba9a82a75b35661c81b039a284a14d0ecc0ae2ebae46c29f7e6dd6f30b2671f0509f3ef1a7045c6537d626832eac375d0cb8325a1 WHIRLPOOL ff86aadb12002ea6d2f050927c087ba436b3362d64d0cd2b0785ae727349ae12f010eba7e7e572831e9d95c217d93abc2ecc9862061feada26e823987560d7be
 EBUILD metasploit-4.9.2-r2.ebuild 10056 SHA256 2eba0a62b91f9778caa029307bb0b0bedeb4dac38bb5abc7fa6f091ed010b79f SHA512 2d95f8d2492e757d8024c7a8758ca800b1b4a53cca2631d1e2fd654dcd1fbf5386d6a389e833b5c95079e2c1e21a85ff69a20f0c53b0e0226835bcb33c0363ab WHIRLPOOL af8821953e198a8585f6f8720fa92c73fe04bc00b99df2575571eb087ceead215798bab97c7de8a16073c682fe403ebb05796627d284adaf5bb33d2aeb6f16ce
-EBUILD metasploit-9999.ebuild 10196 SHA256 51456dd7dd8b158405ad99dc0ffbc1f079c6257ce105b7ff144b0e5601241124 SHA512 6a382b82dfae6b8b18ff58fac9647b9e2724b30cbbf233ec27f5e07269ff8057994221667df9ad3000b3a01883a8798d1e1054a7b2882b9b264dc8479e6037c4 WHIRLPOOL bd6764fa81d17f0c852cc421737fc761fab3390b0115deb270b5c3477d2e9b9b03fba5d34847511805dc4cf4dbd5f824080624af737841b4ae29dad215390efb
-MISC ChangeLog 16134 SHA256 0b8320681632c3aea27903b927870277a0c238b5573ab7a909b93b9169b6d0be SHA512 21585fd8569a2fadfb91ea8a913a0159c281d8a3bf73d0dfd0b16f8dd9a861a4fe80888bcbd83a8700d1b741a8487863bc3dcf72e0cac0ffaceee880b107df2a WHIRLPOOL ca2315f3da126de1fd7e811fa39b99eb78e750d1d6c71925d8d6f7acc1e7185cf1c69175123621781d7e189b313e0174ec99726a0fe4d46f4c07402d3d76b035
+EBUILD metasploit-9999.ebuild 10241 SHA256 3ab275b532680bdc14af2b5d3b789c270ca795d7f274e4b116f58dc9e5ec6e84 SHA512 c921be5f472664ebfcb0e3a0a8076315e0c62c0a672d2b10418d538d8946c4b56ad32eacc92851aeb21cae2cadcc7cfc9d2983ba98d0c0e87aa2db9e036ffa8b WHIRLPOOL ded831eff2198a7bcb9944b738341a995707c3ceae9adc0e6f9718a1014597a7565d8331a0caf4f5a89e5392a583d394d88c9354535a09d6eeb042934562a229
+MISC ChangeLog 16270 SHA256 2cd2388264aabc8366e9cec6b2a7657dbe7fb77e3994e0534e690d50cdbed350 SHA512 ca69f4214525c75ef8db7f21e9761c2dbbccccf3f6de1c9263ed1a0c1a20c773ba89721c75f599751f47b783312673cf9b0c77591614aaa9bb61c089de18c08f WHIRLPOOL c384db75f7e61f052c68bbbcbefbefbbae8acb6cb44f22e6b5eaa65938ed6aa6b605fe91710af225ccc8e48caf14b25103d42c4564ccdaaba8d7cd88f3a353a3
 MISC metadata.xml 648 SHA256 f7220754018805378926741b975a9eb32101e606d6b06081718ab0111c161b5f SHA512 924cfb15b02a0437c832f82bf9ec76ba5d3d013f6b02d99e089bb36c8772c9f92d93c7b83f180ec8b782384e4135b55b984267e76342b319e6ebbeb0f54d5f0d WHIRLPOOL 7fb28d2784bf7800e24bf6d8679e1792127b6797864d45467e9b2a65ae923068dc354596145c699f7dbe2a25494b6278a68c08a2264ac6a03ae45279d4e0b4a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTWpKFAAoJEKXdFCfdEflK6DoP/1IZTSwFAs0/l4iizlsSkqAh
-NtkE8c8CiW2EDp1hrU8il0vRGNRQEOk5fxfvC0yJpcvh+GXw0/GXdz14YBJIW1KW
-YBoxRU6Qs2kr7RF4QW5lGg1DMqi07/v1i2aIKkX6ygnuCstAa8sV4sn14Ezv+8Jm
-dsCnAn4yGwP9WxAK/iZF5+JVCjLLabAbYYjeQwGBfUQBBvZxNVeIybudVM7L/m9g
-c1OBoOc50qHei+t28vYypYsUss3nvOMcXK72hTSxz6TYplUZSr83RoUlBm4ZrWq+
-6kQMxXDJAusm9I/BEtK7kKOukq5ZSeavSLU63imP6uV15ojJdD9MlTUGuZC6diNS
-nsm2asFrzSGSXvx8GS3ZBYcWi88O2XM/UE1ctH2qzt0Pfs9MzQjeNu5dVDyM5i1V
-HOrtazyOxqCudNHXa5Pto7faFlV3c05I6cHRkt0uOlOiA6Wseps2p136+TRCzTO6
-5SSx0FyZRYrpXIU1FqMxeS0/D0jNvKTza9aIL5xmkg31PJ5KOHMkLfbPuBUgg2PS
-XvFf8eMSpcdITBdgZqqsvo6IuR6MWjeZJfFF63PSKX2vvU2nR30gZNMet8Ig2QGv
-UUXsFm+dNoSXo6SFI8JglmGmsmNgK8ahuNw6UztA4O15crLAnoVddXN7xyXo4Ewl
-OViKNiR9c0GYbR6mffhN
-=WAhi
+iQIcBAEBCgAGBQJTXoRrAAoJEKXdFCfdEflKjCUP/RICszroOhNDMKkmgJQCbyTY
+MhUHgQwI9sXWu+Vis9q9pq/XcvNacfbxSxApB1EqaxRiLpFKxMPMsxDHWKbsVia8
+gBWP8F6ObfRbx83lgxNbsAMnt9zX3uJETkMyO0xWtM5JxIOKKJpW1NNcCzLYRlTP
+4bqZewYX14vbelkgThn97T2/pQgSFZFs6HKMYfhIEVLFHKt6Kzp3aUS0kwrmVbmv
+EnO0KDPE9yv0WwIdcmU5tZowx1JUNiESvjr4cKeDTiuGGBDzzUHKc/X2OnchGcXJ
+aXcjhBJNsFcwCPjfocEPfn4Yj0Hyqg4kuAZDo1B2a8wVwRfK0oSKOdmOTllBQzTC
+sbEkIOXay8wJXnLLQgZOsy+pRwGvn4EIg1cEVRoPgB/m0fn/zlvcW23qqMIrGlxB
+HWiH5JHPWBEIVGSXzNi8fKKBs7dTspat8clrTghGtouV1ZiavpKEu2qCTl3fxMX8
+aOvvng7/1chRYNsdu2GnYPC6wwaIjOsPUqlFcf24VjmeucmZc0JqFgNo+5B+JAN3
+9mVD3dxO/LLJBjtJCRGy4psynT7l6TQjDBrvuHmbj0k4wrRjwlRViPsg0wzTZHNy
+OVO0YRR1sYk3AkK5DWF9JezV6oAGILDUj7kpJuOIMZs8eQRbku+PcuS/80CYS1je
+EjrLBBhtJMoUhjCygJfB
+=p3Ml
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 5ffefc35af2b..032b8134ce9e 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.22 2014/04/25 16:48:54 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.23 2014/04/28 16:37:38 zerochaos Exp $
 
 EAPI="5"
 
@@ -206,24 +206,24 @@ each_ruby_prepare() {
 each_ruby_test() {
 	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
 
-	# https://dev.metasploit.com/redmine/issues/8425
-	${RUBY} -S rake db:create || die
-	${RUBY} -S rake db:migrate || die
-
 	#we bogart msfupdate so no point in trying to test it
 	rm spec/msfupdate_spec.rb || die
 	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb
+	rm spec/tools/virustotal_spec.rb || die
 
-	RAILS_ENV=test MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S rake spec || die
+	# https://dev.metasploit.com/redmine/issues/8425
+	${RUBY} -S bundle exec rake db:create || die
+	${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S bundle exec rake  || die
 	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
 }
 
 each_ruby_install() {
 	#Tests have already been run, we don't need this stuff
-	rm -r spec
-	rm -r test
-	rm Gemfile.lock
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
 
 	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
 	# should be as simple as copying everything into the target...