Fix whitespace. Download ipv6 patch conditionally. Separate unpacking and patching (bug #291491 comment #3).

Package-Manager: portage-2.2_rc49/cvs/Linux i686

4 files changed, 17 insertions, 9 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index c20917122be9..c187db543fd4 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.75 2009/11/12 15:51:45 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.76 2009/11/12 16:03:51 jer Exp $
+
+  12 Nov 2009; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r4.ebuild,
+  iptraf-3.0.0-r5.ebuild:
+  Fix whitespace. Download ipv6 patch conditionally. Separate unpacking and
+  patching (bug #291491 comment #3).
 
   12 Nov 2009; Tiago Cunha <tcunha@gentoo.org> iptraf-3.0.0-r5.ebuild:
   stable sparc, bug 291491
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index 878f4fbcb938..c5632ed7e7e5 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -13,7 +13,7 @@ AUX iptraf-3.0.0-setlocale.patch 474 RMD160 dafa0ce1dce44c1108c1a8e76ce03cde0a91
 AUX iptraf-3.0.0-vlan.patch 1090 RMD160 4bb6b575537a924e2561419732202274e433cf0b SHA1 e958027df27996a867b0f095efbd43ca669ab7d6 SHA256 33e127970c581d88d001b68090242e6ed4ea7581453cb844b75e831bc05fc130
 DIST iptraf-3.0.0-ipv6.patch.bz2 10069 RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 SHA1 f0032c78f72ba1c3fe7ecbb51135142fb7d3318c SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b
 DIST iptraf-3.0.0.tar.gz 575169 RMD160 aaef797076056d6b788a9c9eff29500060594526 SHA1 e5032b564593a8ec336751d41c090e5cdb7663a1 SHA256 9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163
-EBUILD iptraf-3.0.0-r4.ebuild 2108 RMD160 aacd37a3f942f25f13ad411ee11fa944f4bdb414 SHA1 893cf36bcb039be2b2a72c9456c16a7905a68520 SHA256 71a7ab0f6286337ed9b6465352f5378dd59faf64cbff8b16fcfd4cfb0b82448f
-EBUILD iptraf-3.0.0-r5.ebuild 2138 RMD160 afa1091c1f6cb25e55d668e2525c015a778540c1 SHA1 756785471cab30e6a0c98e2f4098b26bbc9eaf7c SHA256 c60215f0c645803e52c860b7fefe05cbf4f30204d0b088fafb85e7552e3191a8
-MISC ChangeLog 10249 RMD160 219e0cc55bd6eabba8bf45fd69eeb92e5fb10a54 SHA1 81b716f42d678fd7846305e44a5b9493494c2416 SHA256 083545b55b3a44ed74f31c7c6bb1cedd9c5036592f379fbe505c59204e10ddda
+EBUILD iptraf-3.0.0-r4.ebuild 2135 RMD160 fc44f70897c95fcda4db6f854a651e47a5235da8 SHA1 03e93b050ec764e41b1c9a6f209164717d734a64 SHA256 5ad84da70f9a28578e1af40dedbaadc9854f54c14372c95b54b3c142d6d32dc2
+EBUILD iptraf-3.0.0-r5.ebuild 2164 RMD160 f083b44fafc649c54a084843e096fa03af83a249 SHA1 b88802d2bc775c9d1bf8433f4880add60451124f SHA256 56c0d96c3e7139743b7c93d3427ecbb42666450fcdcae3e834529622281681d8
+MISC ChangeLog 10457 RMD160 e082edb73f448add1a94129a465a6b92dd720568 SHA1 f68f18fd7ee03488cfd00d2a59b51bda8b375c8d SHA256 d78aa7056808854d7b7350a76fb3cc98d2af6bf974f1430efab284279678a388
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild
index 77bf8f7bf14a..f4624e5bbcf6 100644
--- a/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild,v 1.11 2009/03/08 12:12:42 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild,v 1.12 2009/11/12 16:03:51 jer Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic toolchain-funcs
 DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
 HOMEPAGE="http://iptraf.seul.org/"
 SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
-	mirror://gentoo/${P}-ipv6.patch.bz2"
+	ipv6? ( mirror://gentoo/${P}-ipv6.patch.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,10 +22,11 @@ DEPEND=">=sys-libs/ncurses-5.2-r1
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
+}
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-Makefile.patch"
 	epatch "${FILESDIR}"/${P}-build.patch
-
 	epatch "${FILESDIR}"/${P}-add-devnames.patch
 	epatch "${FILESDIR}"/${P}-linux-headers.patch
 	# bug 152883
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
index 55270378e396..3305a5e5c570 100644
--- a/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild,v 1.9 2009/11/12 15:51:45 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild,v 1.10 2009/11/12 16:03:51 jer Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic toolchain-funcs
 DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
 HOMEPAGE="http://iptraf.seul.org/"
 SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
-	mirror://gentoo/${P}-ipv6.patch.bz2"
+	ipv6? ( mirror://gentoo/${P}-ipv6.patch.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +23,9 @@ RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
+}
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-Makefile.patch"
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-add-devnames.patch