From f5778de801a8e1ba34e09e76b21902d153b81c24 Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Wed, 21 Aug 2013 03:40:45 +0000
Subject: [PATCH] metasploit: fix mdm dep

---
 net-analyzer/metasploit/Manifest              |  2 +-
 .../metasploit/metasploit-9999.ebuild         | 39 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 7c5afa0d1..c0479b8cc 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -2,4 +2,4 @@ AUX database.yml 481 SHA256 2db3df7b05f28aa5ba6d6dedc32d8d1a2e24e020d6fd8aea15b2
 AUX metasploit.icon 7630 SHA256 d197dd3b939c35d951c2cd5c19b51200ada7f8f92d90775a9eaebdccf18e3949 SHA512 569db261a3782f3874c30ccaf076be512437a9a5a9df835baf29bacec48dd76b2896e009b5ab165ba82aff72ab15d067155f257787e69c3a7cd034dafa5a9066 WHIRLPOOL 3f66eb2a3b51dc787f5da6b2fd93165fdca3e9ae391db0ea69cb0ea5c6c1d9f2d85fffbdb117da4065e0b3e29daa5b7d7e62740cd3210768aa0cfc4a63679376
 DIST framework-4.6.0.tar.bz2 49996884 SHA256 ec6dfe58cb5a897e8c8e56d919dec7c00d56fe758efd1350c2a7a3587ef538c2 SHA512 ff73ebd5e08f96d7ffb63ad59cd4fa608705a1a72f00b82ce074fc537e7037349fedf71f768a895ec4e36aabb4ae07fd6b6a0f12ff88807b8ca9202f0d770633 WHIRLPOOL 952407ce34e0d94f7a824c6a3b963c6321da9aee0626295389b1f4f7d4671b9577e5bfab8f581144696f6c4a1bb073f7b7056d8c54853dbf60a6dcb7c320b336
 EBUILD metasploit-4.6.0.ebuild 6293 SHA256 6343754b28505ccec773e20c9a2385890803859d5d38c51f601448d50f39048f SHA512 45cc5cd171bae5f559035bede6bebb7bb81ace641886317c6bf540f34c2c4a645c677c00b72e47daeaa06e195d358d8ad1a95f9c9307ae2f4e65df5fddc7b168 WHIRLPOOL 36fc119489d82c116b822b7742b575f8361f3bb041d8041f309cd4e171502054d0153cd07ef75fc26b9e87fb9104adaa0ed9ce59086d47e34a58d491cdef3885
-EBUILD metasploit-9999.ebuild 6787 SHA256 3df2d4b027d1bb815c7dcf27d1b151ca724e020f8bed378ce0b3787ae26b6c3c SHA512 07eb6a1e45ffd6938f5c307c5c19ee2ef6b098d5fc1e5332436df5a4d04e81f40230ca16ff33168d0a69edc2c2e1069c240a372fac1be59453886d614df96726 WHIRLPOOL 69498ea0cf9f69870866cd9d028bad88596cf94525f79507ac0904b584cdca6d0f01be61fc7d6a6d1dd6cd9664e3aae9078f48cc5685aa4afde3c70519a8ceee
+EBUILD metasploit-9999.ebuild 7240 SHA256 f2f2ae55193c308b8d032fa996ac004dcbc68ece9fdbe12c5bbf0ab7543cbd2e SHA512 ade490d83d4c0fbd559e85e5905563b9beee5bc8c0f0be0914455df502b32b531d0fc277093ec3e32a603cd00670500d63b693dfe6f20d8ad7d9a1c15a27e7b9 WHIRLPOOL fb7fd5e57c0dd4972a171f0dc258c444a72f04be7837d1dfdf27da8de40000f59d5c6540dc1475c50a72a429a2cbb2b0f457f20a227662787b4bf41271dd70c0
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index a25fb6be8..bd96130a1 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -23,17 +23,15 @@ DESCRIPTION="Advanced open-source framework for developing, testing, and using v
 HOMEPAGE="http://www.metasploit.org/"
 SLOT="9999"
 LICENSE="BSD"
-IUSE="+java lorcon pcaprub serialport test"
+IUSE="development +java lorcon +pcap serialport test"
 
-#RDEPEND isn't guarenteed till after src_test so all this is DEPEND now
 DEPEND="dev-db/postgresql-server
 	dev-lang/ruby[ssl]
 	>=dev-ruby/activesupport-3.0.0
 	>=dev-ruby/activerecord-3.2.11
 	dev-ruby/json
-	>=dev-ruby/metasploit_data_models-0.16.1
+	>=dev-ruby/metasploit_data_models-0.16.6
 	dev-ruby/msgpack
-	dev-ruby/network_interface
 	dev-ruby/nokogiri
 	dev-ruby/builder:3
 	>=dev-ruby/pg-0.11
@@ -43,9 +41,23 @@ DEPEND="dev-db/postgresql-server
 	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
 	net-analyzer/nmap
 	!arm? ( java? ( dev-ruby/rjb ) )
-	dev-ruby/pcaprub
+	pcap? ( dev-ruby/pcaprub
+		dev-ruby/network_interface )
 	lorcon? ( net-wireless/lorcon[ruby] )
-	dev-ruby/bundler"
+	dev-ruby/bundler
+	development? ( dev-ruby/redcarpet
+			dev-ruby/yard
+			dev-ruby/rake
+			>=dev-ruby/factory_girl-4.1.0 )
+	test? (	>=dev-ruby/factory_girl-4.1.0
+		dev-ruby/rake
+		dev-ruby/database_cleaner
+		>=dev-ruby/rspec-2.12
+		dev-ruby/shoulda-matchers
+		dev-ruby/timecop )
+	"
+	#=dev-ruby/simplecov-0.5.4 #really old, tough to install
+
 RDEPEND="${DEPEND}
 	>=app-admin/eselect-metasploit-0.10"
 
@@ -103,9 +115,18 @@ src_prepare() {
 	#rm -f "${S}"/Gemfile
 	#now we edit the Gemfile based on use flags
         #even if we pass --without=blah bundler still calculates the deps and messes us up
-        sed -i -e "/^group :development/,/^end$/d" -e "/^group :test/,/^end$/d" Gemfile || die
-        bundle install --local || die
-        bundle check || die
+	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
+	cat Gemfile
+	bundle install --local || die
+	bundle check || die
 
 	#they removed bundled armitage from releases so let's just keep it external
 	rm -rf "${S}"/armitage "${S}"/data/armitage