Respect CFLAGS for real (#241096)

Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686

5 files changed, 31 insertions, 7 deletions

diff --git a/net-wireless/wavemon/ChangeLog b/net-wireless/wavemon/ChangeLog
index 1a1bfbf5f039..2ecf3ffae31e 100644
--- a/net-wireless/wavemon/ChangeLog
+++ b/net-wireless/wavemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wavemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.30 2011/01/26 10:20:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.31 2011/01/26 19:14:01 bangert Exp $
+
+  26 Jan 2011; Thilo Bangert <bangert@gentoo.org> wavemon-0.6.7.ebuild,
+  +files/wavemon-0.6.7-dont-override-CFLAGS.patch, wavemon-0.7.1.ebuild:
+  Respect CFLAGS for real (#241096)
 
   26 Jan 2011; Thilo Bangert <bangert@gentoo.org> -wavemon-0.3.3.ebuild,
   -wavemon-0.4.0b-r1.ebuild:
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index fe6179f2b7f4..3389d60033fb 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,13 +1,14 @@
 AUX wavemon-0.4.0b-asneeded.patch 415 RMD160 7c51a702a65b7b1cad9bcf700afabb9190e2abd5 SHA1 df86081b2e1a956fbfca6a7acce379bf8cace7f2 SHA256 a7ce10e11545506f5c7905bf3472f8e135330ae4d93021056b75eebed0f26971
 AUX wavemon-0.4.0b-includes.patch 309 RMD160 8924078b63ce2e8a0ad84ad49ad1294ae68ed3ff SHA1 b1cbb02703557ab72c44cb395a4c97f3ebdcdb70 SHA256 d641dfbdb67eebb36c156538459b4bca0b9c6304cffb40367973d134d2c21e11
 AUX wavemon-0.6.7-as-needed.diff 430 RMD160 8b280cbef462986d6c240341f92b171fe5010357 SHA1 05c4da8074beffe6a2eaf8d66b5407ed95558c41 SHA256 a2d48a1703d97ccd3e539d98c70b3e93b4d30d35a0ced4f5df7e3c60ba46de1e
+AUX wavemon-0.6.7-dont-override-CFLAGS.patch 368 RMD160 21c93246a179d4b9fcc97785c6522d1b3b268a51 SHA1 ebaabd9e97acbfc1c6af23d9e18a44da497d38ed SHA256 76e8bbe3b3f8799e1445eafca9fd13d4b7fe31a0b8c1cf7f2e89783a1dbaef0a
 AUX wavemon-gcc-fixes.patch 2147 RMD160 2d9942022595c6ff0fe48bacee46316cf1d31538 SHA1 6cca474c91ad7528995f6e03e108dcd13ea7a75b SHA256 030d79e605d8217281b9cdeecaf241dc2bc9fa8b8c7acb518d4c7aca53db05bd
 DIST wavemon-0.4.0b.tar.gz 71540 RMD160 91ae1eab82de15b91863ea3e714c8f6f9b08bc0b SHA1 59629c71381c4c318685d66021065c7b7eaa50d2 SHA256 4e8dba564f22cdd593df541257b487cd03c599e4591c4a7eb692b015adc594cd
 DIST wavemon-0.6.7.tar.bz2 100130 RMD160 90e25b3d674dd71780dbf9ebefa2bb33acb6dc3a SHA1 9995539764384509f7c30327993ba64a275042f2 SHA256 e858617cb2223d4259f3d0acbe79f09005fcca98b8314453257fa6f43d7ff567
 DIST wavemon-0.7.1.tar.bz2 110586 RMD160 58f35db5d7df4fee2c25fa2e141204993ad7bb1f SHA1 29d51de9ab68f4d97a9bea0f95619b2d16f8146b SHA256 dd2ac3c1babf7edb73f6f3824a9cc65351b607f8620fd916e257a5ff9227c9a7
 EBUILD wavemon-0.4.0b-r2.ebuild 1131 RMD160 27de4021d2ffca858c70bc80f8b700cdc209e44d SHA1 affe48ea2b83d4dbf93d32774b3b9b5cd4a51658 SHA256 349eb97e28134cab0958da99256cbb3cb0989c8e0d804567c818014192137bd4
 EBUILD wavemon-0.4.0b.ebuild 872 RMD160 77d9f9dafef5f79620a3af825faecf8cc2cb5d81 SHA1 a5eccd64846ac676be676f1f30070673224a04f8 SHA256 605a47c2217d0ca056ac36adbf3e3e73475f130445a2747391404ce50dbd3a73
-EBUILD wavemon-0.6.7.ebuild 765 RMD160 1d5a5012fe7a1df1a2c48a65f089011cbd6637f4 SHA1 f86f77f9465df719c8b41054d2dc24b453a6570c SHA256 d45a18d31176f85716aa1579246ff1072a727f85f0b16c93a044f744461d3224
-EBUILD wavemon-0.7.1.ebuild 674 RMD160 5df8fd28cc4b057090d203dababbce4c36614e4a SHA1 1f1f93585c9e10d787d3a2a1f5ca7e8a1c76d48f SHA256 e98a4cc11e4a8f8af16d39e20c3355775b534173a6cd304cb8e29f0b90c77e32
-MISC ChangeLog 3899 RMD160 75ca07d7a0d66ec8c28156250ce8b7e7754b0786 SHA1 ffe3428d6fad6de6257385df1658823dadddc86d SHA256 ddb18d71979626dfe4cca666c8abe94c5051a4356b2165d26f07043e99173180
+EBUILD wavemon-0.6.7.ebuild 821 RMD160 eb43f46adee22c1da07b7109f8c4cfdb7588e283 SHA1 48a5b18f470d7ea8d03c5b29e54d490d23af6767 SHA256 102b9e320cf2ba00196a250a2f548232159abd396a474616294f87650924a5de
+EBUILD wavemon-0.7.1.ebuild 786 RMD160 e1d12f76a70d351d9896469428445061715f168b SHA1 65bf1d313c3c7d3084223bcab4f83cdcac8d298c SHA256 300ac774104be52455fb6917d087bb0e7ec54324ca42c8fb1fbcb35947feb35c
+MISC ChangeLog 4081 RMD160 9ba907391a75eb453d513635a4e47d3e3d6e5996 SHA1 2c37789be201b1d1e3e4968dacc7a4cf731e715c SHA256 75dbd93ea5578ce56ca229c8918ed39046e4b60e878ec00e3490427c05764bd1
 MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
diff --git a/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch b/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
new file mode 100644
index 000000000000..609c759c4aef
--- /dev/null
+++ b/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2011-01-26 15:59:05.000000000 +0100
++++ configure.ac	2011-01-26 15:59:17.000000000 +0100
+@@ -9,8 +9,6 @@
+ AC_DEFINE_UNQUOTED([BUILD_DATE], ["`/bin/date`"],
+ 		   [date wavemon was last configured and built])
+ 
+-CFLAGS="-O2 -Wall"
+-
+ # wavemon is only supported on Linux, warn user about futile compilations
+ AC_CANONICAL_HOST
+ case "$host_os" in
diff --git a/net-wireless/wavemon/wavemon-0.6.7.ebuild b/net-wireless/wavemon/wavemon-0.6.7.ebuild
index 6adde44bb664..285b31e3395d 100644
--- a/net-wireless/wavemon/wavemon-0.6.7.ebuild
+++ b/net-wireless/wavemon/wavemon-0.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.6.7.ebuild,v 1.2 2009/10/17 18:50:38 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.6.7.ebuild,v 1.3 2011/01/26 19:14:01 bangert Exp $
 
 EAPI="2"
 
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-as-needed.diff"
+	epatch "${FILESDIR}/${P}-dont-override-CFLAGS.patch"
 	eautoreconf
 }
 
diff --git a/net-wireless/wavemon/wavemon-0.7.1.ebuild b/net-wireless/wavemon/wavemon-0.7.1.ebuild
index 40eea966ccd0..38661909f0c6 100644
--- a/net-wireless/wavemon/wavemon-0.7.1.ebuild
+++ b/net-wireless/wavemon/wavemon-0.7.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.7.1.ebuild,v 1.1 2011/01/26 10:17:09 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.7.1.ebuild,v 1.2 2011/01/26 19:14:01 bangert Exp $
 
 EAPI="3"
 
+inherit autotools
+
 DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
 HOMEPAGE="http://eden-feed.erg.abdn.ac.uk/wavemon/"
 SRC_URI="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${P}.tar.bz2"
@@ -16,6 +18,11 @@ IUSE=""
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.7-dont-override-CFLAGS.patch"
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install \
 		|| die "make install failed"