Fix build with GCC 4.7 (bug #423215).

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 38 insertions, 18 deletions

diff --git a/x11-misc/ipager/ChangeLog b/x11-misc/ipager/ChangeLog
index 3d503ba4b5df..ddea057d622a 100644
--- a/x11-misc/ipager/ChangeLog
+++ b/x11-misc/ipager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/ipager
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ChangeLog,v 1.3 2010/02/06 20:14:38 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ChangeLog,v 1.4 2013/03/03 05:02:49 dirtyepic Exp $
+
+  03 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> ipager-1.1.0.ebuild,
+  +files/ipager-1.1.0-gcc47.patch:
+  Fix build with GCC 4.7 (bug #423215).
 
   06 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> ipager-1.1.0.ebuild:
   Missing USE depend wrt #248571 by Kacper Kowalik.
diff --git a/x11-misc/ipager/Manifest b/x11-misc/ipager/Manifest
index 07b0889f3503..1d80fd1353df 100644
--- a/x11-misc/ipager/Manifest
+++ b/x11-misc/ipager/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ipager-1.1.0-gcc43.patch 636 RMD160 c199f0d1da752c35438ef8fa74038b4bcc10f87d SHA1 d6c7e5193ab98de1b85b1157628e49504f3aacfb SHA256 ba64f42d71288c53b9b30cc3a52060c1dae8456c2d757a4525922e0264bddec5
-AUX ipager-1.1.0-scons_flags.patch 901 RMD160 3c4233160716beefbaf3aa9d26d56ac1ed84ee27 SHA1 3c36ffa70da5d47b5c23efe524f1b2253562f0c9 SHA256 24ad546814440348bca718987a04cd4387d26a8b7b65c3fa63af712c62566df6
-AUX ipager-1.1.0-scons_imlib2.patch 663 RMD160 eec400effe98e398b8c8030a5fac8687bdeddf0c SHA1 f33e8a3e0d26b61504c0a3999eb9f2c3dd04c3c0 SHA256 b897845633e88514456565af26cd95667811acd84014776532a23a53d77b6b02
-DIST ipager-1.1.0.tar.gz 30499 RMD160 677e13fd809824088922846e045890d7788a1dfd SHA1 21059aa9474db6787396bd10a566778ac9df2cf4 SHA256 d2ad9a3aeb376644a76f57d2b275182cb8af0b64bd6a66c1791da60652a81123
-EBUILD ipager-1.1.0.ebuild 1217 RMD160 0b9c4825566e34fd7e0cbdf645fb15a02c587d93 SHA1 f069559b4de48ee2ee5b8849c65b1f92b5b57e98 SHA256 8567ad6acac362c4ec3686b9539e022dfd1165d2fb3e33bbf7a840a05fb6aa8a
-MISC ChangeLog 764 RMD160 296268198108652ec4a88c67edbf5a0e50a2e433 SHA1 588b3c9a3843d909b0eee5048ddc05caaa037a8c SHA256 b403cc6ef7f54059f35c38f9a384909f9747aa8fa3d7c6d5146f8a543021d45d
-MISC metadata.xml 344 RMD160 8e7b31fd891614b1dbf8b2006af74cabd0dd6993 SHA1 96cc1ef07f3f5b13ed115edbdb5beecded6babfb SHA256 7841dd37e8332a213a67a20f39012fbc2222ed891ebfc2a3660fe266224b74e9
+AUX ipager-1.1.0-gcc43.patch 636 SHA256 ba64f42d71288c53b9b30cc3a52060c1dae8456c2d757a4525922e0264bddec5 SHA512 a85b40e43b8563b3525d9170d79a443777d84b8183dbb335e0c98846e6a123f2657f4bf77fdbee93db515ede5b0b1b25a9c48837373a175c72a88ac0a4d21cf8 WHIRLPOOL 315d11a366b6f4d6f9c69ddf9874b5e513528261fad74993e65c28ca764e64f872f01f5870926a71e765785893097b701ea2d0eef7cb8d33aba81430fe233053
+AUX ipager-1.1.0-gcc47.patch 198 SHA256 a18c3bcecd5636fb05f607557bee807eabc7a34e3e32148d552b36cbdf7163de SHA512 c6a851b5b6a76f2ada504ab3e727a0dc811e03e70be330a26c2001854f873ccbdbe337e9aa010fcfd2f6c644d692ef13185d6dfb91187c63072574cca581c17f WHIRLPOOL bb4573745bac4c89be7e6833a861b235094255ca0fbe8d38232a9518e5af6625fc6342ec889afda2491dee43cea801ef28256461364958a7f66cd0d2770db208
+AUX ipager-1.1.0-scons_flags.patch 901 SHA256 24ad546814440348bca718987a04cd4387d26a8b7b65c3fa63af712c62566df6 SHA512 a44671bd29d99219f2b36d9718e32e6022f971b805531196dc464c92f8dee7df6a7bbf9d931e0a69dc617ac1dd1876929a8d77a0a7edd2014e9754f2a8070efb WHIRLPOOL aa53dccdc3eec8d94d19bb0ce20dddd6ca481850695e9bba8792932963d2b4ee4dd0da4fb8a05362f148b78b78fbda29bcb397706af060f96c6db1db157394b2
+AUX ipager-1.1.0-scons_imlib2.patch 663 SHA256 b897845633e88514456565af26cd95667811acd84014776532a23a53d77b6b02 SHA512 1b4e0196189ec64b48c4c841d03f3a3e3c516ffd86f432d536e7bea51ade407fe430342d5d690d00b46cc7b727c7d12441f55416f7eea6dc933fb07a2ce16e14 WHIRLPOOL 86c6de68f222ba6aa8b7b073f00203bc74bf27e5389022d654cb4409d51f18d8af91685803dfc7682f4f00b73fb54ac8472e4b1508d9d84637f7a17dc57f0969
+DIST ipager-1.1.0.tar.gz 30499 SHA256 d2ad9a3aeb376644a76f57d2b275182cb8af0b64bd6a66c1791da60652a81123 SHA512 34f2982b4378e8de7479803d205c2d9157b71863278382c91d0c3daaee57352f2f6678fa338f34dc9e6bd70081e5f0bc03634632a7b6ab20a507b6fad3c2e5e3 WHIRLPOOL 51555487cf33fdbad376db98114f656ad2e35fe55303f2c28167cfee66c43a7b662e523bb3c4e6debb368c375f7ddfb731f086cf5ed6f25e7052c0140a3cc077
+EBUILD ipager-1.1.0.ebuild 1256 SHA256 cdc555e6f2096d6d604ab210a487736098b62200e986064944f1ab1ba3c1d7a2 SHA512 0202eccf29884a9a4d2c0dd75119197c04e353555b937317abd00055fdcb66ae765ce5366981c95b84583fca3a27d445c6d6cea23f519dd32585da44956751f3 WHIRLPOOL f87709b17d867852be60980b036c19a5eacfb5fefde60cc9c6a91844349b65d9a5ac4711cc28af018f35a2c77f21a891c51bc3b9a5defc24163aa6a9c8467170
+MISC ChangeLog 909 SHA256 fe3aacb9e552848573e8aba7c9ffd5b73f1ec2db7a37d4686406b6c9314a1d79 SHA512 d67879866196cd0428dbafea27abf0df34006b0b5983b4792455f2685082c05366a3e1ab52d47bba15fbf5f3c418220ecaf49a68681ffe42dea8b38bae151767 WHIRLPOOL e0618751c6369739ef36a62ba61cb76a17ce86b77e1f5cf6c0152f95433d2e67528d4650431d1e4064e4347905ab8a9077e1d8bfac90d9b5c5330d5a2d4e4d2e
+MISC metadata.xml 344 SHA256 7841dd37e8332a213a67a20f39012fbc2222ed891ebfc2a3660fe266224b74e9 SHA512 744c7974c22caf9545206db11a192fa20a38ed4dbdf5665f1363a39eda97bc53389ff7f99b22cac5b6bf54c6e9fa54565467fae70a9e8377551c9d6895daddca WHIRLPOOL 77ba08e43be9e5973869964f0d5577b60b872cdba761ddfaebb0a42d10104f3050649019f9e787c56442fcd8bb6f83b0ce086d2fe596ca67e062447ffc263efc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ukcACgkQfXuS5UK5QB0ofAP+MmqVagwgecDx/hc/9rfMlucj
-5C1nWIw6VYeJ8fFL7pNSNFHj/d/ujvXwh4OH1JsGIDM1uN0lD71V35Dnlm+SgEqT
-SFJYY6Gn74C6AGImjJRpbjVww5kRlXF2t1ex+6Wu+Z7eVaXI6zU15Pb+mOnNd39s
-QJlKYMHerxMY7SSksQE=
-=lUPz
+iQEcBAEBCAAGBQJRMtv9AAoJEO04vUmVeoRjx5kH/jlzRj5Yp3rZoffjg5dlEUrz
+Ny19+oCHEQDhReZuwqAljrhvjtxDcV6oI08ZSpnms0PgeapaLVV9vgHDO7vOFXjz
+WChnF/xrjoX0vp+22g+DxluZhlup0UZV/Vm80uy/8FyJO8E3lOG2CrtqUdgPaKqQ
+IBImDBSgYeVfxyaqDWfX+6ScLlrPurXwXJWsZ+GdBh3c9FUbb9jEQ3YaBgjOU0D5
+XKdmgW3k5cxRsGNhVgBJr+mK5/2iKLFkLOB6uJuYMThy8M8Pw14CIsCu1Nclh9Ut
+qf0/m7XdF8+JQ1RGFyEwXH+H1UBvqtMUF8hk4+QIYGetLJjdmYmGEG8t11qHec0=
+=58xj
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
new file mode 100644
index 000000000000..f4c899302aeb
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/423215
+
+--- a/ipager.cpp
++++ b/ipager.cpp
+@@ -29,6 +29,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <unistd.h>
+ #include <iostream>
+ #include <string>
+ using namespace std;
diff --git a/x11-misc/ipager/ipager-1.1.0.ebuild b/x11-misc/ipager/ipager-1.1.0.ebuild
index a7f4f2daf717..2aef97f58002 100644
--- a/x11-misc/ipager/ipager-1.1.0.ebuild
+++ b/x11-misc/ipager/ipager-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ipager-1.1.0.ebuild,v 1.4 2010/02/06 20:14:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ipager-1.1.0.ebuild,v 1.5 2013/03/03 05:02:49 dirtyepic Exp $
 
 EAPI=2
 inherit eutils
@@ -22,8 +22,9 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-scons_imlib2.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
 	epatch "${FILESDIR}"/${P}-scons_flags.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_compile() {