cleanup old, fix bug #507816 by pinning deps properly in Gemfile

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

7 files changed, 33 insertions, 400 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index ebad8e6096d8..9676f3b1c1ba 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.86 2014/04/13 04:23:44 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.87 2014/04/17 18:09:16 zerochaos Exp $
+
+*metasploit-4.9.2-r1 (17 Apr 2014)
+
+  17 Apr 2014; Rick Farina <zerochaos@gentoo.org> +metasploit-4.9.2-r1.ebuild,
+  -metasploit-4.4.0-r1.ebuild, -metasploit-4.8.2-r1.ebuild,
+  -metasploit-4.9.2.ebuild, metadata.xml, metasploit-9999.ebuild:
+  cleanup old, fix bug #507816 by pinning deps properly in Gemfile
 
   13 Apr 2014; Rick Farina <zerochaos@gentoo.org> metasploit-4.9.2.ebuild,
   metasploit-9999.ebuild:
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 4f68f73c9fb1..08add9ffbae6 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -15,30 +15,26 @@ AUX msfrpcd-4.4-initd 638 SHA256 4e3f18ab619a0067c7ac9a9f13d6824496cb36adf20c216
 AUX msfweb.confd 273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720662abe9f4460 SHA512 58481d69f99bec1644188ecb5f67249c3c85c12ae65d46643c3daf42b5221f8d1b025ea318ed6d11557cbc16e50acc5eaabb99162d538518265755ebcdb042ab WHIRLPOOL 1cbb5a5ff20eb90f7db6f5523bf8834cfd5aa2c98e378408e418f388993af661273257112db2ebcd950bfa9243e9f19ba4a5262fd2bccc7cc6276658f86115bb
 AUX msfweb.initd 533 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c SHA512 ec8eb9c09191d273417174c23d2fb1a3d27939a74b010fa33ca696bcce88e9c81d6cc1e6ebff90ea97cb6d730776364de4560db1bed10516ba4a7030e7233a53 WHIRLPOOL dec6ca3cf45ac4e6cea35266df1342b4dcdb3f813dc90820603f23e9d62ee67a9633de17d747cc12d7cb9c982e8868559896c2f8c42540a5005f485045d9730a
 DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f SHA512 a65740c81e6c711e6661170ec0dd87919cad6c4aa3aaac08fdaa72b4825be4bea28ec09c78f818ddab7660f5b485b13f87e3175b43c625319ce89b044a40f2a0 WHIRLPOOL f309608e30488484b24555fec84e65ed0dcbeba62a69e6ec23c507dbc0fcf720551a795e2a0793886fcd38d3a9b160819c864720155f58f274577b0246f05946
-DIST framework-4.4.0.tar.bz2 148529027 SHA256 ddcc7890a394d8154120a163c90b11119a0322b62d937ad1a3a14ef3fe6cf74e SHA512 dffa5dd36904d4963d0fd240f1796d43824f7df011f91d75a41f0d0ff20d942fc8a3d10495c1a0537df5b455ad7055760743e5022d742e5321b679b2d4c003df WHIRLPOOL ee0fa85a83965f75213e60aaf0174b1962841e8f10193be1cd6bea1aff561f80471c4d8892a07e65ad767587e73c4445b88149460cc5bc5509b5b096f2375b52
-DIST framework-4.8.2.tar.bz2 35964128 SHA256 7678fce2b22ff824f48244f52fdb27a2a7823d7332f2a75e4c670ccfa5aa6471 SHA512 6a9a8b5704c3331bd7fa4b004f234ee7b9d7ad93b244b44a3184810b97bdfd0ede17a044c3a6f63ef3fe02f9845c85dd82b3da46dba5633724b9784adafe3d71 WHIRLPOOL a5e2d0d995dc3401aab851b3ce3c1b0e0945bf6b5b7921575056ee7398203728ceb2dfa88cb8106276271fbde2c3ef01ae780bf3af4adb7fdab22b709c72dfe6
 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.4.0-r1.ebuild 6023 SHA256 d3b9ba91f0572d07cf9e858e5a51f4d40d14d019ab1485ecdc186dd46b0a87db SHA512 73f1a07b35cc9e83082c7998d44422f80c02ca34a06664d0cd8b486dfac9ae6a4d2d3a7158c6eedc1713487d9ec1cac79ebc1acc1d3d30723381b871b120e8f1 WHIRLPOOL 18074f28e2fe33960df766ba9f48cef00caaef64b631d651d0bb07f40f461a7388e2637d8d35f515ed8dbf11d96c626d1912762593cf9f25d0d067550d2edf05
-EBUILD metasploit-4.8.2-r1.ebuild 9181 SHA256 0d871765c984ad403c9f9fc9e582c9d4e1d4485d8a1b9cdaf9b50fb2c909fc11 SHA512 9635055a497a229e10fccfa96fc84ccbe98c351d207fb1a04c99f31f7b537111ddb44c89e6328a5acaecf0ac4a77ef85145928156b8d894d9995045eba42226d WHIRLPOOL 0864d5ecaa9577dedcc98387dff67136812dd413b0da8eb63b76e37be22958b96916648a8405272a3a27fc9aa2216c34619820d7bc94e3942688d2404e57a89f
-EBUILD metasploit-4.9.2.ebuild 9545 SHA256 f71ab3e3458c62e1e191ac88d50eb8431de615707aaf53a6d585b62426a994b9 SHA512 e0b590dfb2b070ea608c5ecd243d22decaf555d2118319ceb0574fb093a33952585f9fb331a9fbd6c48b30bcec24cbc44fc290bf4c007f4009cbadf1cce76617 WHIRLPOOL 317536c99936f266f041838f71017ab64f38e471182d841d6b2ae4afcf5e4c880b4d0aac1f7c0cdf2bed929ccfe050d6dc6c2091cfea351e72e5de12754ebb29
-EBUILD metasploit-9999.ebuild 9576 SHA256 99d7ddf60ddb97f2bff16298d6610feffd4115f581ebdeb8801a5f98dc5ea12e SHA512 45a093664e05bae300549468ddf0115f2312a61855a2249a54e78da30366a2abb06a03d58ddd43d0500ff814172348a4f5ba4ad90eceaca174ca18bb803022f5 WHIRLPOOL 990f6f8e1589096edc4bad3a75c9803f0fbdf7760fd4dfb3f4002e7f42bd4fd394a2e1d80531baed509e213bc469689cf5d3a3bb1ab375d6c407f22751fb53ed
-MISC ChangeLog 15145 SHA256 c4758c36d9b2ce030be8c4a1a56de4fecf81019ef06be86faf50e15d9596b360 SHA512 10a7f3f27b95d2a49b129e1a36c74857086f531005a3cdc8b326e50fcd257c29bf5757631c2eb22898893754199bdfe2b16678d89ab6a607e3a3539739b9cf05 WHIRLPOOL 44d8620d0a8c29aa661f25abffb148b8bff421444e53f7a97d759a86e3e5192bf384ae04396ce5b6952a55a7a1fcd51b68d9026e11d1793004205f3bcd77783a
-MISC metadata.xml 690 SHA256 3b24db79935a37e1583fdcee310076a175dcc7dc6d174b02f2aaede536435455 SHA512 3d0f49d10bd37b71036823c5eae753049778604610d05cd180a55bac731b746eae57e1362f33fba3f4e642dd558a818012ed9e00bb56b92f2219a743e70fd9e6 WHIRLPOOL bc55738aa50b4d6a8bb98755af0d1966d0d5a939ae2ef57bce093400ff1e82a5ffd50f6bce72ea5e1e3f40c8d36fd33392741af901355dbe6a200bd3892cb6a5
+EBUILD metasploit-4.9.2-r1.ebuild 9799 SHA256 fa18fbf5865d4025256ee852089cb0c77e40f8548d2afc4525eb71807a6b5c4c SHA512 2817c94f85ebaea98f845010541f3a3676de0e366d391097ce5eddba14c9a92b5e9701210a3025eff1f8c695096d46708287c9c3a4182285b346e7ee8b33dba4 WHIRLPOOL 77e73f04af9c232dbbd3ecabdc542a3cf39d9b0b2c8cced61766ede5de2959964d05c6aab20dc43fff562f99374917fcc3d8cfea81cb1c4230ce10660569a29c
+EBUILD metasploit-9999.ebuild 9827 SHA256 bafdb8358f2df32522d5108650e018e59de1d1433dc82e6c53a29fcc61a107aa SHA512 5988f8cc45c8f9749ec1ca7a417642fd6c41dc7051c24cc61c74cbd95633bd8ee7630ef1fea2c9c9c30437dad3306387e5da2442bad51cf1e6618c7d0f5ce044 WHIRLPOOL 5b7afaeaff82ed5bd202d315fecfdfde84f2b32526c384ca224e32a6ac50d62a6198b031061f77fc252b589f00938bcd410a0006d9564c79436c575d93cf9a9a
+MISC ChangeLog 15454 SHA256 2e816d29e97f0b9c4dd0a4168a730dd26cdc9655067ceadf03c4405e4ca58f0f SHA512 b260026fe07631d010fc82742171167188295efd7b371c8b19273a61e15c48f2c5b0f2e5d429218034170efd7d9ccb3b3fa5b3aae866ea948ea0614418ad8666 WHIRLPOOL 2db964050333790287d75f35c4d4bdc6f226ec26069fa4804e25f80e25d79db1658eb08ce698883f471238d4217a20584f0a8595daf6e6dedd0a0d131bd1943c
+MISC metadata.xml 648 SHA256 f7220754018805378926741b975a9eb32101e606d6b06081718ab0111c161b5f SHA512 924cfb15b02a0437c832f82bf9ec76ba5d3d013f6b02d99e089bb36c8772c9f92d93c7b83f180ec8b782384e4135b55b984267e76342b319e6ebbeb0f54d5f0d WHIRLPOOL 7fb28d2784bf7800e24bf6d8679e1792127b6797864d45467e9b2a65ae923068dc354596145c699f7dbe2a25494b6278a68c08a2264ac6a03ae45279d4e0b4a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTShG6AAoJEKXdFCfdEflK3IMQAIOsX8nEEJXekZOTMQzoXzqK
-0xjxFTCG/JMvq/5M2UP3I1VcACZwThY2BITIGwwV2EWR7fId36voDNvmxTk+ciPq
-BniytJN3p0YS3AdXG6YK5WuYNsnL9hosmVrTVTj9hCKKtUyQ3Ig/JnyE+RC//gha
-7FV8LvgBRb7SMWuFOO2kMPA3/qrEyAKw86rnmfPSScCRxXdJiDfHci864zKJ6X0R
-dCSiCe6/tiGuCeXQJWQrz2t16aYed+MiUVyDXb2MA+S0bpubyn9TuUH5DRPyRmsw
-jscmnNVCPw/mPMku7o3O+eMDdPPE4jlB9leBtWOAhJW8hEkSd8Bb85fXfoNShRuD
-P8l81hlLPOJtKGi6pGWys93sj6Pd9GnI2o7glyfKdGeZt+qF8ON7BtSPVJOWw29U
-6kOtAw+DD6o53aYmKqXHqgwA7v3eLcZnWKsRcyX9d8Ikx8veSaA8UAWP+zNrHNlI
-60qEu2UEixiMemXw2vJBO0hY1YLikQ4rNeediI8cuZVa07CMt58asQDCz/nZihq4
-qBQb8ySsAT6EGlixnegkxayH//U2At/nlxvQDlek22+axy2MyS5LtsOkyZ8EGJuE
-16XKeXlvAfO4NLO9JmrVc5r57noqoX6kvdw48QDQS3o1GPsDkaxfQiHi9QuTpyEi
-GDkCVxtS/4MsjnYibCwB
-=06c3
+iQIcBAEBCgAGBQJTUBlGAAoJEKXdFCfdEflKQ3MQALoYwpK4eqac/IOENsYZD/In
+yRCxgG95K5eR5wpGIuuxApNLke+a0BqfCMXNH0W2kGPQQgmckJtvFZXksbSATm41
+D34KyaVcHtRh7Fwlyf6QpHmpJdjrwFYDyJsVi7yhtdpUho8PaDCA9k0jAsI+dw7p
+aISeZgSjDADGcIDuO4bsvNU2ejKgiKfZBiGoP6KK66OoXoCSqBtuZe1R+WPA1I42
+RE973sHfmi6bPNyCxK46z9UfNJ8R2rHs/H5O0Ik+hDPSdT5lkfDKUjah3m9LBJOM
+Oq+3ABO2UDwlaGD2n8vKd9B2m3ve1afgz5RCphHQssJ2rWK3xbkVdse6VxPRMgAD
+OJLIulPun3/DUGV+GNcCU5pfnN1z6uHDwz43OcNgAFavYKQgJmuV2yTNVCpOKSke
+SSuXQoOcsQnPNh8QGRrelC0SXWTSM5ToopuGXq/I4Hnhnv6H9thxkBNV+cZ9Y/Hp
+/S9TibwdnK1UoED8VsKKin7Wlykjqu9iCMjKmVDsWyi+Q0Z/qDagyyjPe6QyKKyT
+zV1LPEtmLcd/e/qcBpsAosJtCGMl8PvtkARB6+j3lDF+PLy2ZDjmFdDWF7EMi53E
+5Rk9UhrQkC9cumZ5HeqYk8RCf/WeL+2NbhClY75sf1vnL4DFaeTrLr5zpgfAhhgs
+mfhvF2sxBKMEnuaEQVqq
+=qFGc
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index 9664fb9dbd19..458c3127eb2c 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -8,7 +8,6 @@
 	</maintainer>
 	<use>
 		<flag name='development'>Install dependancies needed for metasploit and exploit development</flag>
-		<flag name='gui'>Enable Java GUI</flag>
 		<flag name='lorcon'>Enable lorcon for raw packet injection</flag>
 		<flag name='oracle'>Enable restricted oracle modules which have additional deps</flag>
 		<flag name='pcap'>Enable libpcap for packet sniffing</flag>
diff --git a/net-analyzer/metasploit/metasploit-4.4.0-r1.ebuild b/net-analyzer/metasploit/metasploit-4.4.0-r1.ebuild
deleted file mode 100644
index 371347fa9751..000000000000
--- a/net-analyzer/metasploit/metasploit-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.4.0-r1.ebuild,v 1.2 2013/11/03 03:07:32 mrueg Exp $
-
-EAPI="3"
-inherit eutils multilib
-
-SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="4.4"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui mysql postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	dev-ruby/kissfft
-	dev-ruby/msgpack
-	gui? ( virtual/jre )
-	mysql? ( dev-ruby/mysql-ruby
-		dev-ruby/activerecord[mysql] )
-	postgres? ( dev-ruby/activerecord[postgres] )"
-DEPEND=""
-
-QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/cpuinfo/cpuinfo.ia32.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/cpuinfo/cpuinfo.ia64.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/eventmachine-0.12.10/lib/fastfilereaderext.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/eventmachine-0.12.10/lib/rubyeventmachine.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/thin-1.3.1/lib/thin_parser.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/nokogiri-1.5.2/lib/nokogiri/nokogiri.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/pg-0.13.2/lib/pg_ext.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux64/msgpack-0.4.6/lib/msgpack.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/eventmachine-0.12.10/lib/fastfilereaderext.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/eventmachine-0.12.10/lib/rubyeventmachine.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/thin-1.3.1/lib/thin_parser.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/nokogiri-1.5.2/lib/nokogiri/nokogiri.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/pg-0.13.2/lib/pg_ext.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch/linux32/msgpack-0.4.6/lib/msgpack.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch-old/linux64/pg-0.13.2/lib/pg_ext.so
-	usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/arch-old/linux32/pg-0.13.2/lib/pg_ext.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/john
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/genmkvpwd
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/tgtsnarf
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/mkvcalcproba
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.sse2/calc_stat
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/john
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/genmkvpwd
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/tgtsnarf
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/mkvcalcproba
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x64.mmx/calc_stat
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/john
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/genmkvpwd
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/tgtsnarf
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/mkvcalcproba
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.any/calc_stat
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/john
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/genmkvpwd
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/tgtsnarf
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/mkvcalcproba
-	usr/$(get_libdir)/${PN}${SLOT}/data/john/run.linux.x86.mmx/calc_stat
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso"
-
-S=${WORKDIR}/msf3
-
-src_configure() {
-	# upstream makes weird tarbllz
-	find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
-
-	rm "${S}"/msfupdate
-	chmod +x "${S}"/msf*
-
-	use gui || rm msfgui
-}
-
-src_install() {
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R "${S}"/* "${D}"/usr/$(get_libdir)/${PN}${SLOT}
-	chown -R root:0 "${D}"
-
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp "${S}"/{README,HACKING} "${D}"/usr/share/doc/${PF}
-	dosym /usr/$(get_libdir)/${PN}${SLOT}/documentation /usr/share/doc/${PF}/documentation
-
-	dodir /usr/bin/
-	for file in msf*; do
-		dosym /usr/$(get_libdir)/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
-	done
-
-	newinitd "${FILESDIR}"/msfrpcd-${SLOT}-initd msfrpcd${SLOT} || die
-	newconfd "${FILESDIR}"/msfrpcd-${SLOT}-conf msfrpcd${SLOT} || die
-
-	use gui &&	make_desktop_entry msfgui${SLOT} \
-			"Metasploit Framework" \
-			metasploit \
-			'GNOME;System;Network;GTK;' &&
-		doicon "${FILESDIR}"/metasploit.icon
-
-	# Avoid useless revdep-rebuild trigger #377617
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"/usr/lib*/${PN}${SLOT}/data/john\"" > \
-		"${D}"/etc/revdep-rebuild/70-${PN}-${SLOT}
-}
-
-pkg_postinst() {
-	if use gui; then
-		elog "You will need to create a /usr/bin/msfrpcd symlink pointing to"
-		elog "the version of msfrpcd if you want to be able to start msfrpcd"
-		elog "from the java gui."
-		elog
-		elog "ln /usr/bin/msfrpcd${SLOT} /usr/bin/msfrpcd"
-		elog
-	fi
-}
diff --git a/net-analyzer/metasploit/metasploit-4.8.2-r1.ebuild b/net-analyzer/metasploit/metasploit-4.8.2-r1.ebuild
deleted file mode 100644
index 611c2081abdd..000000000000
--- a/net-analyzer/metasploit/metasploit-4.8.2-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# 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-4.8.2-r1.ebuild,v 1.1 2014/02/10 16:03:00 zerochaos Exp $
-
-EAPI="5"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-else
-	#https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	SRC_URI="http://downloads.metasploit.com/data/releases/archive/framework-${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-#ruby18 is well beyond EoL
-#ruby20 doesn't have wide enough support in gentoo yet (but is semi-supported upstream)
-USE_RUBY="ruby19"
-inherit eutils ruby-ng
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-SLOT="4.8"
-LICENSE="BSD"
-IUSE="development +java lorcon +pcap test"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	dev-ruby/activesupport:3.2
-	dev-ruby/activerecord:3.2
-	dev-ruby/json
-	>=dev-ruby/metasploit_data_models-0.16.9
-	dev-ruby/msgpack
-	dev-ruby/nokogiri
-	dev-ruby/builder:3
-	>=dev-ruby/pg-0.11
-	=dev-ruby/packetfu-1.1.9
-	dev-ruby/robots
-	dev-ruby/kissfft
-	java? ( dev-ruby/rjb )
-	lorcon? ( net-wireless/lorcon[ruby] )
-	pcap? ( dev-ruby/pcaprub
-		dev-ruby/network_interface )
-	dev-ruby/bundler
-	development? ( dev-ruby/redcarpet
-			dev-ruby/yard
-			dev-ruby/rake
-			>=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 :-(
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql-server
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
-	net-analyzer/nmap"
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-admin/eselect-metasploit-0.10"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-		rm -r msf3
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-
-	#unbundle johntheripper, at least it now defaults to running the system version
-	rm -r data/john/run.*
-	rm -r data/john/src.tar.bz2
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove random oudated collected garbage
-	rm -r external
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-	#The Gemfile contains real known deps
-	#now we edit the Gemfile based on use flags
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use pcap; then
-		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
-	fi
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	if use test; then
-		#We don't need simplecov
-		sed -i -e "s#gem 'simplecov', '0.5.4', :require => false##" Gemfile || die
-		sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-	fi
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	${RUBY} -S bundle install --local || die
-	${RUBY} -S bundle check || die
-
-	#force all metasploit executables to ruby19, ruby18 is not supported anymore and ruby20 is not supported yet
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#rake --trace spec || die
-	# https://dev.metasploit.com/redmine/issues/8425
-	${RUBY} -S rake db:migrate || 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"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -rf spec
-	rm -rf test
-
-	#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...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql-server"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/metasploit/metasploit-4.9.2.ebuild b/net-analyzer/metasploit/metasploit-4.9.2-r1.ebuild
index de9ac972c1d1..6ea76db3d39c 100644
--- a/net-analyzer/metasploit/metasploit-4.9.2.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.9.2-r1.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-4.9.2.ebuild,v 1.2 2014/04/13 04:23:44 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.9.2-r1.ebuild,v 1.1 2014/04/17 18:09:16 zerochaos Exp $
 
 EAPI="5"
 
@@ -143,6 +143,9 @@ all_ruby_prepare() {
 	#remove the bundled readline
 	#https://github.com/rapid7/metasploit-framework/pull/3105
 	rm lib/rbreadline.rb
+	#fix for bug #507816 while waiting on upstream to actually set their own deps right
+	sed -i "s#gem 'activesupport', '>= 3.0.0'#gem 'activesupport', '~> 3.2'#" Gemfile || die
+	sed -i "s#gem 'activerecord'#gem 'activerecord', '~> 3.2'#" Gemfile || die
 	#now we edit the Gemfile based on use flags
 	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use pcap; then
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 2584959bd7b2..c5a34751b599 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.18 2014/04/13 04:23:44 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-9999.ebuild,v 1.19 2014/04/17 18:09:16 zerochaos Exp $
 
 EAPI="5"
 
@@ -144,6 +144,9 @@ all_ruby_prepare() {
 	#remove the bundled readline
 	#https://github.com/rapid7/metasploit-framework/pull/3105
 	rm lib/rbreadline.rb
+	#fix for bug #507816 while waiting on upstream to actually set their own deps right
+	sed -i "s#gem 'activesupport', '>= 3.0.0'#gem 'activesupport', '~> 3.2'#" Gemfile || die
+	sed -i "s#gem 'activerecord'#gem 'activerecord', '~> 3.2'#" Gemfile || die
 	#now we edit the Gemfile based on use flags
 	#even if we pass --without=blah bundler still calculates the deps and messes us up
 	if ! use pcap; then