Do not strip (bug #251978). Use toolchain. Use dobin.

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 35 insertions, 8 deletions

diff --git a/net-analyzer/ipband/ChangeLog b/net-analyzer/ipband/ChangeLog
index b3629b49adeb..f4fc9412a789 100644
--- a/net-analyzer/ipband/ChangeLog
+++ b/net-analyzer/ipband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ipband
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ChangeLog,v 1.6 2008/12/06 19:48:18 dertobi123 Exp $
+# 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 $
+
+  15 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/ipband-0.8.1-gentoo.patch, ipband-0.8.1.ebuild:
+  Do not strip (bug #251978). Use toolchain. Use dobin.
 
 *ipband-0.8.1 (06 Dec 2008)
 
diff --git a/net-analyzer/ipband/Manifest b/net-analyzer/ipband/Manifest
index fb78f56a223e..bc9a9b7f6a06 100644
--- a/net-analyzer/ipband/Manifest
+++ b/net-analyzer/ipband/Manifest
@@ -1,7 +1,8 @@
+AUX ipband-0.8.1-gentoo.patch 382 RMD160 e149f94283eed84b590d5ec4ae1a4877d278dbf0 SHA1 8cb41f1a6640f782fd1bb594e4841d22eec3d63c SHA256 0846145a101d069ad6435a9ef76b215fdbfd9b854e8389134ce79909c29af044
 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 1566 RMD160 8ed4446ac5807d60364d096ce285c15605bad7f4 SHA1 ceaa26b7169dca537cd4e8e453702085e595045f SHA256 afbb9fbb743014e43319210d4f5a71a85bad961d262de1d76e5853e088c4a389
+EBUILD ipband-0.8.1.ebuild 1648 RMD160 e1dd213ce8c4444aeeb75cf2a4ff421cb1fd8ec1 SHA1 42a7adc69d063632c9b4bf9d9317fbb99e911aa9 SHA256 c63407656ecc8cf529098e67cb07c57fb965462e05f208fa102a3c24c8b0e038
 EBUILD ipband-0.8.ebuild 1559 RMD160 b21faf196917cf96f3600469d27c5432a0e00773 SHA1 515919d4e6bac611faea07fbe80e566bfe8a9bee SHA256 dca3da880014332e48eac86bf6cfb79e2e7c802c1b6eb42a5a48e69a0eff0e20
-MISC ChangeLog 976 RMD160 d03f715975c3f9408ba10d6054812069821448a4 SHA1 7bad8731e435eaa42030ce691f0df5caab0e1e2e SHA256 a4d0432cd6a4573abac3cacf9ddd61a57fb94eb8d2bc274c7d2346f11303542b
+MISC ChangeLog 1130 RMD160 e9a5ff3f96743285555bc1e27cadf9c0d998f20e SHA1 610603eef0fa8a88a6be5f69399d1556b68980db SHA256 2e760843ebf39497012ee3664cd1698e38aab205f73c2c9245126a2689137f4c
 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
new file mode 100644
index 000000000000..439a6aa36e1b
--- /dev/null
+++ b/net-analyzer/ipband/files/ipband-0.8.1-gentoo.patch
@@ -0,0 +1,18 @@
+--- 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
+@@ -12,7 +12,6 @@
+ CPPFLAGS=-I/usr/include/pcap
+ LIBS=-lpcap
+ CFLAGS := -Wall $(CFLAGS)
+-CC=gcc 
+ 
+ ifndef PREFIX
+ PREFIX=/usr
+@@ -50,7 +49,6 @@
+ 
+ $(BIN):	$(OBJ_C)
+ 	$(CC) -o $(BIN) $(OBJ_C) $(LIBS) $(CFLAGS)
+-	strip $(BIN)
+ 
+ install-strip:	install
+ 
diff --git a/net-analyzer/ipband/ipband-0.8.1.ebuild b/net-analyzer/ipband/ipband-0.8.1.ebuild
index 9ff92e24921f..bc3bbf005352 100644
--- a/net-analyzer/ipband/ipband-0.8.1.ebuild
+++ b/net-analyzer/ipband/ipband-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.1 2008/12/06 19:48:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipband/ipband-0.8.1.ebuild,v 1.2 2009/01/15 05:38:51 jer Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A pcap based IP traffic and bandwidth monitor with configurable reporting and alarm abilities"
 HOMEPAGE="http://ipband.sourceforge.net/"
@@ -21,16 +21,20 @@ src_unpack() {
 	# 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
+
+	# Do not strip and do use toolchain
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
+	tc-export CC
 	emake || die "Compile problem"
 }
 
 src_install() {
 	doman ipband.8
 	dodoc CHANGELOG README
-	exeinto /usr/bin ; doexe ipband
+	dobin ipband
 	newinitd "${FILESDIR}"/ipband-init ipband
 	insinto /etc/ ; newins ipband.sample.conf ipband.conf
 }