Add flag unicode and fix cross-compile

Package-Manager: portage-2.1.1-r1

3 files changed, 24 insertions, 14 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index b8228fc6b932..7d16f63550eb 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.48 2006/11/14 20:25:34 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.49 2006/11/15 23:06:53 cedk Exp $
+
+  15 Nov 2006; Cedric Krier <ced@ced.homedns.org> iptraf-3.0.0-r3.ebuild:
+  Add flag unicode and fix cross-compile
 
 *iptraf-3.0.0-r3 (14 Nov 2006)
 
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index 9d22aef34145..7694fe046782 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -62,18 +62,18 @@ EBUILD iptraf-3.0.0-r2.ebuild 1918 RMD160 5e8e54ca063789dc9dd7143a7120d3bbc1ff06
 MD5 4828f6da3eea30da472cdeb31654b213 iptraf-3.0.0-r2.ebuild 1918
 RMD160 5e8e54ca063789dc9dd7143a7120d3bbc1ff0682 iptraf-3.0.0-r2.ebuild 1918
 SHA256 85a4d012aa98618c183b9cc1819b84b3e694cd99c0f40bcf0128e011490ddc28 iptraf-3.0.0-r2.ebuild 1918
-EBUILD iptraf-3.0.0-r3.ebuild 2021 RMD160 835fb15cc97812886d58d7bdc59f7b4cd791c10d SHA1 4d0b15f575082d89b17e202c4417902959367416 SHA256 3032f8e47fa2ff057dc61cec3c804fa786a2a4843adfc87cf5e0651acbb21abe
-MD5 153fe41036086706e882814be4886494 iptraf-3.0.0-r3.ebuild 2021
-RMD160 835fb15cc97812886d58d7bdc59f7b4cd791c10d iptraf-3.0.0-r3.ebuild 2021
-SHA256 3032f8e47fa2ff057dc61cec3c804fa786a2a4843adfc87cf5e0651acbb21abe iptraf-3.0.0-r3.ebuild 2021
+EBUILD iptraf-3.0.0-r3.ebuild 2277 RMD160 1697118978ccf2131cadf7cc4eb2d2b4611ec80b SHA1 14f8ea447e50f7eeb5386873fd6de2ac8bae99c3 SHA256 8975b6f01daaec2afc5577de6184aa209647a69bf76fb9d2ad9ab4fcddeb0e4d
+MD5 ff421ecb9ed75076d93ccdd61089d8ee iptraf-3.0.0-r3.ebuild 2277
+RMD160 1697118978ccf2131cadf7cc4eb2d2b4611ec80b iptraf-3.0.0-r3.ebuild 2277
+SHA256 8975b6f01daaec2afc5577de6184aa209647a69bf76fb9d2ad9ab4fcddeb0e4d iptraf-3.0.0-r3.ebuild 2277
 EBUILD iptraf-3.0.0.ebuild 1159 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32 SHA1 4d8359fb8ed9abb73789494f6da84612ad453108 SHA256 eab8f746729101314443f0494c0d65255ef6b15f84329be84520af085acf88a0
 MD5 31ec4dadb0b55040e589c0048b14298b iptraf-3.0.0.ebuild 1159
 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32 iptraf-3.0.0.ebuild 1159
 SHA256 eab8f746729101314443f0494c0d65255ef6b15f84329be84520af085acf88a0 iptraf-3.0.0.ebuild 1159
-MISC ChangeLog 6710 RMD160 171a1f84e7c37fd7f84e0e44c5588a3a4bd06bec SHA1 fa9a7a39d53f5593c6bde85f97774ceb0d0db9f2 SHA256 7cd1feacdd8e1160067c6bf727cf980433113b04b26f752aa1795bd27955860a
-MD5 2823872f0a72a1c28797a73a2e53e270 ChangeLog 6710
-RMD160 171a1f84e7c37fd7f84e0e44c5588a3a4bd06bec ChangeLog 6710
-SHA256 7cd1feacdd8e1160067c6bf727cf980433113b04b26f752aa1795bd27955860a ChangeLog 6710
+MISC ChangeLog 6826 RMD160 0c5def7572114d1998e608d9a6d6e86eeeefb71e SHA1 c8634e549ce503fc07e548fc9b2035701bb10804 SHA256 d158b1cb59ed5df6b2b0228b9963ca5cff6cd855dbe55f35cb4425c62b1a8fca
+MD5 fc956395ce58c2efb8c1f4ddcd955f85 ChangeLog 6826
+RMD160 0c5def7572114d1998e608d9a6d6e86eeeefb71e ChangeLog 6826
+SHA256 d158b1cb59ed5df6b2b0228b9963ca5cff6cd855dbe55f35cb4425c62b1a8fca ChangeLog 6826
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
 MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236
 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 metadata.xml 236
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild
index 52eb1445b8eb..4312fa5a184f 100644
--- a/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/11/14 20:25:34 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild,v 1.2 2006/11/15 23:06:53 cedk Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
 HOMEPAGE="http://iptraf.seul.org/"
@@ -12,10 +12,17 @@ SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 suid"
+IUSE="ipv6 suid unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2-r1"
 
+pkg_setup() {
+	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
+		eerror "sys-libs/ncurses must be build with unicode"
+		die "${PN} requires sys-libs/ncurses with USE=unicode"
+	fi
+}
+
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -25,7 +32,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-bnep.patch
 	epatch ${FILESDIR}/${P}-Makefile.patch
 	# bug 152883
-	epatch "${FILESDIR}/${P}-ncursesw.patch"
+	use unicode && epatch "${FILESDIR}/${P}-ncursesw.patch"
 	epatch "${FILESDIR}/${P}-setlocale.patch"
 
 	# bug 128965
@@ -53,7 +60,7 @@ src_compile() {
 	if use suid ; then
 		append-flags -DALLOWUSERS
 	fi
-	emake CFLAGS="$CFLAGS" -C src || die "emake failed"
+	emake CFLAGS="$CFLAGS" CC="$(tc-getCC)" -C src || die "emake failed"
 }
 
 src_install() {