fix to build right, thanks to bonsaikitten for reading my error to me and my wife for letting me work on this for 2 hours

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

4 files changed, 55 insertions, 44 deletions

diff --git a/net-wireless/lorcon/ChangeLog b/net-wireless/lorcon/ChangeLog
index e7246c84cbca..f60d8a15c692 100644
--- a/net-wireless/lorcon/ChangeLog
+++ b/net-wireless/lorcon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/lorcon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/ChangeLog,v 1.3 2013/05/26 05:10:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/ChangeLog,v 1.4 2013/05/28 05:05:22 zerochaos Exp $
+
+  28 May 2013; Rick Farina <zerochaos@gentoo.org> lorcon-0.0_p20130212.ebuild,
+  lorcon-9999.ebuild:
+  fix to build right, thanks to bonsaikitten for reading my error to me and my
+  wife for letting me work on this for 2 hours
 
 *lorcon-0.0_p20130212 (26 May 2013)
 
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 40e87ed06d8e..5667a234acda 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA512
 
 DIST lorcon-0.0_p20130212.tar.xz 956024 SHA256 1266bbd53e483456aca3031a49ea47fe3bd004e3e109b86a61672c881801742b SHA512 d7c33d9e8b5678e0b8b9513b6a132ab1b13045503e884d077474745a4a9731fa609ba8dc9c35f344ad93b65eb0ddc038919a6349d32187b6c6c92a020155b34f WHIRLPOOL b5e6af7977fd742b34a0f394eb443cc1aca95f9c44177b7353e8a19e1593bca4ccf7e72cf1fc2f05eb4fc5d77303bb162440462957fcc37a7f8a69443f1f4df5
-EBUILD lorcon-0.0_p20130212.ebuild 2342 SHA256 9b76380a792ef7ff850436da4901e193e6cc0631a6e059b643921b08a2888dff SHA512 683f5c7c327ab622e342712c15e50d330d2e6e0e551ccd148a08bbeafea9980f840e4d4fd3b9f92c6b635418cc804648f365cc1fdd5059c0bdee4b514a3b1261 WHIRLPOOL 0087f217da5745e37232407553ef136031714e6cca50752473060f8da5912d948f9783762fc10899e2b89ceae32f3f7f5c4bea7d903540c9ec02d3e2f481c8c8
-EBUILD lorcon-9999.ebuild 2080 SHA256 396ba4609df29d713e7be492a175104da592cc72b50aee0707a2b3f495f53074 SHA512 6eb48557cb7146d744db4dc029286329bdbd1269df0ed3144d75eb9f150d9b7101c8ed7577111d9ee6f6f6526b8c2a5b2ad22d64f9dbedd727ee8f758bef0e46 WHIRLPOOL 30efa9ef35d970673d719fa5b0eca3285b1b64150048e82a41a7170c25a5693b893fb2ea3b1878e49c2e221b2a19b279451a691d68d28ea32b4c72747ae5578f
-MISC ChangeLog 597 SHA256 e3ec6927c7ac0adeb9f935fa469736f5d48c313fb66892ca86ef24246f6ac67e SHA512 258ca352bde90924972fdb6e98ab94a9a9035a255be0d926d34c98d25cca4fc8ae27747da40eccb58ed7760f17b6c8eadf7bd74208a3e7e4157c32a6a9230ea0 WHIRLPOOL 369852969e09bb50efe953f38d289ec3dc10cba2f0722e1ad5e78f3d26d16a19e10f0157306514534df72b19953898cc4c1efab5a6755334091eda33ac0c6c9c
+EBUILD lorcon-0.0_p20130212.ebuild 2512 SHA256 1e91f5e6361f86db236cc0a9bc8e3270d8d5295959bfa546b7daadd91723411d SHA512 55946b5156fd6726a847b045b2148dcddc93f17abb834afaacfcfc663b5359fe71b83a1a84aa695d62d7aa8f7ef1cd6df280de58cba8ee8ca94981e472e94047 WHIRLPOOL b186adf70fd48ee471fa22beed1313e2ecefa94c551c58ad1ebecde909a05abd0723b601b1bcbedaa454d3a98dac3252c784f8a30f0e6412c133c58a0b2b619f
+EBUILD lorcon-9999.ebuild 2503 SHA256 7866f3990689ee00961589dd54e35c2cf656f0623064d58ad97ce870d4c41959 SHA512 43f9ca046984677ddcdd9a00f530e4697e5a670f40d8456e25ed0af4c3ea2c9ef87166feb670ffe05e4ffd31f024a5dd433931d2ef532f6a23a4c757897852eb WHIRLPOOL 6c7a9f4dfe772279c425e97f9381abdc1687475d19eb62243f606b3cd34eb7216598fc3216e4fc7c3c97a05a4f4b10b875c3b670d3a9e99aa5b7d4d49c0616ab
+MISC ChangeLog 825 SHA256 d4e4779896361a5c12a7753b369b9b6911001a4697d9adb3845f5af591f6eb4d SHA512 225961b36310fa2b9d140d536a2f09e8fbac15aa693707ee83aa44411f72daee17416cb9518789f9abbb7195d5045fe8c56b7d29c34ab17844b5a90f04865008 WHIRLPOOL 0eed87a7d145fa3522cdafa05afc18110b61b6c962c5e20a9856293625519df1b0752aff0cd982b7e1ff1967c5bc64cc16756d178a89a24ed9428ff12f652ad6
 MISC metadata.xml 275 SHA256 ddea40fdfb3de36c4e8ec395d93195500089d461dc340ca376d7d93a3b6c3c70 SHA512 23a0fff59aeb0bceae496a74b75da3bc80d71fe9c60f63b1c20eecb97dd75fa32180457dfca21871c1e8d0a34f85a4a201a0eae0b46cbf91abb0fc8322d0b9f2 WHIRLPOOL 9f6a81dc72dc72656e6c32be440c3276225a7d7d09b4b1833db219eee071d3916e8eda3bdf6dbde6db1e5a6c9b4972fa6bb6e6ddecd2302941d9fdf283246761
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRoZl+AAoJEKXdFCfdEflK99EQALagz9grP6VMGWotSpb3ra8k
-6n8PmI1hzelA5vxRK8MGAyE/LxqS1Ko0E8POKmM2ose44tdFNcy9iCKTCXdYIzvG
-kMRLe4aBeI4evmFWJinep0zUvAvKsYbOR4gLg/dlvR+tU67MddihQ3DbULdTGSC7
-/1MBxWlvcPRgKGPV/djrCEj1mX0lEcY8ivgJM5U++tMSZKBuGRTwUw8Rc15w89G8
-7Dpvyzksf5adubcLxbpACMUpdHLruiGld02Gb+2tT2G3Ckj31JAaaP/mvPVoeNnL
-ItPmwinCS9Ek1SIG0rFoi/PNb2alR91y/NImr6KnDgHY+yp6iKpxLCCP7q2IDidi
-RUsWgZxDo5awTGcSSu70KoS/nJ2qz5MF21xiZ/dyHyuS19SX5Gh0rWgQdlzLvZjI
-SHEno0wZR6/9w4GYesxszaTEeL8Mj1YG30PoSJaTgyjD1qSUmkyAKX1xD+mxv5T7
-jMpjFGqDtUM4dTsuLsbtbqRqz4P6Crsg4T7scDlptqENQ2OfZ3Jd8BP8Qbfvovsu
-I6kYoHOlRKozBtsTJcz3ru4f080KsAHkejhcw5kgTMQMfIviroIcQI9BCofG6Cyv
-sqjSX1xXS4/6ir8LguTk7IJG7ZawIfTo9h3MpgpHxrve+GJet1QPzBfpAJs3AMKM
-TCIYymkIjsbmj36OR+PF
-=0S4A
+iQIcBAEBCgAGBQJRpDs3AAoJEKXdFCfdEflK1VoP/2HHnoXB0ewUu9ORFJBY412b
+zRZ0Ji/94blb/heCrCzcIpnDkahuVuh+4in0RBZJPhF8gTvOaZZudGZdAp0nNT2/
+9Xq7kZ/sxWpZpQLrHsewuW2pcdWdaaxNduirvdmkLcL8WbpVyCVqcZII3ZgEjQEZ
+3FqQzHW0nLbMmf1vGJmdFC5mH4TOZmPXjmMaC5HWGgtX4phRu58aIX1/uOa/T6zA
+wBVjEhRQwmcAfTrNzD5zGR/52EM3MIavXE8OvMAMjvjeE2B6rECn27vmAnYMYXrg
+OnWNHEzaOD4pqcs0SO9wLSvlhLvRDpkAiZrQ33QzygxAAnUm9roiKRlvjQaSTnFt
++UVoPtAO697yjbxPDSGnveZnbbOhIVFF2K0aRGhdv4u1jJQaKs0xHYlAY3OL0h3+
+ULsM7X4vbYUh9SlsaM09116r8I7pgV82Aq1ptVg+6hj5rOsL0DyBEh1WoA4TiFlT
+w9U/vhMCvRPufHF8QXCntySGthyg32THab8FB8NqVTO0+8GJQe8+UG6K5VKduFOp
+S+C3oQB7Vmv3gvpwPpnx+7g7S5R5ItZlsnumJi9Ra+pSnl8g7arGtCP+74oRqW1o
+widEOOGNmeyufoX1f6GU3f5umIk0dodpKpKDG7t141Rg9j1kkgFq2Q5wHQioLfu1
+YVRh4opORV6chbHRDpdM
+=p80u
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild b/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild
index 89d64c85fe20..d43e2e80ecef 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild,v 1.1 2013/05/26 05:10:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild,v 1.2 2013/05/28 05:05:22 zerochaos Exp $
 
 EAPI=5
 
@@ -25,7 +25,6 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="python ruby"
@@ -48,16 +47,16 @@ pkg_setup() {
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git-2_src_unpack
-	else
-		default_src_unpack
+		cp -R "${S}/" "${WORKDIR}/all"
 	fi
+	default_src_unpack
+	#ruby-ng_src_unpack doesn't seem to like mixing with git so we just copy things above
 	use ruby && ruby-ng_src_unpack
 }
 
 src_prepare() {
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
 	sed -i 's#find_library("orcon2", "lorcon_list_drivers", "lorcon2/lorcon.h") and ##' ruby-lorcon/extconf.rb
-	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/all#" ruby-lorcon/extconf.rb
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
 	use python && distutils_src_prepare
 	use ruby && ruby-ng_src_prepare
@@ -65,16 +64,15 @@ src_prepare() {
 
 src_configure() {
 	default_src_configure
-	use ruby && ruby-ng_src_configure
 }
 
 src_compile() {
 	default_src_compile
+	use ruby && ruby-ng_src_compile
 	if use python; then
 		LDFLAGS+=" -L${S}/.libs/"
 		distutils_src_compile
 	fi
-	use ruby && ruby-ng_src_compile
 }
 
 src_install() {
@@ -94,12 +92,11 @@ pkg_postrm() {
 	use python && distutils_pkg_postrm
 }
 
-each_ruby_configure() {
-	${RUBY} -C "ruby-lorcon" extconf.rb
-	sed -i "s#-L\.#-L. -L${WORKDIR}/all/.libs -lorcon2 #g" ruby-lorcon/Makefile
-}
-
 each_ruby_compile() {
+	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
+	"${RUBY}" -C ruby-lorcon extconf.rb || die
+	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
+	sed -i "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" ruby-lorcon/Makefile || die
 	emake -C ruby-lorcon
 }
 
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index 88f9b56c6fe3..def1016af7b2 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild,v 1.2 2013/04/19 13:34:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild,v 1.3 2013/05/28 05:05:22 zerochaos Exp $
 
 EAPI=5
 
@@ -11,15 +11,22 @@ RESTRICT_PYTHON_ABIS="3.*"
 USE_RUBY="ruby18 ruby19"
 RUBY_OPTIONAL=yes
 
-inherit git-2 distutils ruby-ng
+inherit distutils ruby-ng
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
 HOMEPAGE="http://802.11ninja.net/lorcon"
-EGIT_REPO_URI="https://code.google.com/p/lorcon/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://code.google.com/p/lorcon/"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="python ruby"
 
 DEPEND="ruby? ( $(ruby_implementations_depend) )
@@ -27,7 +34,7 @@ DEPEND="ruby? ( $(ruby_implementations_depend) )
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/all
+S="${WORKDIR}"/${P}
 
 pkg_setup() {
 	if use python; then
@@ -38,31 +45,34 @@ pkg_setup() {
 }
 
 src_unpack() {
-	git-2_src_unpack
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+		cp -R "${S}/" "${WORKDIR}/all"
+	fi
+	default_src_unpack
+	#ruby-ng_src_unpack doesn't seem to like mixing with git so we just copy things above
 	use ruby && ruby-ng_src_unpack
 }
 
 src_prepare() {
-	use python && distutils_src_prepare
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
 	sed -i 's#find_library("orcon2", "lorcon_list_drivers", "lorcon2/lorcon.h") and ##' ruby-lorcon/extconf.rb
-	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/all#" ruby-lorcon/extconf.rb
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
+	use python && distutils_src_prepare
 	use ruby && ruby-ng_src_prepare
 }
 
 src_configure() {
 	default_src_configure
-	use ruby && ruby-ng_src_configure
 }
 
 src_compile() {
 	default_src_compile
+	use ruby && ruby-ng_src_compile
 	if use python; then
 		LDFLAGS+=" -L${S}/.libs/"
 		distutils_src_compile
 	fi
-	use ruby && ruby-ng_src_compile
 }
 
 src_install() {
@@ -82,12 +92,11 @@ pkg_postrm() {
 	use python && distutils_pkg_postrm
 }
 
-each_ruby_configure() {
-	${RUBY} -C "ruby-lorcon" extconf.rb
-	sed -i "s#-L\.#-L. -L${WORKDIR}/all/.libs -lorcon2 #g" ruby-lorcon/Makefile
-}
-
 each_ruby_compile() {
+	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
+	"${RUBY}" -C ruby-lorcon extconf.rb || die
+	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
+	sed -i "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" ruby-lorcon/Makefile || die
 	emake -C ruby-lorcon
 }