Respect CFLAGS and CXXFLAGS, bug 372203

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 52 insertions, 23 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index c6de7118c322..5dce05c6bf76 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.106 2011/07/23 18:26:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.107 2011/08/21 09:45:32 dilfridge Exp $
+
+  21 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  fwbuilder-4.2.2.3541.ebuild, +files/fwbuilder-4.2.2.3541-flags.patch,
+  -files/fwbuilder-4.2.2.3541-ldflags.patch:
+  Respect CFLAGS and CXXFLAGS, bug 372203
 
   23 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
   fwbuilder-4.2.2.3541.ebuild:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 5978a524f7c0..8947675a4a37 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 3.0.7-secure-mktemp.patch 987 RMD160 612e42ee68253b7d248afd8b039d97e25db0713d SHA1 cb68c5339e28fd13aa3f1b8ca11a2ca76ebf0162 SHA256 02c0811786b268d609b9ecac5b78135c53d32752c1846c63f23716b5de2617a8
 AUX 4.x-qmake-use-LDFLAGS.patch 460 RMD160 e2ca41d40105ff63611019af3e9b15b5468fe5e6 SHA1 7b8d2482a00c5d109249815a3ae9f068cd27ece5 SHA256 56c62f025b01f6ecf6c298909c4f64f5890524f8688199187139e354e801ce30
 AUX fwbuilder-4.2.2.3541-ccache.patch 930 RMD160 c0dcb60e659c3dc055dc45cb57d8091979654d1e SHA1 c9ae9432a59d56162009374e15d2defd86bf186b SHA256 869dc70d8a63b819e275d93be615f88df5d1bd7b0427ecfb29d766738f55bc4e
-AUX fwbuilder-4.2.2.3541-ldflags.patch 456 RMD160 12ec2ea7f5b0b1ff63b07e726d0f3ed17e8005ea SHA1 f327ff39251edc9efda702fca4acc77ae6e1c8d8 SHA256 f0d5093eb2cd116dd6e65bf60584e9d31a21b80f65d1d40649fd8be7c464a970
+AUX fwbuilder-4.2.2.3541-flags.patch 845 RMD160 11cf1b9b7ba867762170a8ee346f1256c6683a0c SHA1 d9acaf1cc3d5a9a3523d0923fb013317b68ab796 SHA256 6eb882ae30cebfbd7b735aae0f357db4067930b52e33b134cea6bb07628ed5d6
 DIST fwbuilder-3.0.7.tar.gz 2486382 RMD160 c57150a3de136add28a48fbc3b79aa1006b46963 SHA1 c08411bcf5b686ef86e1da6f0954d8685bf49d61 SHA256 bb827f54a77c0f8a9b471200eda3801c9ff3f2a576647ca6a576e546e20ac254
 DIST fwbuilder-4.1.2.tar.gz 5872728 RMD160 47918905e36f587194d0cfee27c5d7fd0e1c3023 SHA1 823c1e7b0947db7bd713e076bb47dd9cf816ca58 SHA256 3eae607b06bc47f85241d952c3c9bce422625aaff7ec1d632ca0fae1c977b15c
 DIST fwbuilder-4.1.3.tar.gz 5683404 RMD160 9a33fd145b45b1d126a2ef4c198c797f4661b401 SHA1 612dbfd7cd669c2ef8889157ae3f8f00d28537fe SHA256 f8af490bc3a09124eb5ac6ce1157366530cb516cf856a398b6ece819b6e6643e
@@ -12,15 +12,23 @@ DIST fwbuilder-4.2.2.3541.tar.gz 6830864 RMD160 8c79580460d7d6a93d7c0e620e39685a
 EBUILD fwbuilder-3.0.7.ebuild 1835 RMD160 77fea53ba44fc9d26f8f8a35ea96035cfcaad1d5 SHA1 591e62bbf5dbacf8082f47aac32296b8d3921db4 SHA256 72bc754228dbcd6b0b83048867e23cc124dd1e8829828f20ae49fb60251efa9a
 EBUILD fwbuilder-4.1.2.ebuild 1276 RMD160 fa3f31fc5bf3a0e2ac858f8d7defa24ec1d131fe SHA1 b2a719cdfd00a5eebc2ba6ec7e49b171cfedb7db SHA256 eaaa907c784d47efda46589194bcb3d58d69a7e7ca8e8bade5b1fec3e5a3c7d0
 EBUILD fwbuilder-4.1.3.ebuild 1276 RMD160 41f2e54a356e7096c38c0be1d966e067794934af SHA1 dd232702d6556036037b0a4276f0f0616784c81b SHA256 fe1091892926afdd2af7fd46a23cd98b4a4b07c81ade0063b499b4c30403f2c9
-EBUILD fwbuilder-4.2.2.3541.ebuild 1250 RMD160 79420c132f71896430b1379978e57a46bc9c243b SHA1 716957fbb08447c549202ef4dcc020ed25d935db SHA256 17cd818d25a7080025e858b98f56ade4f9e5d6abebd268f6c055ca3b5ec8fde0
-MISC ChangeLog 17340 RMD160 a7cbb8550fc11e8c3d6a8676cd447c254e9e5a21 SHA1 bff6404593e1b7c88199934b547aad7948c046fe SHA256 063b496d68bb963ebfb3ea440e160b0aa90cd3b521b4b0ae56ad988383cee865
+EBUILD fwbuilder-4.2.2.3541.ebuild 1247 RMD160 0b70fd4dea811f59aa603cd44593f7aedc333fa6 SHA1 0f94e0f9c3841eb32d2f50d2e6594be572f59bf0 SHA256 fda82e7a06da2238ee5683821a573300622ef3bf68077f4255dd7ad76ece162d
+MISC ChangeLog 17556 RMD160 cef3d3ecadf86853f097070114ddfb634fe8f12a SHA1 be9bc27dddc354cb4a1cff0091666c22a704d1bc SHA256 22ee3b35980ccad9b095d95719c124be9b22720095b228813b9b8392adf074a6
 MISC metadata.xml 228 RMD160 e49b64024365c32abf0972afab4491d6e7b5b678 SHA1 8481262578cdf1afa7e9054def19f0a00b328ac9 SHA256 c1d05a4723b93939d65fa0ac2fd857ab1282763036921e56e3dd49911063b218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4rEmIACgkQIiMqcbOVdxQQsAP+JzYWAm5QCK1caIu3Je1peX6b
-ek4PYyE7GSEh++5YVSGabwb/eYGJpZ2vAXZ3QMPZbg3Zt2fScv+B/94QQZc8PG0x
-8Ncep8OkNTMFRWAd3tu+r1Qylvd/Yba0EVVpwDgNQqoWSFPccNFf83Fj7RCSsIZk
-7yIYt1AJLxlfL+nWUgc=
-=JC9W
+iQIcBAEBCgAGBQJOUNPqAAoJEEb+UGWnxTyHUFkP/3p8gqE2fLqGbG/Z4itPcg/I
+1t8AIAyM0JtvjE4Ea0t12fluCHnP5eDw4H83+tD8o/lItB1a20ZvXOhNv1ChIHpZ
+pAdHBnPlPfpbd4K/lfz4nS848/wE1/OGC4J6aeQ7/CzdL7Y47exT86WIbOs9KU9k
+TMQ0FmP1jDc6M/Z6kBM9Zhey4yRBF1uSc9QNcyhFVXoWfeg+Rc+Dv1KkmJg9TbgA
+P65Y8LmRCCyciOpAZsYuhZIdAfxAjbFjYpCj9ecII/zrKgOp4LNEnvtcObJJrIx3
+ezDdw/CRmG5PYJH87ix0VDc5JLE38EAze5920nbVGknoBy4P3e9kcQbekxinhCjv
+6C3jyd6xRawYWEfUkZn9Jlydvki/pNNjGFlPXlGpGJRk36of2HsCqBSLWQYzYbhh
+jOzcxLjfUE7iTcVgv+IIT0rOEn5GzvuuaRMDxrp8ymslohpsAoNn7Xf0l8eiN+T3
+ogbKb+w+kekL0G5ED1YKgiguSqbTs8EJXB2o2dFui3qRLHwuipXt+1xJZ0GKkboT
+tWQkr2+rEvFpM7WcNSSe4AHqYn9ADxAsveJBP9c9xVFy/3C6PqzMCBDVp/jmD4Uc
+2JyV1EiG4qxrRB863w9X/LivMkqGrBQAtRaR5tVT4Ff2QODm7ygr9oACTUJoQOEX
+JrHZgkN0beZEYhvcJRk/
+=lXuI
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch
new file mode 100644
index 000000000000..4da909b7c54f
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch
@@ -0,0 +1,27 @@
+diff -ruN fwbuilder-4.2.2.3541.orig/qmake.inc.in fwbuilder-4.2.2.3541/qmake.inc.in
+--- fwbuilder-4.2.2.3541.orig/qmake.inc.in	2011-05-11 23:02:03.000000000 +0200
++++ fwbuilder-4.2.2.3541/qmake.inc.in	2011-08-21 11:22:11.550158618 +0200
+@@ -16,8 +16,8 @@
+ CPPUNIT_LIBS = @CPPUNIT_LIBS@
+ 
+ # CONFIG -= nostrip
+-# CONFIG += release
+-CONFIG += debug
++CONFIG += release nostrip
++# CONFIG += debug
+ 
+ unix {
+     PREFIX = @PREFIX@
+@@ -36,9 +36,10 @@
+     OBJECTS_DIR = .obj
+ 
+     QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
++    QMAKE_CFLAGS_RELEASE += @CFLAGS@ -Wno-unused-parameter
+     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+-    QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++    QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ -Wno-unused-parameter
++    QMAKE_LFLAGS = @LDFLAGS@
+ 
+     !macx {
+ 
diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ldflags.patch
deleted file mode 100644
index f6869db95b83..000000000000
--- a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN fwbuilder-4.2.2.3541.orig/qmake.inc.in fwbuilder-4.2.2.3541/qmake.inc.in
---- fwbuilder-4.2.2.3541.orig/qmake.inc.in	2011-05-11 23:02:03.000000000 +0200
-+++ fwbuilder-4.2.2.3541/qmake.inc.in	2011-05-15 19:36:03.000000000 +0200
-@@ -39,6 +39,7 @@
-     QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
-     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
-+    QMAKE_LFLAGS = @LDFLAGS@
- 
-     !macx {
- 
diff --git a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
index 9a053ab331de..1635c8e063db 100644
--- a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.5 2011/07/23 18:26:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.6 2011/08/21 09:45:32 dilfridge Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ DEPEND=">=x11-libs/qt-gui-4.3
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-flags.patch"
 	"${FILESDIR}/${P}-ccache.patch"
 )