tests are running. failing miserably, but running

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

3 files changed, 34 insertions, 24 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 297823e80156..f6fd6bc99cc8 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.88 2014/04/17 18:14:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.89 2014/04/21 18:57:45 zerochaos Exp $
+
+  21 Apr 2014; Rick Farina <zerochaos@gentoo.org> metasploit-9999.ebuild:
+  tests are running. failing miserably, but running
 
   17 Apr 2014; Rick Farina <zerochaos@gentoo.org> metasploit-4.9.2-r1.ebuild,
   metasploit-9999.ebuild:
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index f97dd6d44341..3c26bff22719 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -18,23 +18,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-r1.ebuild 9940 SHA256 b37047fe1bbabc99d8b19aa1b2c89331ce1615612dc8be1f41a4d96b3eb5e566 SHA512 8db56fbf4386c4aa4d9d382440da2be47849f260edde399a9862101fd54b3c2a1bb86136b784b12869d468f52d56fea0d3b699f446d1b059e43408ee0a40e3fc WHIRLPOOL c7192697ec366598e3cfc8b16a9af4d94233fd24983a1dd984938feea3d0bfc50cfb1c5a2b431b5116b851c6910245fdbf506cba6343701f2fdfd91756930551
-EBUILD metasploit-9999.ebuild 9968 SHA256 a814df20f45f61cd6fb6c2bed9733504e361f72f29a4cb81ea7a60c7c6345464 SHA512 2015865b97e9559e4caf84276f0359075f8de0d9b8f19dd2dea7a6ac677e6a5eae8c2feca2ac207eab7db32d3101484fc95529070e7be1d6909ea8d256f3dbf4 WHIRLPOOL 5fcd140f2586c76c8bab81e63a60900e91b367bcc6b0a58b548e8e51b7f46aace67c1183df083ffcb9c910f12f53f48a2ab633759d920a128c37503f308d50ee
-MISC ChangeLog 15639 SHA256 b3daa23280efdb0041ab3be392f87ad38d303788c0990a2e3c1cfa3df9b61a6f SHA512 2a6c576058acb35b3c3c706a9cbac570e2696ea737958cc56ca9539fead1f2c7a90d978dfdec3a139a835e5f3b1924ad7b1399d13445dccd40962f98c5e7e555 WHIRLPOOL a0cb7f1a606e56cc65ef6a1afda3a04a2e1cdd60005a21afdb359ed78dcf18cf366f7e99928e8fdc86eb270f4a4614c019c242293543a4780477e5bfb01032da
+EBUILD metasploit-9999.ebuild 10072 SHA256 4a8cdd01a791cae16b275e1e9f4f739f6f426cf64aa518220af3a9bc5b230c00 SHA512 b59a8f8b02f9e94026af56158cc5142414b755dffc0928ec8cecfcb6814d749cabdd7da2cecea4c1ffbdd7ba20206b43937cd09a0ab6488b3719d7b224b0155f WHIRLPOOL a1ae75434f45e4ef47c49e9c54364b30f3b14386852cef5e9fdbf0b7e051a1346c8659edba6921f93953b835a0cf05f30869aad61bc64bfaab8b17fd79e26970
+MISC ChangeLog 15766 SHA256 9fbfe7a813c27a393a6dbb0abf9ea58de501dd63a6e7c21a7fe8756ce51d56bb SHA512 335bb9ff1fd870b33ecedd3c9a7570b4b5d6dab4c80be69df803b268050d0557c068a5b537f4e6098f4c2bddbe5189826f1d929ad7160d7b6a72e9ed5bd07083 WHIRLPOOL 59ea9aa30cd5281a28666427446e52c889dd5d32177a97beb3eb385bf2f5adcf665074be3af21bc6e7e72b22c5404314de2e7a8bcfceb7ba93c0bdb990e761eb
 MISC metadata.xml 648 SHA256 f7220754018805378926741b975a9eb32101e606d6b06081718ab0111c161b5f SHA512 924cfb15b02a0437c832f82bf9ec76ba5d3d013f6b02d99e089bb36c8772c9f92d93c7b83f180ec8b782384e4135b55b984267e76342b319e6ebbeb0f54d5f0d WHIRLPOOL 7fb28d2784bf7800e24bf6d8679e1792127b6797864d45467e9b2a65ae923068dc354596145c699f7dbe2a25494b6278a68c08a2264ac6a03ae45279d4e0b4a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTUBpuAAoJEKXdFCfdEflK+k0QAI1WwEX0D0QC9reJFv/Eot1s
-hjxG9ytpVmIMLhvBGbWEgp3lDo3QjamywtMcKsCZHtwG8Ejqtp5YDn6N/TKJzS0j
-f01vj49T55HR9FF5jqpuHaWEK6JrHx5e4X9aUsIohxboOnQhi/AdYQGeN7bfE9bJ
-mhK8I9Hagy8hxvdAgal5tzTm2lbtWTWEjg2T6EIiW+X5XuNyHUmhSiRyyiXc1omQ
-7s4be4j/lkluXlRdEVwjvVEXg66qesUqGNnAAszj8PYSPuHrBG+aKdRrE6bhbEvA
-gvEKzeQqNX+Zl11jFMdMlZM5oah1t3OeO2xPE/SExrQeF9V0W8/mlmtAlJWY+fR7
-J5IrzW3Dd9tJgVM8MikKf974X9pY4pdgalbD+hz6Z/nGLSJmeaelOhIeRUXhC/FS
-BtwhRBvSVsvu3Ci2FRfy6wXDEI9KwtKCTq69FdVJa093d4b63ic+kNOIXAlKzUcX
-tNFLHFzDz7KufinDImj/DOj9qeIHghROGig2FCD4gxrG8bkd+urVzEePPFwx41a5
-ER0bM94tBLaxhAtz7TVyTA223druS+wd+iWNFx7I7zeakaTEErXqRQ3ILzMZNaD6
-m56pKAlEWePRg6kgkLBGt6cm/EOMFbTtJRZvzAqXdBOuaFa7xaWqIxFEhZh9L0pN
-RzatiY45hOaH5mznyPo7
-=K4yq
+iQIcBAEBCgAGBQJTVWqzAAoJEKXdFCfdEflKSgQQAI0JCful3n+8Y07Gxo33i2u8
+YeSH3rzjvsdPDCpY92xXaSRdr8u4X9rBLN9GixcTDLe9hlf9nwMZ6ydhhLY97Np1
+qC9s/i0FvHOqACENCPCSPdSDGCwkrMDwvmFyTM+GVprj83vBLk4gZZF/4HJQOGCg
+nTNG/glZjnIHoZZE60g2cp4n4YkhD2t8BLjrIFBSS6359cEIaDoo1enfMQAiP1E7
+pmiZC3iTEXDyjg0ArqLs0R+rwTL01hVsE+WaefA6mbb/kYFjij0YMIXYcS9Esjcf
+KNRZbaPxRXGsu4WE5GTDbuH20zjX7l7Ad4AA7UhLgjtFnErMdxM7lkB+NpbPlZkR
+ONovsmZDTXBJOE60PqC9wgvr6ldec/NIu9ccvwNFiPSQF7CQtKn/bAwcDfiGR0aG
+XUe5Y5wZ66DoSQMpgoMIo99+mOqehGQX4hmDGUdTnVNfveLo8VhrxQkcap+qPUVU
+uYP4BdFqxV0oRQv4Et07tdCZVnqqEvEEJ8uv/rjPvcWpfP/zb5AP8iPQVgueN5Mb
+0bwT9mEMwcCrUOU1/hMXLTRIKlNZRRxm5rsATq5mWeDNi0HelwcZOck7Veq7Va73
+ZPuOjYbzexkqB5X0xkKwQ2r1tOlUWf4BQa46AkNVC+w9AxP0yvgukMc1l5HxYf44
+4MQOgWyRrdOirhXvkcAT
+=13U/
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 0807f04c769c..299cdde1c9d2 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.20 2014/04/17 18:14:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.21 2014/04/21 18:57:45 zerochaos Exp $
 
 EAPI="5"
 
@@ -51,17 +51,19 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	pcap? ( dev-ruby/pcaprub
 		dev-ruby/network_interface )
 	dev-ruby/bundler
-	development? ( dev-ruby/redcarpet
+	development? ( dev-ruby/fivemat
+			dev-ruby/redcarpet
 			dev-ruby/yard
-			dev-ruby/rake
+			>=dev-ruby/rake-10.0.0
 			>=dev-ruby/factory_girl-4.1.0 )"
 ruby_add_bdepend "${RUBY_COMMON_DEPEND}
 		test? ( >=dev-ruby/factory_girl-4.1.0
-		dev-ruby/database_cleaner
-		>=dev-ruby/rspec-2.12
-		dev-ruby/shoulda-matchers
-		dev-ruby/timecop )"
-		#>=dev-ruby/rake-10.0.0[ruby_targets_ruby19] re-add when in gentoo. I'm not allowed to add it :-(
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
 ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
 
 COMMON_DEPEND="dev-db/postgresql-server
@@ -204,7 +206,12 @@ each_ruby_prepare() {
 each_ruby_test() {
 	#rake --trace spec || die
 	# 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
+
 	RAILS_ENV=test MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S rake spec || die
 	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
 }