Add fix from upstream for building w/gcc-5 #545114#2 by David Kredba.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 69 insertions, 17 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 38aa2cd63c10..0fd653e89db3 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.232 2015/03/31 04:53:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.233 2015/03/31 21:18:02 vapier Exp $
+
+  31 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/ncurses-5.9-gcc-5.patch, ncurses-5.9-r4.ebuild:
+  Add fix from upstream for building w/gcc-5 #545114#2 by David Kredba.
 
 *ncurses-5.9-r4 (31 Mar 2015)
 
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 452fe5f39632..75d532dd85f4 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -4,28 +4,29 @@ Hash: SHA256
 AUX ncurses-5.7-nongnu.patch 361 SHA256 7efcf3daf57d73e348bea1ea7ee77071aef5338631958fd0db595a011570cec4 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f WHIRLPOOL a93e22415092ab51f769e42586813c8fed5b502e1dd86d09844f524876ac025ca81399dde483478087bb6241214f85c29a27f8b4ccadc2aec37be99dc7d6da1b
 AUX ncurses-5.8-gfbsd.patch 695 SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2 WHIRLPOOL 6c2f865bc22a3932f6f973f7b53c5a50254505c4944c656af95c2399933c31acc5d5536d59fe9fe7c59ef537ce0d39ca19c9d0558e4aaacb7122749a575cadac
 AUX ncurses-5.9-fix-clang-build.patch 1291 SHA256 0ffec4dbc7dc4a2356460c2a001b6ffbd8b060ae0afbdf3551a13575c20830d0 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1 WHIRLPOOL d5d363f6d7cdcc350b195066c8183609bd9351a48603acdae2f374af13afb23a7bd05cbac86b13d2162daf5bd895eb5acce4769fce2f0b4b8da2896e00d1f846
+AUX ncurses-5.9-gcc-5.patch 1367 SHA256 6d40c4841e031fbb8b1ea6691b112aabc398d23b20b4458ec0b6eb78c33af88d SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c WHIRLPOOL afe4c3854c2fe8096ffa87b5b7e0076a4814ab90ab463346386e4f3ef24295c5c44ae588b8c3147399505072d8cbbf45b9970bacbffba709500bbbdb43a77bf3
 AUX ncurses-5.9-no-I-usr-include.patch 1431 SHA256 496e5dea489d60078344df651c3c2ea06d3dd083d83add0df60dde9104197154 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805 WHIRLPOOL d390ee0439f89dacaa9b5ea5402fc4e6bcf3d48b4bc77c93ff882fcd93f611f99ebd0ae4ce91eea1bec83b4d0191e0ead3361447448a84fc59496e6295116042
 AUX ncurses-5.9-pkg-config.patch 1022 SHA256 8b32d53c4a94eeb78f39c29b1e66813bdb2fd5225f96ab7c26950f96679b58fb SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6 WHIRLPOOL 9056961c1b617ca3286cc4c528a5b5da821a5472da105d82b56c925034454a600e818265627d2f17dbad5184ecf78ea4d14807838bed789ca01a85f39755b656
 AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131 WHIRLPOOL 1e2fe441d97671b84f49388555c351b235a93704fb7fcf13c14343db569cc91f21d75b60eb635c4c1c3ad18778bcb50e5aa63d25583224ed644edff35356dd2c
 DIST ncurses-5.9.tar.gz 2826473 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 WHIRLPOOL 069e98c6392ce9aca960c72a20f1a502387d33a4b237aaeaa95548024ce4d47b129eafbe0288d21c590e725fe71aaca21cacb300f11a660b7234cb39a777672a
 EBUILD ncurses-5.9-r3.ebuild 7079 SHA256 6469e2e8827f6b56e9eec89c4eeb8c27c05896458b3cb5d2e8c0178c4502362f SHA512 7881efb51872705471ba07c9a3b67c1bc2ecec34e54aaa197ee85486a638887a5f64961f824ac4c1cf9da1a18b89ccad6b99d01dd7e213acc135ddb265bec565 WHIRLPOOL 10d50400d41f67c2d8aad059553b7b6f1fc43ec97faa6fbe12d7f9d1b3002fdc466cf2fea84f523a3b70d25c771a02bfb784f93b306c4ca22d5188befbae5089
-EBUILD ncurses-5.9-r4.ebuild 7148 SHA256 da41ff54909ad719740508bf4fb0efc61cff6ac74d281c7a74a84f3cfed26fe9 SHA512 0519fe87c4fd23ce27f480099a3b41e57b5b3d8a88aa7aef5b1da0bf75ac5910f6bbb4d736bc24c44cddc90344fcd014aae381d2af0c0c8f998affc15350ffcb WHIRLPOOL 42204c64ab87e492fc406606c02fa46af0e902312477ef05c041e13e4c9283a55ad8753510f61fd272da7b4f37e20f3a79fa0cec1e3227de1ded90844bf51a8b
-MISC ChangeLog 33893 SHA256 30bb6ce04962ab99be32a06a31bc20c3d7ac1b6e26b287ee2416ba1ed251c368 SHA512 5756718f9ebd493ba2363844b20974b13cb660760bcd955c676f89ee7aae60315f2e9a5cd32073214f17e63e5b5c39e010d1b8756138799dbf0db1b0fbe65967 WHIRLPOOL 045d0df389982b8bd5c5e9d1f3a4b4343714f9fd328c9277e00eef09138624d9f539dc602eb935face835c3327ef0fdc7dbcd31c6a6864650a6c6949d0d9f4b6
+EBUILD ncurses-5.9-r4.ebuild 7195 SHA256 cdeaaedbe2e98da9764070d8ae2d12d5728390fcd72d7737cec954033ebbd54e SHA512 cdc27a020f7a9eb8977e9bfcd83a0884491ea8a02a7d95851eda6771e54744f1ab2ee989bfb223b2c02a00d2b19db704ca3f553b6562c69caf365f387c35d89a WHIRLPOOL 16d57bc2eda280685b39c84966d11ef71fdcdd0e0e052c7501cf03ba5abc17e875ff627a8c711be5ed6c2727f63854b6f6d0bc88a83bd89ec1fd33b22214daa7
+MISC ChangeLog 34073 SHA256 b4a47aa89b19418bca4556ea81b1c5e04d12d40e0ebee3e2805366e7d935a50d SHA512 b9d26c82a62be505f3b0079e641cf69962b780bf271d13dc2b7223d1034c750ff8d4978e221de781b66837f657b8ea938a825bc71eaddeb21c0d4807903eec03 WHIRLPOOL 93348fce3f111c81d594ce6c0dce6d45e422f2dcc0a08a544c8a1600e5c9330a36887b7a2b329f89c175a587647cefe813b19266c7b753be8c5f267cce0aa1a3
 MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVGigxAAoJEPGu1DbS6WIAQw0QAIayPwTEnTmrjjHsfgxNXLPb
-ZcJHpgy+VuMAGOpipdSPSMjiEDw2/fQIrSliTxYn9rc3plTcvJbrlaoK4Bb+aPeh
-p395PX0vVt6BBj6oliwlsTCzdyj2+2lIwqwgIubj/Erf33KzxAqRhWat9yv4haub
-MX8QIWbBL89Sx1RQJmYqD4coEI4uv9PaGpZ1o6BDYpxPPmhjF+gz2UgN7WlrEeiA
-NHt7RILj4qJxIBvhbFje+Z0JzJY+a1pDQiEOe5fVwN69VxjBm97zFKvXKLRyXj3O
-lzRWN5FroczIdCqbCg6RDjuWigSRV07yl4XaONKcKxyZ8tJSAWlTADdWKkF8eQ5c
-ysO4IuMWqJ6aAZm2Ny7likscfOZ5jKfoBne2jC+DXpjZHe42sM5uiFrgPd+gISXW
-QWpTL/Qhfnj2l53F/BXgcSOwKJeKebkGXoszxQJ+I9JZWOoYPrbKlQva0+hF6iFN
-uCgWEI/WWvhPPagntBGDikEQcZ+mnHE6IwqLndpgLijzC7maidS9PlDk7LJglLAp
-1gT270Aa0lcLrsfUYJTgYds/uOIFXQh00LcgbZW8cPnIaGe2fRENr3aBvitcp+oz
-jq2DkKz0LcUbTSPSvR4vLtcTXSKUftB0CZcfr9qJvNjXrkzbFj7k1gPX3qrLOdaM
-qe9ySJk/1UWymu8Gd15Q
-=/dY1
+iQIcBAEBCAAGBQJVGw8OAAoJEPGu1DbS6WIAA7MP/iHd4LrT7FZkyfwrSexmnUJk
+8P+NuTWO2W/w/akCpjcZXnqR3LPzBrHCmtB1zm1xnH9dsarBerj7Q96pvSIuS5sH
+EROZ5jyAi67k+oisOvtVTfaC7yxf4VMqoUPYhwPCQwOeTraY6Dnhn3oZqMXmG3/8
++ORs9ZFu/vLdQIhc0nlemEmQKwDmX3WFc2vLJOm3iPQMTcuPKbmYuK2egP/zFEBa
+HS/pRDaRCHxNbanWIFN56YvyzzujCQEHsgfcF7lkoJNS7qaYBkDHkSNGY1r2Vvt5
+AQy23CDRXz90K6uo10KRzp0Nv7ElhQIAZrXOhq0JSZpEhdHvB77voA3qqPY01LAi
++ioNGUeIU82dMSDici2AkvWFxEeXCm8KB9VQGvW8eKJ2S/KKhTpsrQQawdSe5POG
+J/pqOYf0Jm/e65VNtxRiQi/ZZlAF9t5Vyoc8aH8iEinHOi7e77JsiTo0hsIyeCyn
+BhO1lH3GxsyavQL/V1C3LDW4hxiqlb0NF3oKmdI1sC8Yi+h8yKwBqoeygPddfcfp
+CGxLLjgum2uVAvOoeGQceyBUrdlqbt8bjwQDl7JmNSMh0eov5xHPK75fOiSTyZjW
+iZVGH2NUtzzs5lXpbvcypy+y6iTRLnHM6mjDKrBS4xa4EUr/+swpcC75ND7akCTl
+9IMyGax4xEM53tUCn8kX
+=EHN9
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch b/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch
new file mode 100644
index 000000000000..2448229b88e1
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \
diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
index f86fc3bcf6da..99a6febaeb40 100644
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r4.ebuild,v 1.1 2015/03/31 04:53:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r4.ebuild,v 1.2 2015/03/31 21:18:02 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic toolchain-funcs multilib-minimal
@@ -41,6 +41,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
 	epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
 	epatch "${FILESDIR}"/${P}-no-I-usr-include.patch #522586
+	epatch "${FILESDIR}"/${P}-gcc-5.patch #545114
 }
 
 src_configure() {