Do not filter duplicate CFLAGS (bug 411095). Thanks D.Dexter

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

4 files changed, 26 insertions, 17 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 34aecbd202f0..7b88bd9aee03 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/xastir
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.28 2012/10/24 19:15:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.29 2012/12/07 14:27:31 tomjbe Exp $
+
+  07 Dec 2012; Thomas Beierlein <tomjbe@gentoo.org> xastir-2.0.0-r2.ebuild,
+  +files/xastir-2.0.0-dont-filter-flags.diff:
+  Do not filter duplicate CFLAGS (bug 411095). Thanks D.Dexter
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> xastir-2.0.0-r1.ebuild,
   xastir-2.0.0-r2.ebuild:
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 8ed9b1cf9d76..c7ce20a7ebed 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -5,28 +5,19 @@ AUX xastir-1.9.8-Destdir.diff 630 SHA256 a468240fc6c9397272057bf0cdb313dde6420a1
 AUX xastir-1.9.8-fortify.diff 4349 SHA256 11d2db08af1af0c5c19ece44b6d51b86010e651381d0ed544743de26a8cf9c62 SHA512 8beff19ed9a961fa1aadcf1dec1df36b8c69cbb57f0f100c2d29bed2eb08fb1e3bf0dfa206154afa2ebca803781afb6e3a60f7c3e90b17911f155442d1231e8e WHIRLPOOL c433f7d7d14ea1b68d51ff50e518331df0853e2e267a5a6d68c25e9a9a8cca5371259ce624a44a6cce9c1fb0f072b2a5d67a606d429c36c059eeb2d9df4c5e1b
 AUX xastir-1.9.8-scripts.diff 2741 SHA256 44276ac01a0a8da7908444c3d46502fb9a38cea9a73cabbb248b7b68829de517 SHA512 2e903bc86acb812a372a991efa04e99f8024bb094621b1af4e92db02c6d8dbc38d8e7bab433b5b59807e8e67bcab98e67b79ab0504f04c6c8cac2dae5782c4ac WHIRLPOOL c7f6c8d51648f5e6d68e0f69efe356980c9951ee23a0232c278888446199043c0d47eea95bc5d6a1bfd257028f6aac689b313e798c28af9051f3ac293de3d2a5
 AUX xastir-2.0.0-Destdir.diff 704 SHA256 d8f403965df2d047250ed723dbf13d18ba4877e8cc3ce8a2c7635f70766bcac7 SHA512 3f7f15c00bfb40a1be5a169496f7881859b5e99b7d4f8f654452b52223aae57f1bced2971bcae2a790cf210a9e1a20c1f09befff234404b84a787916231ac845 WHIRLPOOL 52bbca4a5a3bf94f6499f3839e7a401c1c6d8d3d2b660cc7062668d6f29e13a5f5516c3a368f1f2635866a5befd8e59e8142a8dcfbdbf81a3e2e8ceb8eb00731
+AUX xastir-2.0.0-dont-filter-flags.diff 621 SHA256 00d3dbefc6b06f183d29d60a31cfa9331764015a2e849af883fc8b0a364b0062 SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b WHIRLPOOL 9a932bbf5bae244f818e94e2de186a2ea390d4c7353cd7eb79632fde99c926585f8390df8e674172b80a2f5382de462b04f3537903aeff8e38c72b761681a85a
 AUX xastir-2.0.0-no-builtin-shapelib.diff 2425 SHA256 ae518747d81a03cd831d065228fd03e5b2e1809f09abed13c23d8a4e9e5bf75c SHA512 e33405f105ce2e425034cc94468ea8010026d0089e7912983c273238c8a8442c563ba9f934a36d29649b58967984d722f0dacb845a512babff015c7f208ecbfb WHIRLPOOL 1b2c0b8fb4138f2f3c0a03ace22a6e4b7a4c46476de24cd9fa3a5cb9e6523ce8eed6e0853944fe65731a1c53a35422c6f11ec17f836b91a7c2cee1d4aa8b4126
 AUX xastir-2.0.0-proj48.diff 1245 SHA256 03c648a3c8bd5a6c4c28279b5c75457cdeae6f39e3d2e2ebf0cec8dce1b3e544 SHA512 0fcebcfbe56fd1f3374ec63a11866b6092ce5158101348e4fcc74f6763fb00c114dcaec02db274f5a438e681c1c8ed1f819da4c49af69ee366b3818b2cffa615 WHIRLPOOL 943572176c99b4c6f598a8925dea5173cb1f2eb76c547d45333857a7939b374b7db9359e6723b59fb1d64e3a6bcf6bcad12582421358fc0f93fa8c0c6845de07
 AUX xastir-2.0.0-scripts.diff 3732 SHA256 c0d06a9884d33cc8093d85b6f970dbfa8c24e49520cc2157fa5d6141afe41161 SHA512 c218cc0a970dcf0921e608fc4cb682111301ae3ff44906bf3ac30d202235a859b19872f687b3409a3eea68a839b9dd089521640f7323eab7866f51493394d764 WHIRLPOOL 19cde21bba12df2528d35935eb66119d5e474ba090545a2f255f7fc0dc217b3172a0adbf1d457dcc32614396e1c96d904dbaf6fc78299daccbc11908b5297cb5
 DIST xastir-2.0.0.tar.gz 2544827 SHA256 a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281 SHA512 60051a1cf9a49b172fe13340f82b73426bed11b7b785f91c8d33f69b03ef03a19443ec02c9cc86c0bad990266fcb7edc170b8a70883cca85095edebd65453e63 WHIRLPOOL 3edce24e200d5695c31f58fa3cb70a6d0187105af9205c2d46402c9c0181a3954a3321e17a6b57345fa9927cc558729bb7b68751e1f2c537fb81b143cf4c3c23
 EBUILD xastir-2.0.0-r1.ebuild 2306 SHA256 502ad679f36eef7b98540018295224e612954b043456b30f90886a16f4a0116e SHA512 f297363236006811af276d8efcbf36d654f9e0bdf3285fc4dce904e3d45367c85fa3c83cc2420ebc11e2912d36d676260fbd5a842e586359dbe9489c90d5b768 WHIRLPOOL 80642be5ac9254c5e3859f9ae010d3cdb8e1a3accf850f34b4d5f1818ba6440d6a011aaf9309e80b5480767cd6d252bd0bf78e8e0f673a0bcc5bce5ec25aa259
-EBUILD xastir-2.0.0-r2.ebuild 2203 SHA256 9181b5951560e0c4df335e961cfa94fdda2f0f5b83cf1b0addb85adef91baa5e SHA512 3fc4b4ab40ac80cdd2114c3d6c87485bc69bcf5d513e16c80d62c873870f5fb98853cfb55c7727469571fbaa693aaf5c69ff83c7bd7a06334f99fae0cc1b6a8e WHIRLPOOL 40ae855ec68ecdcb82eb224f0545b38679346cd41fd7cd0e8af1b91f186119201025e18ddc81e145a479c68becc1299d74649484b22b7322cc6c4087ca60af25
-MISC ChangeLog 3151 SHA256 3e7d464564fc868bcd974b3ece7ddb7d470df333b69f8a794cd05c996303865e SHA512 0ca0075b53bc149dcb1f49f106f83a41e8735498b4cec5a4d8ec3cf350e5a9a123cdb0be7498c3ec6d8d4e33270b686811f243bbbe3a4d60ffaedf4d4f8f0ad0 WHIRLPOOL 631e0524f7ee9de0f9f2323c754776737dbb2c21ff7480720d5c89723ca570651a9ae63d4ac6c4953186ad672bc3e3a41bcf5fee950f54542b4510e8046eac8f
+EBUILD xastir-2.0.0-r2.ebuild 2307 SHA256 13593d705b4328ddbb6e51ff50710386ba098bdc900151244aafc3ab2f339cda SHA512 5df2c6f7a00f35f1b4616e74d7a447c4f2ffce5e8e1715de9a0a610884aff635c93446a86ebc0e3b90ccab796f9bad9778df66732bce35d4b1e8aa1303b7391e WHIRLPOOL 69fc8f042b922943996a4f7792e6c9239a6f376d40b2bf65f91b855a689247d54a1676448c1610b5d9b462c0d5a6890f8e7a7fee455bfb7730288d5321b8b003
+MISC ChangeLog 3340 SHA256 1a3e42367dd780519d1176fa702df877b4581de8ef5cc7048426b7ffea1d3d31 SHA512 cd81315efa5d8a0195fa44541947efd59cb46d4f61bdf6d93ae7266914fb0ee8d6519a7d22148ff913830866c53d7f9f88a0025d6c0b28ac3665bd7bbeeb96da WHIRLPOOL a49dd7ac1627e351a90944cc97f5b3c9e60c083000fa88fba8015b61bed60e8a620421920732959f2b4290a68da22309dc4a69fc879123b4c28a9874bac6320f
 MISC metadata.xml 601 SHA256 9c8d4aeeaa3a07d451671c9646a777c7029fd5ab09217b00b85e6571571f1773 SHA512 371ee7f590a846b095776f687c7bbb3920509923949121872875b8fa7ab22912cf806019998e16ea8443e2efdff3734ec9dbb8aaf9737bd17556eacae9478fa8 WHIRLPOOL d2de0305aee8d707a736a4d03b972a2470cd6dec1f34a1c011e0ef7d62fa42d34a61dab74658e8ae93ad5995768af5cf202a711fcc6c5e51cedaec5426cf68cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiD5hAAoJEDxpGckxwJCBrv0QAJ9GjhISCIf9OVGKWAHnN4d1
-fZcc4bd+xSsHhNmnpSvgTcdm426DifryDDE8iZvUwb3hk7juF/9qAQEs4kz65XCl
-7/4hYwMpVjL4lPq7J7S3tPzIiygfQc5PM4Y7qYE3tRKq9ERHLI9XpxoduqW2cZ/U
-AJeD2lLUWDWsfIDxUXXgvSvqTNp2deLKXo4P7vfPH+lOJjA+sRtnRJlDEokMJ32o
-INOAo2GwW9OZcMbIh2HJ2DLlYND716bkScFp8rU1fwiKsAdjI0aHQaoUkJzDCaIF
-NZKEZp4pHNnfGNAClxcJwdr8z5VgdRhoJ4VWn2DngljPlvvpFIG8rJxSxgt6zNzB
-c7t2KxF3V86js9WLmdVlq0QxxFSoZykRjBsseHp7kk6nKSv1f89idK09ra4Gxc73
-q38QMQyTGXJPK1ozuNwCiKps1Y+5EBHVY1g6qF4wJgOq+TJb/GlVJEgfF95HEUis
-qHWCX36Lmp7aWTP/K6tazPqmJVS26G7FEUAacKR+vikt4RK4IZe3qFMs2myTh47Y
-w9C3YlSEWpgPDL2HHKdqcRPnR44HMZvBnYl0HRGpV+DiHvsgGze3E1+TCZCEPHcb
-R9oHTqMDAb3cQ8ze28lyHsccNfrAseRYhcE/G3cgGXv2NuiY9BVUuwb+6Hj3WQ14
-0IJu+RCaqBQ9cuz6y5tT
-=em0M
+iEYEAREIAAYFAlDB/NkACgkQQe4uqXYgU9VgNACeMTkt//QPbkMbKK3vb6yclwJd
+9LwAn3HKMlNJB29My9k2qMSXkvQP5AoO
+=YXVs
 -----END PGP SIGNATURE-----
diff --git a/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff
new file mode 100644
index 000000000000..1fbea1d61a57
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff
@@ -0,0 +1,11 @@
+# Do not filter duplicate CFLAGS (bug 411095)
+--- configure.ac.orig	2012-12-07 15:12:43.000000000 +0100
++++ configure.ac	2012-12-07 15:13:08.000000000 +0100
+@@ -709,7 +709,6 @@
+ # "-llibrary" that needs it.
+ # 
+ changequote(,) 
+-CFLAGS=`echo  "$CFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ CPPFLAGS=`echo  "$CPPFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ LDFLAGS=`echo "$LDFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+ #LIBS=`echo "$LIBS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
diff --git a/media-radio/xastir/xastir-2.0.0-r2.ebuild b/media-radio/xastir/xastir-2.0.0-r2.ebuild
index ee1ab40b2e3a..8a74bef9083c 100644
--- a/media-radio/xastir/xastir-2.0.0-r2.ebuild
+++ b/media-radio/xastir/xastir-2.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r2.ebuild,v 1.7 2012/10/24 19:15:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r2.ebuild,v 1.8 2012/12/07 14:27:31 tomjbe Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -49,6 +49,9 @@ src_prepare() {
 	# instead build without shapelib support (bug #430704)
 	epatch "${FILESDIR}"/${P}-no-builtin-shapelib.diff
 
+	# do not filter duplicate flags (see bug 411095)
+	epatch "${FILESDIR}"/${P}-dont-filter-flags.diff
+
 	eautoreconf
 }