Honor CXXFLAGS, bug 363947

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 34 insertions, 17 deletions

diff --git a/kde-misc/kcollectd/ChangeLog b/kde-misc/kcollectd/ChangeLog
index 854ea5900521..345e8fbee095 100644
--- a/kde-misc/kcollectd/ChangeLog
+++ b/kde-misc/kcollectd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kcollectd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/ChangeLog,v 1.7 2011/04/11 21:23:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/ChangeLog,v 1.8 2011/04/24 14:10:27 dilfridge Exp $
+
+  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kcollectd-0.9.ebuild, +files/kcollectd-0.9-cflags.patch:
+  Honor CXXFLAGS, bug 363947
 
   11 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kcollectd-0.9.ebuild:
diff --git a/kde-misc/kcollectd/Manifest b/kde-misc/kcollectd/Manifest
index 9ee2a05326b0..5ff9a772562f 100644
--- a/kde-misc/kcollectd/Manifest
+++ b/kde-misc/kcollectd/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX kcollectd-0.9-cflags.patch 465 RMD160 7d631bf422e13c2f410e646485b1e8b71b90efa7 SHA1 e96e9de714e32ae20081d1fc1c7cfee635390ee9 SHA256 26fe20680d3f38fb22413ef8bc41b3ad275f6be5b6ecba13b32294995484274a
 DIST kcollectd-0.9.tar.gz 97132 RMD160 ad94fe7c7ca3342cc054d2d3c148f1a1df3285ae SHA1 9f6083276553902c09eabfd5fe2f2481f5f6fcd4 SHA256 d2d4cb9d8d1c0eb7695c3567c6f40d33fdf1655d63038cb0b170af2fadd2a3b1
-EBUILD kcollectd-0.9.ebuild 1223 RMD160 03e3852461aae254f4cb0947c4c917363b146d04 SHA1 5709a9c3abe624487ded28d2b3ca4bb5a28cff67 SHA256 a72455a7219af776c597fb175b4ca444a78b2a3e84ca68cab96d99d4cdc05c5b
-MISC ChangeLog 1227 RMD160 157fe1d1347167a5dfcaf696e33dde3f55833457 SHA1 39ad2a5192c5bafe765a1b660cc218090a7c4708 SHA256 38ad0b5b80bd511786ed6b39d6c62337bf9f546efc401aea19b763e553d5e5aa
+EBUILD kcollectd-0.9.ebuild 1268 RMD160 d800095e97443626c28c701a63df7d0b24119d88 SHA1 e85d2693175f220fbd95c4788bae0d3ae662da3a SHA256 d3d5ffe47db25b561956ce882e23638576529b6fa92e14552ddf06223a189d1e
+MISC ChangeLog 1373 RMD160 6a91b1b6f36a7380b32fae6323e98c087ec3b256 SHA1 7cf8af45fd99706809225a9ccf7ba50554b455f5 SHA256 c19120a9ffa13e9c2afbc7aa4fd2fc13e10ad93e58cdaa847bf718a8b4d99155
 MISC metadata.xml 228 RMD160 e49b64024365c32abf0972afab4491d6e7b5b678 SHA1 8481262578cdf1afa7e9054def19f0a00b328ac9 SHA256 c1d05a4723b93939d65fa0ac2fd857ab1282763036921e56e3dd49911063b218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNo3IMAAoJENwGBM22xffeNWIP+QFisoc6k+TvS7ToeqCGrYpj
-Y60RGs1oPTJ53pONnwFXb4tMHbrLQ93Pf+UCknHTHGTDy1kWO8gNKie0Tz6G89wA
-ORQrBdp03oA+GdomLpBiead7JfjuocnPDR+QPaK0i4oSdRpviozOkZsApmHqeskq
-Il+sVq0My1MyopclfZySPcn5f4BGhnbRXI7flXQFrz0a8v2jTTIrdlyG65Ckv+4i
-DtuFXhJjhM2hdfDbDMnpVQlQbodyrXhHb6A3DsZoHDT5zXI5o3omSnLXkYdfF+dQ
-HOJX02Eiw9zha5rcUsseOXs/xSt1N10ryZN7t80sikQtcICwcRiIA4lFwyGVao+l
-vSD7Bshacy+/w8r2Nhk7C2W8Qp304Aa5+vPcN943jEZl1EpXa4OXv2l1kHvAB04V
-9xRnLh2FqDdBYAduBz7EFMZcxGJWMawFUKAADWiWrV28HV+2s6xN2PSD7jyj42of
-CFq5QxkxaHxjk8VK7IM8n8jTY2vsANmwD7l9PwAzHWqHvrvZUWKknuJG6ldgLwh/
-oO6woakgO5zOunlPODhz5jhYgmKodTT8xLPdOZJhvniiA+bkF/BgoJqW4GxzzIH3
-rc1oSQQFNKhHLig6n9b1T3qhxTGCbKXoL0WF7m2qhAtC0xucAP29BLm7lfzIUeAw
-GdnxuND5sYypLurAGO9j
-=Fd7Q
+iQIcBAEBCgAGBQJNtC/zAAoJENwGBM22xffe90YP/R4lp9asHG+cGKyfTbE6E5qj
++EcdKTpIgKENo0NK2jG4g7FYn7CXjIfepTfKh8NrZcQb/FzpukCef1gNaAYRPYIf
+Pq39vpXCwZ180cQ6zN3xp6ONnpLUzbtKf82wvnysuJWJEPzu/yvcHBWIWaSc4IPV
+EqZqaBZrpEGy61PGkY89K9cvh8LrYShv2Ujw9BRv4GxwLSFxb6VISWW7QS216nA8
+CzSJexDUy7g5S4Omqbh2Q1hQhFye2+xyRrQkYEEYSGPKXsY1bhc9Vul1nHw7UIE5
+jTaHL5S3DK/1ZavmHbrepzok+9nppyumNPyXDAWQwVSGhlJo3nSG4mafMICHOQd1
++iBP6P9aoblGZLEH+1TmsWype8rg6G9zwDvqW/OO9Bxkef8NQgqpU41c0yLqTkTx
+DfDb7Xqr95s7SJVNG64jg3RDxEUfxOF6QUhnHnfFg8haqg097yO4DPi+Ev6T4TqO
+t/CGVy8M61yo4Ca4JgEyJNNjNBhS4oqbaXgdjn5gdFoN8JWP/+NMQwEiWmcx3Lo8
+oMwCMCBOj5TjsZzdg6/KnfwjJp/Pza9qRHGh2CggO0KGUN4CmcPZ8VDZe8x+vLqA
+kH2Hqy+vbHXPMAgYBRmjE7SGWMs6nhAhWICAIofGcwcVbcLTmcR/yQUJb72JsqdA
+VecQgK18OK4oCQVnw6kO
+=3Jpw
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
new file mode 100644
index 000000000000..702c588d367e
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
@@ -0,0 +1,10 @@
+diff -ruN kcollectd-0.9.orig/kcollectd/CMakeLists.txt kcollectd-0.9/kcollectd/CMakeLists.txt
+--- kcollectd-0.9.orig/kcollectd/CMakeLists.txt	2009-11-30 22:01:54.000000000 +0100
++++ kcollectd-0.9/kcollectd/CMakeLists.txt	2011-04-24 15:35:21.596229942 +0200
+@@ -1,5 +1,5 @@
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAG} ${KDE4_ENABLE_EXCEPTIONS}")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ 
+ find_package(Boost COMPONENTS filesystem system)
+ 
diff --git a/kde-misc/kcollectd/kcollectd-0.9.ebuild b/kde-misc/kcollectd/kcollectd-0.9.ebuild
index 2906a5614eb6..4bfd2ca64cb7 100644
--- a/kde-misc/kcollectd/kcollectd-0.9.ebuild
+++ b/kde-misc/kcollectd/kcollectd-0.9.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/kde-misc/kcollectd/kcollectd-0.9.ebuild,v 1.7 2011/04/11 21:23:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/kcollectd-0.9.ebuild,v 1.8 2011/04/24 14:10:27 dilfridge Exp $
 
 EAPI=3
 
@@ -21,6 +21,8 @@ DEPEND="dev-libs/boost
 RDEPEND="${DEPEND}
 	|| ( app-admin/collectd[collectd_plugins_rrdtool] app-admin/collectd[collectd_plugins_rrdcached] )"
 
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+
 src_prepare() {
 	# Working around the eclass linguas magic is way more complicated than just
 	# force-enabling de. The files are organized differently here, and when the eclass