Clean up patch. Clean up old. Replace sed scripts with make variables, respect LDFLAGS (bug #337678), CXX, too.

(Portage version: 2.2_rc82/cvs/Linux i686)

5 files changed, 59 insertions, 60 deletions

diff --git a/net-wireless/airtraf/ChangeLog b/net-wireless/airtraf/ChangeLog
index 514ed6d944e9..6bd98ceb38e9 100644
--- a/net-wireless/airtraf/ChangeLog
+++ b/net-wireless/airtraf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/airtraf
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.15 2009/12/17 21:22:54 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.16 2010/09/17 03:23:44 jer Exp $
+
+*airtraf-1.1-r1 (17 Sep 2010)
+
+  17 Sep 2010; Jeroen Roovers <jer@gentoo.org> -airtraf-1.0.ebuild,
+  airtraf-1.1.ebuild, +airtraf-1.1-r1.ebuild, +files/airtraf-1.1.patch,
+  -files/airtraf.patch:
+  Clean up patch. Clean up old. Replace sed scripts with make variables,
+  respect LDFLAGS (bug #337678), CXX, too.
 
   17 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> airtraf-1.1.ebuild,
   metadata.xml:
diff --git a/net-wireless/airtraf/airtraf-1.0.ebuild b/net-wireless/airtraf/airtraf-1.0.ebuild
deleted file mode 100644
index be5bf49c83dd..000000000000
--- a/net-wireless/airtraf/airtraf-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.0.ebuild,v 1.13 2006/02/20 22:25:16 jokey Exp $
-
-inherit eutils  toolchain-funcs
-
-DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
-HOMEPAGE="http://www.elixar.com/"
-SRC_URI="http://www.elixar.com/${P}.tar.gz"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~amd64"
-
-DEPEND="net-libs/libpcap"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use amd64 ; then
-		epatch ${FILESDIR}/${PN}-amd64.patch
-	fi
-}
-
-src_compile() {
-	cd ${S}/src
-
-	# Do some sedding to make compile flags work
-
-	mv Makefile.rules ${T}
-	sed -e "s:gcc:$(tc-getCC):" \
-		-e "s:CFLAGS   = -Wall -O2:CFLAGS   = ${CFLAGS} -Wall:" \
-		-e "s:c++:$(tc-getCXX):" \
-		-e "s:CXXFLAGS = -Wall -O2:CXXFLAGS = ${CXXFLAGS} -Wall:" \
-		${T}/Makefile.rules > Makefile.rules
-	make || die
-}
-
-src_install () {
-	newdoc ${S}/docs/airtraf_doc.html airtraf_documentation.html
-
-	dobin ${S}/src/airtraf || die
-}
diff --git a/net-wireless/airtraf/airtraf-1.1-r1.ebuild b/net-wireless/airtraf/airtraf-1.1-r1.ebuild
new file mode 100644
index 000000000000..a891fc293543
--- /dev/null
+++ b/net-wireless/airtraf/airtraf-1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1-r1.ebuild,v 1.1 2010/09/17 03:23:44 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
+HOMEPAGE="http://www.elixar.com/"
+SRC_URI="http://www.elixar.com/${P}.tar.gz"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="net-libs/libpcap"
+
+src_prepare() {
+	epatch ${FILESDIR}/${P}.patch
+}
+
+src_compile() {
+	# parallel make (bug #297331)
+	emake -C src -j1 \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die
+}
+
+src_install () {
+	newdoc ${S}/docs/airtraf_doc.html airtraf_documentation.html
+
+	dobin ${S}/src/airtraf || die
+}
diff --git a/net-wireless/airtraf/airtraf-1.1.ebuild b/net-wireless/airtraf/airtraf-1.1.ebuild
index 4e6999454c70..0f2e6625357c 100644
--- a/net-wireless/airtraf/airtraf-1.1.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1.ebuild,v 1.7 2009/12/17 21:22:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1.ebuild,v 1.8 2010/09/17 03:23:44 jer Exp $
 
 inherit eutils  toolchain-funcs
 
@@ -19,7 +19,7 @@ DEPEND="net-libs/libpcap"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}.patch
+	epatch ${FILESDIR}/${P}.patch
 }
 
 src_compile() {
diff --git a/net-wireless/airtraf/files/airtraf.patch b/net-wireless/airtraf/files/airtraf-1.1.patch
index f4acfcd515ac..f1309184ae9d 100644
--- a/net-wireless/airtraf/files/airtraf.patch
+++ b/net-wireless/airtraf/files/airtraf-1.1.patch
@@ -1,6 +1,5 @@
-diff -ru airtraf-1.1.orig/src/sniffd/autoconfig.c airtraf-1.1/src/sniffd/autoconfig.c
---- airtraf-1.1.orig/src/sniffd/autoconfig.c	2003-01-24 10:11:36.000000000 +0930
-+++ airtraf-1.1/src/sniffd/autoconfig.c	2005-01-12 19:23:16.481439336 +0930
+--- a/airtraf-1.1/src/sniffd/autoconfig.c	2003-01-24 10:11:36.000000000 +0930
++++ b/airtraf-1.1/src/sniffd/autoconfig.c	2005-01-12 19:23:16.481439336 +0930
 @@ -360,7 +360,7 @@
  int check_drv_compat(char * drvname, int * id)
  {
@@ -27,10 +26,8 @@ diff -ru airtraf-1.1.orig/src/sniffd/autoconfig.c airtraf-1.1/src/sniffd/autocon
  	
      }
      /* update flag take off PROMISC */
-Only in airtraf-1.1/src/sniffd: autoconfig.c.orig
-diff -ru airtraf-1.1.orig/src/sniffd/gui_channel_scan.c airtraf-1.1/src/sniffd/gui_channel_scan.c
---- airtraf-1.1.orig/src/sniffd/gui_channel_scan.c	2003-01-22 13:05:01.000000000 +0930
-+++ airtraf-1.1/src/sniffd/gui_channel_scan.c	2005-01-12 19:21:33.135876552 +0930
+--- a/airtraf-1.1/src/sniffd/gui_channel_scan.c	2003-01-22 13:05:01.000000000 +0930
++++ b/airtraf-1.1/src/sniffd/gui_channel_scan.c	2005-01-12 19:21:33.135876552 +0930
 @@ -384,7 +384,7 @@
  	    if (!beep()) flash();
  	    wattrset(statuswin, STDATTR);
@@ -40,9 +37,8 @@ diff -ru airtraf-1.1.orig/src/sniffd/gui_channel_scan.c airtraf-1.1/src/sniffd/g
  		     hexdump((__u8*)&ap->bssid,6), ap->channel);
  	    print_status_msg(statuswin, location, message);
  	    ap->status = AP_STATUS_ACTIVE;
-diff -ru airtraf-1.1.orig/src/sniffd/server.c airtraf-1.1/src/sniffd/server.c
---- airtraf-1.1.orig/src/sniffd/server.c	2003-01-22 13:05:01.000000000 +0930
-+++ airtraf-1.1/src/sniffd/server.c	2005-01-12 19:21:33.135876552 +0930
+--- a/airtraf-1.1/src/sniffd/server.c	2003-01-22 13:05:01.000000000 +0930
++++ b/airtraf-1.1/src/sniffd/server.c	2005-01-12 19:21:33.135876552 +0930
 @@ -57,7 +57,7 @@
  
  int process_command(int, char *);