Respecting user CFLAGS and allow cross-compile, thanks to Josu Lopez Fernandez <zamorate@zamorate.net> wrt bug #127013

(Portage version: 2.1_pre7-r1)

4 files changed, 46 insertions, 16 deletions

diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog
index 7afbcec2830b..2b3cfe6b81ed 100644
--- a/net-analyzer/vnstat/ChangeLog
+++ b/net-analyzer/vnstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/vnstat
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.11 2005/12/03 19:22:32 tgall Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.12 2006/03/26 23:24:11 jokey Exp $
+
+  26 Mar 2006; Markus Ullmann <jokey@gentoo.org> vnstat-1.4.ebuild,
+  vnstat-1.4-r1.ebuild:
+  Respecting user CFLAGS and allow cross-compile, thanks to Josu Lopez
+  Fernandez <zamorate@zamorate.net> wrt bug #127013
 
   03 Dec 2005; Tom Gall <tgall@gentoo.org> vnstat-1.4-r1.ebuild:
   stable on ppc64
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index e4935a120dc7..5760a7d6b7d2 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,10 +1,30 @@
-MD5 d8fb5b52f1f2a087af383f17846e65ca ChangeLog 1580
-MD5 432c6dc3dfd22b4c6657ddcc6c37979e metadata.xml 271
-MD5 eb0a408331b471c0ce66781c2cf44ada vnstat-1.1.ebuild 645
-MD5 1cb94c932ed75b438fb1483b9f7d68f8 vnstat-1.4-r1.ebuild 1857
-MD5 596e113e2623121b8b54f9398a7a9192 vnstat-1.4.ebuild 1741
+MD5 56021ecc4eb871c21c5aa579347050e3 ChangeLog 1796
+RMD160 3aeba7da97476cb0fc4f6be1b666f3050346f21f ChangeLog 1796
+SHA256 0e2e89f5239a477ccf95a069198f3d3c1c656cf8d87dd0b4a14cfaa85f7228d7 ChangeLog 1796
 MD5 afdaa51d96e363c56fe7358b1c5814c5 files/digest-vnstat-1.1 61
+RMD160 779e16556754a405255abce8fb65995a0f96fd36 files/digest-vnstat-1.1 61
+SHA256 078ce20df1deffb34022345c24509431357efcd2db4c13f571db5ce2719b1be0 files/digest-vnstat-1.1 61
 MD5 94dd735fdba2070fefd9f85480b1a2b9 files/digest-vnstat-1.4 61
+RMD160 497494309fc78ed2acd4e521a2b14f85105b862d files/digest-vnstat-1.4 61
+SHA256 fb1829d35d403283c02c8007e9a1f73208e6386f3f7a575d3648036704cfa8fd files/digest-vnstat-1.4 61
 MD5 94dd735fdba2070fefd9f85480b1a2b9 files/digest-vnstat-1.4-r1 61
+RMD160 497494309fc78ed2acd4e521a2b14f85105b862d files/digest-vnstat-1.4-r1 61
+SHA256 fb1829d35d403283c02c8007e9a1f73208e6386f3f7a575d3648036704cfa8fd files/digest-vnstat-1.4-r1 61
 MD5 9330b188606445c3e0a9a90731ced54d files/vnstat-1.4-long_iface_name.patch 1260
+RMD160 f6fa0b3908d0110cd5607cc4ad78d6413ba32c7a files/vnstat-1.4-long_iface_name.patch 1260
+SHA256 a9a0315663092ebda3b45a5e999d66b81175ee9577e159fbaa087f4998039f22 files/vnstat-1.4-long_iface_name.patch 1260
 MD5 389e6b2723965358ef9876b4e78d3bfc files/vnstat.cron 220
+RMD160 124b6157c62cbb853d72e9d6e556fc38d3d51d54 files/vnstat.cron 220
+SHA256 b6b437c680606061b98af19758cbacc3f883f73cd86f0bbfbcfe756c982cd3fd files/vnstat.cron 220
+MD5 432c6dc3dfd22b4c6657ddcc6c37979e metadata.xml 271
+RMD160 0f0d1bef8141a4ae01d9715ad405664bed07f19d metadata.xml 271
+SHA256 872f3e714878c148774970a491b760e6f3f547d3e76e79c1f54d0dcb1ed65161 metadata.xml 271
+MD5 eb0a408331b471c0ce66781c2cf44ada vnstat-1.1.ebuild 645
+RMD160 387fa6b34c99a33f845ff42112db460caa3a5ccf vnstat-1.1.ebuild 645
+SHA256 44790363cf20726bda71f9fe16726b3fdb900cb420ee57aa8cd3c887f525cdb8 vnstat-1.1.ebuild 645
+MD5 17c4280121d09abb0582bb181fcac969 vnstat-1.4-r1.ebuild 2001
+RMD160 ec9b49448da6948ac5d3ac77e3b4f23191277565 vnstat-1.4-r1.ebuild 2001
+SHA256 be93a0c621a4c311d32f2d8a48052061d6d3e77336a06aa1784509a6a423c94b vnstat-1.4-r1.ebuild 2001
+MD5 da1ac7025c27887dcc060d2cd886d7c7 vnstat-1.4.ebuild 1742
+RMD160 5a2e0e5be4dd1540ca0e598e8cacce72d540fb9f vnstat-1.4.ebuild 1742
+SHA256 88debd1cac07dd9318b5b0c3fee716bcb3f9a8a3924547dd7fb606476c0d05fa vnstat-1.4.ebuild 1742
diff --git a/net-analyzer/vnstat/vnstat-1.4-r1.ebuild b/net-analyzer/vnstat/vnstat-1.4-r1.ebuild
index 909d6bccb781..e6821d9aa612 100644
--- a/net-analyzer/vnstat/vnstat-1.4-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4-r1.ebuild,v 1.2 2005/12/03 19:22:32 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4-r1.ebuild,v 1.3 2006/03/26 23:24:12 jokey Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="http://humdi.net/vnstat/"
@@ -19,10 +19,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-long_iface_name.patch
+	sed -i \
+		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS}:" \
+		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
+		src/Makefile || die "sed failed"
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
+	emake || die
 }
 
 src_install() {
@@ -30,12 +34,13 @@ src_install() {
 
 	dobin src/vnstat || die
 	exeinto /etc/cron.hourly
-	doexe "${FILESDIR}"/vnstat.cron vnstat
+	newexe ${FILESDIR}/vnstat.cron vnstat
 	doman man/vnstat.1
 
 	newdoc pppd/vnstat_ip-down ip-down.example
 	newdoc pppd/vnstat_ip-up ip-up.example
-	dodoc CHANGES INSTALL README UPGRADE FAQ
+	dodoc CHANGES README UPGRADE FAQ
+	newdoc INSTALL README.setup
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/vnstat/vnstat-1.4.ebuild b/net-analyzer/vnstat/vnstat-1.4.ebuild
index 7f5d7df89329..70fecbdbadd2 100644
--- a/net-analyzer/vnstat/vnstat-1.4.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4.ebuild,v 1.10 2005/03/03 00:46:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4.ebuild,v 1.11 2006/03/26 23:24:12 jokey Exp $
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="http://humdi.net/vnstat/"
@@ -22,7 +22,7 @@ src_install() {
 
 	dobin src/vnstat || die
 	exeinto /etc/cron.hourly
-	doexe ${FILESDIR}/vnstat.cron vnstat
+	newexe ${FILESDIR}/vnstat.cron vnstat
 	doman man/vnstat.1
 
 	newdoc pppd/vnstat_ip-down ip-down.example