[gentoo-commits] gentoo-x86 commit in net-wireless/lorcon: lorcon-9999.ebuild lorcon-0.0_p20130212.ebuild ChangeLog

[Richard Farina (zerochaos)]

zerochaos    13/05/28 05:05:22

  Modified:             lorcon-9999.ebuild lorcon-0.0_p20130212.ebuild
                        ChangeLog
  Log:
  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
  
  (Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

Revision  Changes    Path
1.3                  net-wireless/lorcon/lorcon-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild?r1=1.2&r2=1.3

Index: lorcon-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lorcon-9999.ebuild	19 Apr 2013 13:34:39 -0000	1.2
+++ lorcon-9999.ebuild	28 May 2013 05:05:22 -0000	1.3
@@ -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 @@
 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 @@
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/all
+S="${WORKDIR}"/${P}
 
 pkg_setup() {
 	if use python; then
@@ -38,31 +45,34 @@
 }
 
 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 @@
 	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
 }
 



1.2                  net-wireless/lorcon/lorcon-0.0_p20130212.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild?r1=1.1&r2=1.2

Index: lorcon-0.0_p20130212.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/lorcon/lorcon-0.0_p20130212.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lorcon-0.0_p20130212.ebuild	26 May 2013 05:10:58 -0000	1.1
+++ lorcon-0.0_p20130212.ebuild	28 May 2013 05:05:22 -0000	1.2
@@ -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 @@
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="python ruby"
@@ -48,16 +47,16 @@
 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_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 @@
 	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
 }
 



1.4                  net-wireless/lorcon/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/lorcon/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/lorcon/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	26 May 2013 05:10:58 -0000	1.3
+++ ChangeLog	28 May 2013 05:05:22 -0000	1.4
@@ -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@g.o> 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)