From 67029ede772f7bb3cccc4f58ddde9e4ce5ce665c Mon Sep 17 00:00:00 2001
From: Zero_Chaos <zerochaos-@users.noreply.github.com>
Date: Thu, 22 Mar 2012 05:29:57 +0000
Subject: [PATCH] metasploit: allow lorcon or lorcon2, niether builds right now
 but working with upstream

---
 net-analyzer/metasploit/Manifest              |  2 +-
 .../metasploit/metasploit-9999.ebuild         | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 1e185fe35..5eb5c045e 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -5,4 +5,4 @@ AUX msfrpcd.initd 626 RMD160 3cb7d960a52540059f126f62e1e355d43b686a51 SHA1 66a0d
 AUX smart_hasdump_script_6ac6c1d.rb 15510 RMD160 3ff084bf3b86df1fa37499b004ca040161b324b8 SHA1 3795c23ae5160fdc13ba1d9c7f05e3893ff6f4e9 SHA256 66dec160dd9cc2fee2f8de11bf433f40baa1f41734ecf62aca9a32e0ca8a438f
 DIST jboss_seam_remote_command_rb 3412 RMD160 c577b1bd75943f2ddceea3161bc1037dd0150c2f SHA1 b858c726d3ee26317726635373d5db3b7eeb774d SHA256 c87f1cc1b82ed105c7bf551db7e3bad0a787244c4cdd124015a3ff24cedd23df
 DIST vbsmem-1.2.1.patch 69002 RMD160 281461151b0d1e453ee613326f4457eebaddebaa SHA1 883a582552e00102be452a2a0105b9e016b3dccc SHA256 7991a5629c562817919c9bb1c8f0a3bdcd1c63cf9b9f32f322d1d266416589d2
-EBUILD metasploit-9999.ebuild 6106 RMD160 5b33dc04dc388f128ca457df60ee666b4dfe477c SHA1 823a4362eec18e28dc618a4ec2db8e33e084d34a SHA256 bd7296992b577168c4aac64ac17c8174c46a802c3c845c88de5ba05d4849b3c5
+EBUILD metasploit-9999.ebuild 6137 RMD160 a67170e9292fdf9ea68915d20c64667791f5acf0 SHA1 c12097b9b5640e79508f51e306993e52d9c26d52 SHA256 afd5c1475238fc3a816a1789be15936ddc80cba02462e3497b63888c2d474c4b
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 12d8b7a07..fc3ebc012 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.metasploit.org/"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="+armitage +kissfft unstable lorcon +pcaprub +postgres serialport"
+IUSE="+armitage +kissfft unstable lorcon lorcon2 +pcaprub +postgres serialport"
 
 REQUIRED_USE="armitage? ( postgres )"
 
@@ -35,7 +35,8 @@ RDEPEND="dev-lang/ruby
 	pcaprub? ( net-libs/libpcap )
 	armitage? ( net-analyzer/nmap
 		!net-analyzer/armitage )
-	lorcon? ( net-wireless/lorcon )"
+	lorcon? ( net-wireless/lorcon-old )
+	lorcon2? ( net-wireless/lorcon )"
 DEPEND=""
 
 RESTRICT="strip"
@@ -58,12 +59,12 @@ src_compile() {
 		ruby extconf.rb
 		emake
 	fi
-	#if use lorcon-old; then
-	#	cd "${S}"/external/ruby-lorcon
-	#	ruby extconf.rb
-	#	emake
-	#fi
 	if use lorcon; then
+		cd "${S}"/external/ruby-lorcon
+		ruby extconf.rb
+		emake
+	fi
+	if use lorcon2; then
 		cd "${S}"/external/ruby-lorcon2
 		ruby extconf.rb
 		emake
@@ -133,11 +134,11 @@ src_install() {
 		cd "${S}"/external/pcaprub
 		emake DESTDIR="${ED}" install
 	fi
-	#if use lorcon-old; then
-	#	cd "${S}"/external/ruby-lorcon
-	#	emake DESTDIR="${ED}" install
-	#fi
 	if use lorcon; then
+		cd "${S}"/external/ruby-lorcon
+		emake DESTDIR="${ED}" install
+	fi
+	if use lorcon2; then
 		cd "${S}"/external/ruby-lorcon2
 		emake DESTDIR="${ED}" install
 	fi