Respect LDFLAGS (bug #341767). Make sed die. Set RDEPEND.

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

4 files changed, 27 insertions, 17 deletions

diff --git a/net-analyzer/ipband/ChangeLog b/net-analyzer/ipband/ChangeLog
index f4fc9412a789..fff032018041 100644
--- a/net-analyzer/ipband/ChangeLog
+++ b/net-analyzer/ipband/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ipband
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ChangeLog,v 1.7 2009/01/15 05:38:51 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ChangeLog,v 1.8 2010/10/19 14:33:39 jer Exp $
+
+*ipband-0.8.1-r1 (19 Oct 2010)
+
+  19 Oct 2010; Jeroen Roovers <jer@gentoo.org> -ipband-0.8.1.ebuild,
+  +ipband-0.8.1-r1.ebuild, files/ipband-0.8.1-gentoo.patch:
+  Respect LDFLAGS (bug #341767). Make sed die. Set RDEPEND.
 
   15 Jan 2009; Jeroen Roovers <jer@gentoo.org>
   +files/ipband-0.8.1-gentoo.patch, ipband-0.8.1.ebuild:
diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
index bc9a9b7f6a06..a61a69538408 100644
--- a/net-analyzer/ipband/Manifest
+++ b/net-analyzer/ipband/Manifest
@@ -1,8 +1,8 @@
-AUX ipband-0.8.1-gentoo.patch 382 RMD160 e149f94283eed84b590d5ec4ae1a4877d278dbf0 SHA1 8cb41f1a6640f782fd1bb594e4841d22eec3d63c SHA256 0846145a101d069ad6435a9ef76b215fdbfd9b854e8389134ce79909c29af044
+AUX ipband-0.8.1-gentoo.patch 426 RMD160 c9d23c5970a79cdbda94f44d12d611b85c692b6c SHA1 2fa4cc3c551417563ee34b6041529a6ea63b92bb SHA256 dc2fa8f2b9ccbd2045734b7a857dd7fec5923780995c1043f05ac24bb28fb86b
 AUX ipband-init 561 RMD160 257a9e4e64693e63dfe76fc99556b55d15fac45f SHA1 32e406e675c68d0bac1d951faf8322355b821af0 SHA256 62d2fa20348140699d26388ca6787d13af79b8c0aa2d1bcba4abafbaa5d5d63d
 DIST ipband-0.8.1.tgz 36675 RMD160 6269e5273fb1506f655e0ca1f8ea8f357a7205ec SHA1 401bfa12f81e6a6c57f827bdb3d22445e33e2f64 SHA256 f0a5860647d5364df812f7660d28f1ee8fbd35eb27088ab0cd445963db5806ad
 DIST ipband-0.8.tgz 36378 RMD160 4b7889ce52edcab9b8eec9e478fd4bde3c019be9 SHA1 c5f99e0a300aaf99ddfea1e756b6a450b8559420 SHA256 21be87c2755d66d17eadacd4611dfe1bed7e0c0af9c71d2f26b13fc16f1a61cf
-EBUILD ipband-0.8.1.ebuild 1648 RMD160 e1dd213ce8c4444aeeb75cf2a4ff421cb1fd8ec1 SHA1 42a7adc69d063632c9b4bf9d9317fbb99e911aa9 SHA256 c63407656ecc8cf529098e67cb07c57fb965462e05f208fa102a3c24c8b0e038
+EBUILD ipband-0.8.1-r1.ebuild 1706 RMD160 bed5bb77d0b41af7fe50e0dc006b3d8b444ab3df SHA1 48a1f3c54425f431937ce38e46550429740df463 SHA256 a05c15426f1629dfbec8b19a61847b94ee6584532b73bae289a20c7030444d15
 EBUILD ipband-0.8.ebuild 1559 RMD160 b21faf196917cf96f3600469d27c5432a0e00773 SHA1 515919d4e6bac611faea07fbe80e566bfe8a9bee SHA256 dca3da880014332e48eac86bf6cfb79e2e7c802c1b6eb42a5a48e69a0eff0e20
-MISC ChangeLog 1130 RMD160 e9a5ff3f96743285555bc1e27cadf9c0d998f20e SHA1 610603eef0fa8a88a6be5f69399d1556b68980db SHA256 2e760843ebf39497012ee3664cd1698e38aab205f73c2c9245126a2689137f4c
+MISC ChangeLog 1352 RMD160 6a21e94eb6ef5775430359d92e699d84ba4243f1 SHA1 2e30b5003c8a7548f44271acb442cdf70987d2bb SHA256 0a6cb94e9548732eb5401d2b6e77dbede54b6078dfe0da3990e8077521f5f35a
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch b/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
index 439a6aa36e1b..0a5a39b21489 100644
--- a/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
+++ b/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
@@ -1,5 +1,5 @@
---- ipband-0.8.1/Makefile.orig	2008-06-17 19:23:19.000000000 +0200
-+++ ipband-0.8.1/Makefile	2009-01-15 06:33:07.000000000 +0100
+--- Makefile.orig	2008-06-17 19:23:19.000000000 +0200
++++ Makefile	2010-10-19 16:23:35.000000000 +0200
 @@ -12,7 +12,6 @@
  CPPFLAGS=-I/usr/include/pcap
  LIBS=-lpcap
@@ -8,11 +8,13 @@
  
  ifndef PREFIX
  PREFIX=/usr
-@@ -50,7 +49,6 @@
+@@ -49,8 +48,7 @@
+ all: 	$(BIN)
  
  $(BIN):	$(OBJ_C)
- 	$(CC) -o $(BIN) $(OBJ_C) $(LIBS) $(CFLAGS)
+-	$(CC) -o $(BIN) $(OBJ_C) $(LIBS) $(CFLAGS)
 -	strip $(BIN)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ_C) $(LIBS)
  
  install-strip:	install
  
diff --git a/net-analyzer/ipband/ipband-0.8.1.ebuild b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
index bc3bbf005352..c126d31bead0 100644
--- a/net-analyzer/ipband/ipband-0.8.1.ebuild
+++ b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
@@ -1,6 +1,8 @@
-# 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-analyzer/ipband/ipband-0.8.1.ebuild,v 1.2 2009/01/15 05:38:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ipband-0.8.1-r1.ebuild,v 1.1 2010/10/19 14:33:39 jer Exp $
+
+EAPI="2"
 
 inherit eutils toolchain-funcs
 
@@ -14,15 +16,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=net-libs/libpcap-0.4"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# Provide a postfix MTA string in the author's ipband.conf example
-	sed -rie 's:(#mtastring.*):# Sendmail\n\1\n# Postfix\n#mtastring "/usr/sbin/sendmail -t":g' \
-		"${S}"/ipband.sample.conf
+	sed -ri ipband.sample.conf \
+		-e 's:(#mtastring.*):# Sendmail\n\1\n# Postfix\n#mtastring "/usr/sbin/sendmail -t":g' \
+		|| die "sed ipband.sample.conf"
 
-	# Do not strip and do use toolchain
+	# Do not strip, and do respect CC, LDFLAGS
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }