Don't force "-g -pipe" on CFLAGS (bug #378647)

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

4 files changed, 42 insertions, 19 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index f9ccc8864e35..db04b09c110b 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.302 2011/07/12 07:39:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.303 2011/08/10 13:53:32 polynomial-c Exp $
+
+  10 Aug 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r2.ebuild,
+  +files/xchat-2.8.8-cflags.patch:
+  Don't force "-g -pipe" on CFLAGS (bug #378647).
 
   12 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> xchat-2.8.8-r1.ebuild,
   xchat-2.8.8-r2.ebuild:
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 1326ce07c1b9..008b2fb4c4fd 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -4,6 +4,7 @@ Hash: SHA512
 AUX xc286-smallfixes.diff 2020 RMD160 91c654320b7b1f9d6b13f7b226fb4cec26054319 SHA1 b13eb421f6d72fca195b398c606d9413aec57fc4 SHA256 08c31e4d8d792f101047362cb25c529389c9fa254e2139a678491ee4e1fe58ff
 AUX xchat-2.8.4-interix.patch 544 RMD160 01c3dbe26226e0efb41c3cf2177e86bc59d26ba5 SHA1 ef52dd70c75a52ac3c22f0eea0d7a4e403c04754 SHA256 d782b7480f370d6082ad47d571c4bb1278d8d00d203880933837e1cf8b424fe9
 AUX xchat-2.8.6-shm-pixmaps.patch 2711 RMD160 0052d6981752d19cf4876180f00a57b4c503f0c8 SHA1 3731d5c7ac04f053da923406fc73df37ff7802df SHA256 984174ea711fbb7b2d7817e838fb5ad54f4c414ca5f6004994f15bf790279060
+AUX xchat-2.8.8-cflags.patch 498 RMD160 0d59d81a7ec217449fb20aa3b187aeac5e184d23 SHA1 e8947be706abbe06f79ea955191f4178337cd37a SHA256 c8c08d73d770f2a75297eada1e3f03ab6a650dffaee03d17431e7722d59575ad
 AUX xchat-2.8.8-dbus.patch 509 RMD160 76b3734229f7e16d039365b160f7203ec5c10400 SHA1 aef9a0e826147fbcee55c09c22dbca68ed5acf22 SHA256 a95827de105866a6dee60290131657ebb32074544075775ee9ab9170929b1a44
 AUX xchat-2.8.8-libnotify07.patch 1705 RMD160 7e18b5dc3b0ca420d50f349b860f516f53c7a780 SHA1 fab2c7053b5889d7a0aa65a25a3bda2958c47125 SHA256 dc63ab7c32091a02b3c3a3e743ab209be52d584b75b577b55d9859a8f9dac0e0
 AUX xchat-input-box4.patch 1116 RMD160 a5f51ab0505b3f9724a7be6ed0199b60e94b6189 SHA1 055270f24defcdc327292bafb06ad21b8a4230e5 SHA256 a9f2e833afe4066d0e1e9f404eae79c90caa9c0a6a53c5201e6d3498a6ad3b6b
@@ -13,23 +14,23 @@ DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257
 DIST xchat_irc_icon_by_half_left-d3bjxuo.zip 71179 RMD160 8ef69f0b38ab9327e860829b4d72c1eead16dfe9 SHA1 200985a88b7a7bd51ccc2efdba521e3f373162f5 SHA256 1005f40a375da6806700485cd4db4a8681cd141020e9102e92f8ada075e7bf6b
 EBUILD xchat-2.8.6-r2.ebuild 2820 RMD160 481d2d4473a694624d8efea25060c437f5b764d5 SHA1 84d28917226ec041bf75e2e20c95ae77590202ba SHA256 2ee299e5405af604fd84b136e57224a9d58b561c4d5ee200bc7d06e5fe94e14b
 EBUILD xchat-2.8.8-r1.ebuild 3177 RMD160 4434ebf6b391494fc8e28807f6e385b7edfde467 SHA1 8fc156a0362a2c44c2d24eccb52c556e3c3a1015 SHA256 1ce9c2f7ea9466c93a1704fb702b6601fd089ee8c6b433772f3d1e032f480c45
-EBUILD xchat-2.8.8-r2.ebuild 4054 RMD160 9706b01cf806ea90fa06ab343baf5f7fc0216dc7 SHA1 fcc68ea1abd43d2fbf3a33fcaa7ab6c6854554d3 SHA256 9fbe4271eb1f565846333b92db52b81dc29092fa90693f5040fbb7d71ef4fbcb
-MISC ChangeLog 45465 RMD160 2f29ea3d196ba70694f116bd0642a8b23c841b7d SHA1 d4ea8ee36e2bb461bd5a651a154189e770c45f76 SHA256 2863a95998536cbbd4edaa16b4a769a367d31aafb03cf888f325b95c837fa4e1
+EBUILD xchat-2.8.8-r2.ebuild 4097 RMD160 b3d84cd7ef2863a8a711eb0cf074468efefe536a SHA1 d06e890b6743687e2511eecd88b1c67aa6d0039a SHA256 725b07e377a6ffa9133e7876e7830f6188532ae3da161beeb600e29cf5e82f79
+MISC ChangeLog 45628 RMD160 fa9de859edb7fca49828498373bb0ad039a58f52 SHA1 bf1497ff6a952a7f309ac717eecdabafaab42a95 SHA256 63a47f7e4a45f6f62a15af0f03a976dec6c8a240febddff41033e48041a6f79f
 MISC metadata.xml 712 RMD160 6eafa9bf2fe298a612764b37b39a007b38697862 SHA1 1ee0d2206d19cce1955d2acef6022e6d32069790 SHA256 a92843c55c72b49ed2b0b282ed989ea4a58b81629f26ecd7e6320bd4c5531723
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOG/pWAAoJEPiazRVxLXTFqwIP/3JaqJzljBIn2NJQF+NDVzq3
-bYVWd52QjmXuk7J/W3ZpJcTZMT5iE+J3AGCYYF/7SUXE/Dq9cvZxCkc+AYQCTzMX
-yijnHpiDlSjMlIX+XtHf0U9W/TQA7gm+qp98otTSC1jCNdKxHwXV+UvIrPIWcmoK
-3+if6uqw7ljwL9MPqTzUocRWX25+xuC6HTH1oUgmLGat7+6pYgpdyEKP2kIqZWCt
-fWqcQrzWdH7bLI1iVr8n0aPNJy4foG0O3jT3f7EU4Z4db00AnrSSAFbkzeMzPFGI
-/zO7qqeYt8Khk4x3w/P6BMw9XHaSAugtwCKV2gDzlQeA4tL1yc74JTT3ZhkA6ixj
-JEqDkv8H0f0OFZ2vXHqQUwDzUOYqOVMWqX2WdVEZx2va+snxNeppR7SYVElVvUSC
-y0WDbcLDEQM3YUPBP8U2I2oi8a2THkcdYwX8ugG97K0pDYTZ3+qiNoaZLf+W5dS9
-1U+Cy9NFqr1+37wVODoHHkU2DUaLwuwTyMDppnRozKV6gjXkAVuLKHTjUayWGk9C
-KYA3CmrPCBBuXDvUll7Lb2DheW8sKisD8oVf8nsT3CYTUs3AjtI7SfNTvsZHHQi5
-25r7L/3WQzvCWkU9dXg20XjT5RNq/nGcNlILVh6BjluQZa7jTjZ0UK6ojJguSv2C
-wDeElIUmWNvfD0/BeZ0Z
-=4Qmt
+iQIcBAEBCgAGBQJOQo1iAAoJEPiazRVxLXTF6XEQAJ9NVS6E66QshaxX10Fn4kLR
+lZxUONfaNg/02ToWhJjvyj7l3gTbqOT9SGKCWyNuTW6MrMTF15/i+Bt/ZUlxWA7Y
+LXChczVE9w3mh0avNTymrVr/CrGzJKR0vW3MGIqdbAf5EAflazAhUNVAyDf8/PyP
+/2KL68bP/t/J6BI5IxgrbMk5GeVqjz/GobpMy8KS0YYb2uv6ClCIIZDtuzagFz5S
+KwSOkDW4M4B8no3TIXnqaessGD/oklIIorZulcCZ0uNiiWLY3maAmJbyqaWJeeO1
+6P0tJQirN6yQAqcDCGlHx72didFzIJm5IT3e/RRI/DjiV2BNaDbD9sZKG1UB32KC
+PIY9lHL6OqXyS8ZFCvArsajsynYyBZ3Ux9Y/ICXN8QRDPQrMd3wNqIRdKtTuriqI
+n1yBJlD32PqIdYRTVYpFFiAEvsPp76YPphDboOHD3i/K5UfM1huTSC7jQIqaH9K+
+nMzxOmMyrzDs5+JkJn4LSNDKFhg6c657DR5oymtTN2El8hW1yyzMeqq85K5Zs8x7
+3p1gypXCo+jKCXFo6C6ulK378A7l4r1TwcnsYHYKu4afb05K9vruIqOMopMQ+s78
+LcFgPtQjByHAbf72dzLhnwBbnnrUckMiA2GyIk0+7HbOiLk+WcyAAmv2kLd5gIQm
+q+Pju43qHW4ZCCE06er4
+=VhI6
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/xchat-2.8.8-cflags.patch b/net-irc/xchat/files/xchat-2.8.8-cflags.patch
new file mode 100644
index 000000000000..896d61aa9840
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.8.8-cflags.patch
@@ -0,0 +1,17 @@
+--- xchat-2.8.8/configure.in
++++ xchat-2.8.8/configure.in
+@@ -628,14 +628,6 @@
+ 	if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+ 		CFLAGS="$CFLAGS -Wall"
+ 	fi
+-	if test "$system" = "Linux" -o "$system" = "FreeBSD"; then
+-		if test -z "`echo "$CFLAGS" | grep "\-pipe" 2> /dev/null`" ; then
+-			CFLAGS="$CFLAGS -pipe"
+-		fi
+-	fi
+-	if test -z "`echo "$CFLAGS" | grep "\-g " 2> /dev/null`" ; then
+-		CFLAGS="$CFLAGS -g"
+-	fi
+ fi
+ 
+ dnl does this compiler support -Wno-pointer-sign ?
diff --git a/net-irc/xchat/xchat-2.8.8-r2.ebuild b/net-irc/xchat/xchat-2.8.8-r2.ebuild
index 61bc6bc0b401..b747d37f71df 100644
--- a/net-irc/xchat/xchat-2.8.8-r2.ebuild
+++ b/net-irc/xchat/xchat-2.8.8-r2.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-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.7 2011/07/12 07:39:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.8-r2.ebuild,v 1.8 2011/08/10 13:53:32 polynomial-c Exp $
 
 EAPI=3
 
@@ -47,7 +47,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-input-box4.patch \
 		"${FILESDIR}"/${PN}-2.8.4-interix.patch \
 		"${FILESDIR}"/${P}-libnotify07.patch \
-		"${FILESDIR}"/${P}-dbus.patch
+		"${FILESDIR}"/${P}-dbus.patch \
+		"${FILESDIR}"/${PN}-2.8.8-cflags.patch
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2