Update old grep style which fails with newer versions #349770 by Diego Elio Pettenò. Also clean up and move to newer EAPI in the process.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

2 files changed, 28 insertions, 14 deletions

diff --git a/net-wireless/wifiscanner/ChangeLog b/net-wireless/wifiscanner/ChangeLog
index 14aa3d7f3b20..7f53fe79f5f2 100644
--- a/net-wireless/wifiscanner/ChangeLog
+++ b/net-wireless/wifiscanner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wifiscanner
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifiscanner/ChangeLog,v 1.10 2011/04/02 12:49:04 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifiscanner/ChangeLog,v 1.11 2012/01/14 05:28:15 vapier Exp $
+
+  14 Jan 2012; Mike Frysinger <vapier@gentoo.org> wifiscanner-1.0.1-r2.ebuild:
+  Update old grep style which fails with newer versions #349770 by Diego Elio
+  Pettenò. Also clean up and move to newer EAPI in the process.
 
   02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
   wifiscanner-1.0.1-r1.ebuild, wifiscanner-1.0.1-r2.ebuild:
diff --git a/net-wireless/wifiscanner/wifiscanner-1.0.1-r2.ebuild b/net-wireless/wifiscanner/wifiscanner-1.0.1-r2.ebuild
index ceadb44234c7..b340886c8e2b 100644
--- a/net-wireless/wifiscanner/wifiscanner-1.0.1-r2.ebuild
+++ b/net-wireless/wifiscanner/wifiscanner-1.0.1-r2.ebuild
@@ -1,34 +1,44 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifiscanner/wifiscanner-1.0.1-r2.ebuild,v 1.2 2011/04/02 12:49:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifiscanner/wifiscanner-1.0.1-r2.ebuild,v 1.3 2012/01/14 05:28:15 vapier Exp $
+
+EAPI="4"
+
+inherit autotools
 
 MY_P=WifiScanner-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="WifiScanner is an analyzer and detector of 802.11b stations and access points."
+DESCRIPTION="analyzer and detector of 802.11b stations and access points"
 HOMEPAGE="http://wifiscanner.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wifiscanner/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="wireshark ncurses"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses wireshark"
+
 RDEPEND="wireshark? ( net-analyzer/wireshark )
 	ncurses? ( sys-libs/ncurses )
 	net-libs/libpcap
 	dev-libs/glib"
 DEPEND="${RDEPEND}"
 
-src_compile () {
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i \
+		-e '/^gentoo_ltmain_version=/s|:space:|[:space:]|g' \
+		$(find -name configure) || die #349770
+}
+
+src_configure() {
 	econf \
 		$(use_enable ncurses curses) \
 		$(use_enable wireshark wtap) \
 		--without-internal-wiretap \
-		--with-wtap_path=/usr/include/wiretap \
-		|| die "econf failed"
-	emake || die "emake failed"
+		--with-wtap_path=/usr/include/wiretap
 }
 
-src_install () {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS BUG-REPORT-ADDRESS ChangeLog FAQ NEWS THANKS TODO doc/*
+src_install() {
+	default
+	dodoc BUG-REPORT-ADDRESS
 }