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.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 45 insertions, 21 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/Manifest b/net-wireless/wifiscanner/Manifest
index 6a19d1536ce8..7f68603a6ffa 100644
--- a/net-wireless/wifiscanner/Manifest
+++ b/net-wireless/wifiscanner/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST WifiScanner-1.0.1.tar.gz 891399 RMD160 e6cc22bfa7d4fb239552b5e026d9e032be2be024 SHA1 6c523a3b5624e603569862d08b6421b81e02d2e9 SHA256 3c5bafd06589337c7c26c447a35d3c1023459449b59327f5169a20feb2f30ebb
 EBUILD wifiscanner-1.0.1-r1.ebuild 992 RMD160 bbaf2db390fabafbdc74ead254c9d7280c2c6f83 SHA1 eae84209664699bc0fda38ac5903b708c50c8ad4 SHA256 3906109da9e93ba3b0c2991444a02c11a04b125507858ad67cea78e942abcacd
-EBUILD wifiscanner-1.0.1-r2.ebuild 1040 RMD160 ab83ffd44064d5da4c32a31f577c4159736a1c17 SHA1 8357e6429330da81ecb23da8c0eab138dbd5b705 SHA256 a1748c2cca9f06bfff6e1aded8588bbd43b2ba1e5435c4171598254955a97d5e
-MISC ChangeLog 2031 RMD160 c6551c186cec08965df4a70d0a19f72064ec2598 SHA1 7437e22460d1d7b86cb1a280c11b2b34cf479c80 SHA256 132c55a1d73ce85ff8d413578fb8a6726ca958ad9b6c195d2800ae9f7ccc11a6
+EBUILD wifiscanner-1.0.1-r2.ebuild 1047 RMD160 864a8ea2dd7be55aa885d90349741e5d82b3fe19 SHA1 83d69c150f7db5ee0a1b2cae10f2caae3e034eb1 SHA256 4365c208ffddc2de302f61c20ee6003f1ccf96151310f3fa051baad4b73430ce
+MISC ChangeLog 2251 RMD160 baf218768d85f0a7d8cf3ad28422d97a4005af6c SHA1 90829fbec334c95563ce45f76e1e9063ab073975 SHA256 92b9b6f5743e21fb07d7046b0e5359c2efc2cfdd2bee7d80bfd3d9cee705f95c
 MISC metadata.xml 260 RMD160 265964dc96631aed1449e70bb39e01752e726e0a SHA1 d15bb73ffcc4bc4d0c52d07ce5342631e6ceba3a SHA256 d64efea6619c219584b595455b57ebb2e504f4a6014837cf98562de554290881
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2XG4QACgkQXkR9YqOcLPGzXQD/ZulvO1MWQ7vYWBCrDtOtABG1
-AhpzPCUX/PtHQgi7ULkBAKl7I6OS7LNpb28ZuooSX+/8zYoL5QPwxaD+DilJw2MC
-=Crsq
+iQIcBAEBAgAGBQJPERJ5AAoJELEHsLL7fEFWQ2UP/2AF+R6T6sTyZaGFOgqdTVQu
+3LkA/o9hOAQHHuWysdaRe2yhjWBKw03W+GsuiJ6S9S7jBHibqty+LXoH9CkbNLCJ
+Km25lWWVCZkVVZdL7/AVlOrXnwoxavA9VoY33cF32PIPGOTv2XmC+F1NnJwI/lf5
+blDXWQiJPT/9FerM6XC/FA1NJhEiwAlnrsBpYrjTplZSQky2pN97pIPw/1dLEquc
+qhvIxwMHfFr4DXzO12CfkfqdnWl/gYMaIaPK4cW5wZgvh0cryJBFuaMNlIb7vsaS
+hcw3QTbgVoLHUqaILTK2548E+cNWS4wEQuonr2snTtB47zU9aIjjBWPq/L9Z39xc
+MsRREKm0Cmq8pflgsmto25wNSb/ui4JSfcLGrltoOvhUjd9TsAUAsO8CMAZN6HOL
+Pfhc871KEtMLMjWB0TNEOhiHZss6rRcQJDZNGIxTz0PRUd00NwtvYYqV7u7/jJ3g
+Pcp71EK7EZ4DY4ZFRnBb1PkeANTK3bLT2gfgRw7Kl8QXGxvZCzeYLRFaKUnNz9xy
+OmW5XZYYsx8SRJby0UROAkLe1lNX2WiZFBVTbewGAKaNnRegvoKNrOh9Qlxt2v16
+4zoKLiwCFJfKFNhoMgydVCefZjP0qJAVbJeXvGgS7T3XfgcLEavkXZ5+6d5jXsLE
+HdJavF6nxtCeFytGo1o8
+=MCVY
 -----END PGP SIGNATURE-----
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
 }