Made package honour user LDFLAGS, see bug #290840.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

diff --git a/net-analyzer/ethstatus/ChangeLog b/net-analyzer/ethstatus/ChangeLog
index d64e7831258bedf8cac2da571a6635b5f8d94b9a..89d5ab95c745dbc63a96bc8956365908a713af68 100644 (file)
--- a/net-analyzer/ethstatus/ChangeLog
+++ b/net-analyzer/ethstatus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ethstatus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethstatus/ChangeLog,v 1.8 2008/11/24 09:55:13 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethstatus/ChangeLog,v 1.9 2010/03/11 14:07:28 s4t4n Exp $
+
+  11 Mar 2010; Michele Noberasco <s4t4n@gentoo.org> ChangeLog:
+  Made package honour user LDFLAGS, see bug #290840.
 
   24 Nov 2008; Michele Noberasco <s4t4n@gentoo.org> ChangeLog:
   Fixed LDFLAGS ordering, see bug #247926.

diff --git a/net-analyzer/ethstatus/Manifest b/net-analyzer/ethstatus/Manifest
index a84ee07389e3b3d63445f306b2940341b3c1e76a..6a716d8098bde84c105ce037b37ef1733419e5f6 100644 (file)
--- a/net-analyzer/ethstatus/Manifest
+++ b/net-analyzer/ethstatus/Manifest
@@ -1,4 +1,4 @@
 DIST ethstatus_0.4.2.orig.tar.gz 17012 RMD160 f33b1922e4afe103c2efd8f51746809fed5e6b48 SHA1 b67abb88aef202b4a9d7f04f43522dbf0eb7d0bf SHA256 8d363f9c8ed41c87a7194d8aebc3d1620d37989cf891b784277f235b866832d4
-EBUILD ethstatus-0.4.2-r2.ebuild 886 RMD160 6846b9ce82741cffd7c5cba22151702e10a3b6bf SHA1 8ff88e6afe09cf45144a8c1779a47d8cf4e674f7 SHA256 ef92c6ad4bcb4cc19d4ea90d8ec2032d1ce65d8933745100fb8549c7fb1b5a8c
-MISC ChangeLog 990 RMD160 a91ca60ec3f49d3fc3b2e065bf178a080ad99eeb SHA1 a320280381b43f418ffa922be9285714e6a77e0a SHA256 1566122870e3ff6ad195036a7ffe8ceeaabf622171747d59d41c2b1d951ae4a6
+EBUILD ethstatus-0.4.2-r2.ebuild 1021 RMD160 51ddf26d3201b40315e0b9a1b7dec1ae5eaef6c0 SHA1 7110ec5cd5274a1a3e0d9a4c731dbed6a5419fbe SHA256 955eb6d1da8a110d1ce637baef32ddbf5d45b8324a7c978f952f11a2cd137d0d
+MISC ChangeLog 1107 RMD160 554b49dfb7eff6d1b2954371f6ac65e26eaadfe3 SHA1 730ce8a3aff094f6aabe199bcc3173394c93f392 SHA256 238c5001d9907b83c60b8523b8af9a605a2280a64aef6dc5413e62cd5da46edf
 MISC metadata.xml 219 RMD160 53c5b6ced1a5e7d479271bdc4c845fa5de3ec5d6 SHA1 3636904e0928392fed8fb679c47cad2ee18ceadf SHA256 b58f534622be091b90d1c30e380a077ddc0f45fa9d34b99957f17840adcd9b90

diff --git a/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild b/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild
index 357cffb81fc76aa9e3536f01f51eab886c283a66..3dd5ae6414136ebccd0b6fd1335e603a1cac117a 100644 (file)
--- a/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild
+++ b/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/ethstatus/ethstatus-0.4.2-r2.ebuild,v 1.7 2008/11/24 15:57:54 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild,v 1.8 2010/03/11 14:07:28 s4t4n Exp $
 
 DESCRIPTION="ncurses based utility to display real time statistics about network traffic."
 HOMEPAGE="http://ethstatus.calle69.net/"
@@ -20,8 +20,11 @@ src_unpack()
 {
        unpack ${A}
 
-       #Fix LDFLAGS ordering, see bug #247926
-       sed -i 's/$(LDFLAGS) -o ${BIN} ${SRC}/-o ${BIN} ${SRC} $(LDFLAGS)/' "${S}/Makefile"
+       #Make it honour user LDFLAGS, see bug #290840 (part 1)
+       sed -i 's/LDFLAGS = -lncurses//' "${S}/Makefile"
+
+       #Fix LDFLAGS ordering, see bug #247926, #290840 (part 2)
+       sed -i 's/$(LDFLAGS) -o ${BIN} ${SRC}/-o ${BIN} ${SRC} $(LDFLAGS) -lncurses/' "${S}/Makefile"
 }
 
 src_compile()