Fix build with gcc-4.7 (bug #423517).

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

4 files changed, 80 insertions, 18 deletions

diff --git a/net-news/newsbeuter/ChangeLog b/net-news/newsbeuter/ChangeLog
index b4696ad0102c..95eebf2365cf 100644
--- a/net-news/newsbeuter/ChangeLog
+++ b/net-news/newsbeuter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-news/newsbeuter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.38 2012/08/03 15:24:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/ChangeLog,v 1.39 2012/09/15 06:59:57 radhermit Exp $
+
+  15 Sep 2012; Tim Harder <radhermit@gentoo.org> newsbeuter-2.5.ebuild,
+  +files/newsbeuter-2.5-gcc47.patch:
+  Fix build with gcc-4.7 (bug #423517).
 
   03 Aug 2012; Markos Chandras <hwoarang@gentoo.org> newsbeuter-2.5.ebuild:
   Stable on amd64 wrt bug #419327
diff --git a/net-news/newsbeuter/Manifest b/net-news/newsbeuter/Manifest
index 69876ee60372..5e6f42f20287 100644
--- a/net-news/newsbeuter/Manifest
+++ b/net-news/newsbeuter/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX newsbeuter-2.5-gcc47.patch 1354 SHA256 c48029c63cfc45d5df3bdbc4c9fd345463a61ad97f6eac797db62d63c49c6af8 SHA512 c9ccd0722d98ddd75a642aa8f5733fb6937f40ad7f019b9f5f4d8171c566bc9894b76273d89daa9d68060b63e325c47fd608dab0dc5764950c2c96f602164e13 WHIRLPOOL dcba4222da6dc495217ab1d1cd23d6882eb7ddd1de28d6726a99e46baea48abca78896d71db0f944c0e63c05a150e0f0607bd91c838660f0560d8b279905261e
 DIST newsbeuter-2.4.tar.gz 380170 SHA256 62dc8a3daf2f4c1ab6ec6997df0881146b6aa3fe3b29ef70cb644c258a7d0a9a SHA512 e051a1c84aad064033d58689e3511a64ed5a65b2f9df57b675db553fd80ac54f3a796b14780585f49489c7fb786ee838b4aebecd7136205e702e9e1f84ab68c6 WHIRLPOOL 1de4301b8ba87229be07b955084dea1e1cccbef702f35782066a5ed6c514d21b3de71a5e8576247c52bc84cf3431b241fc58347749b053b87e9497bf8b9fed8d
 DIST newsbeuter-2.5.tar.gz 394183 SHA256 abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825 SHA512 95c01cd4b98daf715d6f191117bb4219d4c76345e7a8ad32e595c3b81f78d7b61b0afd4ac34cb3d91f28f6e16bc91a0580c1494d9103726dc0ad96ee6f2daae7 WHIRLPOOL 3db2cba2c47a0ad1c07fbbc32db5d4e0247a7e1603fd12aec8597350824dc633d0ecf8e7c1fdd2338b1117ecdd5caa9cb40d009e3e8087173471672d6950e079
 EBUILD newsbeuter-2.4.ebuild 1226 SHA256 ec8798994dc67763624296eee637172ba8ed3fba6d4ee04699f890f7810d68db SHA512 90810316f7a779c20d6f476bee8e4394ceb8f958a97a4bdf355bd77ad12011f9ae20740a3fcc259437bb095248ba1bcc1c7108da9bd772bbb6be80e9c9e106ed WHIRLPOOL 273bb2bba3c29c365023d760cea2e354fddb5af14894bea209e957c3029be6967ce85bda02601875003182fedcb26b00600cb03def9df1e73ad9cc66411f48da
-EBUILD newsbeuter-2.5.ebuild 1135 SHA256 a643a2c93a676739c4a04128caff193033aeee6045357f8fbafb40eae15b3b31 SHA512 f0c87049a33e586c8b97c2941123326a983688528984a596a005cabdb9d1ff424cb99ee956a4957002a004c960eda27742e39c45e9be318129acd74e6d03b654 WHIRLPOOL 1b765d6218c546afc5c10c225459495ee12863771cb7527d34657d2a93eac37d7d2730e3bc620915becd07c6982ff5c503939f67ed72c53df6f84d5c5dc20bf7
-MISC ChangeLog 5838 SHA256 00a53924594d5ddcc8189223931ebfa9e0540f0c45eb0e55b85f85ea410ef2ef SHA512 d287dc711dd4003e24b9d68f21c615d8e0dff0901b7f23534dd1a057287803272ae36a08d60dd07ca399521e2bb4fff4bcfb3e5de8569b1eeabb5d88fdb5cbfc WHIRLPOOL ed8e65c37265751b1f07bea8930181093021edf082acadc545444c84d6bb0a10dc56e00471bc2f68f26efdc18dfc62e34d9e19daa18bf4d796cbaedd64c61bc5
+EBUILD newsbeuter-2.5.ebuild 1183 SHA256 9d71dfa38826c7d8f1901879317588d980ea20da39255dd44e864b8719d62f68 SHA512 25593cb1b5be877ab50be72b368269b7902592b4f71cbe43e18e41f55ff200f08a03f38137416446cb05967bfc09f8027b0418b23cfe6f97e4a51c341bec5402 WHIRLPOOL d131334bc18d71394a83e7ef9e164b113d57fe316ace82f22c7e6538f5f5f758e158589f78e08ee10b5fb657c8bbdff1ef7006564ec162a3a1b3c22a21f950ad
+MISC ChangeLog 5989 SHA256 bcc04e7ff815a0d3e330f1d5fc873465b0a920f928d8744ef8b91ad866688c6e SHA512 5a72e87478710f2d813d18c693af350ddb06852e99d249c71d4b01bb37df7b1fd3973cefda2fa7c93d6f6182301702203bdfd8de2197fe012bb69aaebdb8ecca WHIRLPOOL 8f2094b441fa74fa6197a2c2aaa48578e108cd2418dc1dd9513039040cba68cdbc5b5232d54bb93dac7820586bca5c9b9cf74dc65343b57c55e8d6910c435223
 MISC metadata.xml 405 SHA256 72d5989efe3e9aa0fc0102ce2a3cd62af3a3b40beaeb42d9321149ca02387a15 SHA512 62694bdd8d3c988d48945c6ae926e20509fcc660d2584a69adcafad2c6abaa810364603ab5ca3b79cac128a2cb31486cac4b9b2903117ae73bf6e283145289dc WHIRLPOOL 6c5473ea7fe0652e0c8890ec81e4043e2b55b1cc46054e8c6b7a1575a190669b33d6012c9e30e1574696d562936684fa1ba086309355265fe47d948af7a1517f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQG+09AAoJEPqDWhW0r/LCO5sQAIBUADREd8gZTBWIRBL2NkpU
-u56I/zWREEQh/uScI2ebj5mLKzQfreZTk9bMY7wAuTbSY9/2m+ytUC9CcD88NOFU
-8YxyFCh6TA1KE4A3yCG9d9dHiFf2Z2ZKfBsTDtaQ/hqpusBcnu8TwMPEEdDvgcMe
-m2Snd3Ynu8YAG2K0b2mpLp4g2F5et7d/Y+8BpjStbE9/uu6y4Sfbr2Ih1dGJ3iFm
-VoQK9Bn+RLcXVH4Iha+/iiQzyYRRF+dCb0Uk5gogK+B+OJzMHR4I74WHEfB7A4hb
-k/6KYBedJQJatOJ/HFK/2jIplukbSDjVgwL8jo88N71U5A00voiSVk6wUbEvLG3O
-APVgRLvvAfEVMLKp0pm1zJWoPVAUaRRRMxDWncVcP5+EvIefQ+YhuhT2mX6FiSL2
-CzBpYQ1DNhxY6PHyGwxsjTz16fMUQjdtc9NBRp+Qa/lJeyxw5yjNcgRjrdNWCOvr
-r1GUGUulSCRN8C0V0KdjO7FpC9g/v1hTlodDyJDCXHfuB4GH56QnWEHu17Xcj8Dp
-11EETGJaRpvPFA3+nq3BbbP8Ndd/d1nSrbvqy48lwE4imbBO5lriVMViMWdDwa3P
-H+zvzxgbrgrNGTsBgAuxx/J8gl0IwHwxfYYo2Smw5tAjYDHUvSrPWR/MIxPAn8bj
-ZE3nQsGYvJDBHT/+j0zc
-=cxuN
+iQEcBAEBCAAGBQJQVCdzAAoJEEqz6FtPBkyjRf0H/AsZfCGVJJMJGPzROOqWNNF1
+HkvbFL4oKjInigY/PFxMjE5u4vJ0lqXGbQDpGkL3KMYrmZOItKDcMiz+8vfMrbaY
+R4xTHaz7Erl51LsH+kybQ/7GcDPNJhlFa1HzRGnSto7XT+WMkMm0n/JcjhPJTei7
+fNFWIkXKlvZjlAS52StJN6MlECoCa6tpL+KQuY31vQZgqPaeJbVVk2xiQYiFcH3g
+JoR9hPHfsCV6Vnu9EPKxZMHsss8nOZFTJokSlFz5KvkNqG7UToNKEnipiJHOUE08
+otSnKTqUg2PbSPRzYEqINhA5tRS1MjsdKWarq8+Ar7DOK/vjIQtkfV+rj5Ww6vw=
+=HIBH
 -----END PGP SIGNATURE-----
diff --git a/net-news/newsbeuter/files/newsbeuter-2.5-gcc47.patch b/net-news/newsbeuter/files/newsbeuter-2.5-gcc47.patch
new file mode 100644
index 000000000000..48ed1682a3ed
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.5-gcc47.patch
@@ -0,0 +1,61 @@
+--- newsbeuter-2.5/src/controller.cpp
++++ newsbeuter-2.5/src/controller.cpp
+@@ -30,6 +30,7 @@
+ #include <ctime>
+ #include <cassert>
+ #include <signal.h>
++#include <unistd.h>
+ #include <sys/utsname.h>
+ #include <langinfo.h>
+ #include <libgen.h>
+--- newsbeuter-2.5/src/google_api.cpp
++++ newsbeuter-2.5/src/google_api.cpp
+@@ -7,6 +7,8 @@
+ #include <config.h>
+ #include <utils.h>
+ 
++#include <unistd.h>
++
+ #include <curl/curl.h>
+ 
+ #define GREADER_LOGIN					"https://www.google.com/accounts/ClientLogin"
+--- newsbeuter-2.5/src/pb_controller.cpp
++++ newsbeuter-2.5/src/pb_controller.cpp
+@@ -12,6 +12,7 @@
+ #include <pwd.h>
+ #include <cstdlib>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include <keymap.h>
+ #include <configcontainer.h>
+--- newsbeuter-2.5/src/queueloader.cpp
++++ newsbeuter-2.5/src/queueloader.cpp
+@@ -8,6 +8,8 @@
+ #include <config.h>
+ #include <libgen.h>
+ 
++#include <unistd.h>
++
+ using namespace newsbeuter;
+ 
+ namespace podbeuter {
+--- newsbeuter-2.5/src/reloadthread.cpp
++++ newsbeuter-2.5/src/reloadthread.cpp
+@@ -1,5 +1,6 @@
+ #include <reloadthread.h>
+ #include <logger.h>
++#include <unistd.h>
+ 
+ namespace newsbeuter {
+ 
+--- newsbeuter-2.5/src/utils.cpp
++++ newsbeuter-2.5/src/utils.cpp
+@@ -11,6 +11,7 @@
+ #include <libgen.h>
+ #include <sys/utsname.h>
+ 
++#include <unistd.h>
+ #include <sstream>
+ #include <locale>
+ #include <cwchar>
diff --git a/net-news/newsbeuter/newsbeuter-2.5.ebuild b/net-news/newsbeuter/newsbeuter-2.5.ebuild
index ba1aa79d01d9..527ee06575bd 100644
--- a/net-news/newsbeuter/newsbeuter-2.5.ebuild
+++ b/net-news/newsbeuter/newsbeuter-2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-2.5.ebuild,v 1.4 2012/08/03 15:24:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-2.5.ebuild,v 1.5 2012/09/15 06:59:57 radhermit Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="A RSS/Atom feed reader for the text console"
 HOMEPAGE="http://www.newsbeuter.org/index.html"
@@ -38,6 +38,8 @@ src_prepare() {
 		-e "s:-ggdb:${CXXFLAGS}:" \
 		-e "s:^CXX=.*:CXX=$(tc-getCXX):" \
 		Makefile
+
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_configure() {