Fix building with sys-devel/gcc >= 4.7.0 wrt #; #425432. Thanks to Ben Kohler and Diego Elio Pettenò.

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

4 files changed, 60 insertions, 11 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index 5a6c2b0bb8d4..e243887d722d 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/barry
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.23 2012/08/11 16:45:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.24 2012/10/03 15:39:00 ssuominen Exp $
+
+  03 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> barry-0.17.1-r1.ebuild,
+  +files/barry-0.17.1-gcc47.patch:
+  Fix building with sys-devel/gcc >= 4.7.0 wrt #; #425432. Thanks to Ben Kohler
+  and Diego Elio Pettenò.
 
 *barry-0.17.1-r1 (11 Aug 2012)
 
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index 39669af6a8ed..dfe2d62c8796 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -3,22 +3,23 @@ Hash: SHA256
 
 AUX 10-blackberry.rules 1983 SHA256 26d15257fc5f48089a1b8559e7ac93101bdbc4434e409214c67dda130f05159a SHA512 d4186d6ad3df049ebc4120e17192e8b8393121aa9be22fd0403fcce65edcc06815a8c23c4f814a701e85e48ddd73b660c48cbd07d192ec1e609d7627bac2e085 WHIRLPOOL 40cddbf3b44450ba3adac2aef17eebb182bfda6a65f2563cdacb71281f2c4fd40dab112168aa03c159ed0834aa87d4717241ea7d72b4d2983d6cf14f2b3d2f29
 AUX barry-0.16-gcc45.patch 310 SHA256 f341443d2de4a229eeed8409ccd7e52d3ce8cb3dc3ab5607f69657a3472785f6 SHA512 83fdde7a6baf58b8d19a9227f7a333df05b06d1efef91f15e7bfe86dbea9fd72ece05a407f3c61dfcfba12061b2a298f5408ef08644cafc82d5291d555779e3c WHIRLPOOL 34bd7c7fe10e1e4600c0ad537588c84c2611b633010eab67f550550daac7dac0961ce7a0b052bf8b725ae8a42da7a62abb49c24f6a5a41582b53cb9e3a5dc0ee
+AUX barry-0.17.1-gcc47.patch 982 SHA256 961a4ed6b0d33a06b6fb32c47d66911ba9b3fa22832480afaa4941d71058a2df SHA512 27484bdbec3ec2daf745eba75347719ff00f1049099ab5d84d0727b262396fb24a2ce8e66f71a63752ece66cdfbbccc9a87dbdf727ec526a4b95e6228cb7b470 WHIRLPOOL 0c1d21f4b902871c9381b99f1be3ca1c035129153b899115dbe750cb1d5a0dc35a6014b5b285c590afddfba7c23a37453b494acf243bdacd4fda6a17374839db
 AUX blacklist-berry_charge.conf 65 SHA256 26003dcfdf7da0a677cbc72e01615fc694ccd2e884269da9a22d722f7549386e SHA512 515ddded3d8dd4d1aebc9543b4fbb6f5b5096729fe5bcc06c6f0ae3702b5399640dfefcbc448517babb692765a9504ca356cd7027e5861d60427f9e8099d535e WHIRLPOOL 71b2c131ecf107028ea424528a7ebd9411abd83a4394dffd2801dbfe60aa1905eae0490ccd2c56c82f1ef83b85fa27199df29775c1be61e5edbee8c453db2864
 DIST barry-0.16.tar.bz2 4981342 SHA256 60f0055399a6d97445e069b804bcc8a1c60f5fc999fcec385dcd4484990ec220 SHA512 7bc39312367e3d95a10e34a0d8ef366a631efcc925ec45213b5863ae71b8f893a40d7ff1e4f6b3971ad76b83b66e41f2c8f7133e30ccffce2cad715822b8228f WHIRLPOOL ef61e2303f58347a5a91f352e15f0623c5aa6bf69efef30514d2616c9ff6500b6b61eb49beeb760546775c7d60cbc5095b85b5c5b17e03b4bf16d8c09d31b2ff
 DIST barry-0.17.1.tar.bz2 7618810 SHA256 8bff44bc0ff88aee6bb55d50c5dc84949c92f01841304833da4a50ab171e34ae SHA512 a2c96d4c0123a72d3889f0092ee90c748827453455be9a9b22e6e3f3c3d99e33b7547a9c32c6898d311919230969a8b8e7106d52b49301b2959464a2f5e1deff WHIRLPOOL 00ac326d1d42467a7ba4a92b9152fa656391624f9fe5b69c3374d90e0535d7c9202c961784c9433d4aa9d3121b95635b1fd1de29dd6db83110048149d3c6a16f
 EBUILD barry-0.16.ebuild 2345 SHA256 4d0f7b198d93a7b97439ba7c982c76bc57243ad8b22ddb8927280ebd9735e633 SHA512 a8f45ecba4cd1be0e8b5d0e29fc3cce8eb1b6355b11c6f37e44e216649743c30d1efc3e79d0f2d0d9a45e1755f2c7c8b832ac38b6f2556c062fd0a7dd2bb1584 WHIRLPOOL c1a6a4ed1f420f58e41e1ab38d026bc6bf7f870170c302c862ac6958732e2513972795382d5a5039f5565a26f504bf6698a4f0532e7dfc3fd9d7b3cc6bd80b49
-EBUILD barry-0.17.1-r1.ebuild 2716 SHA256 f0cce89a371c98470db60fadbf608829b708bb0232676b3e8d7676bee8d4174a SHA512 e516a907aa769aae9368c2154d2852cd1e153a4488a730fab49ce53c38ca9a5cbe896137a4713374074f8b0029915cbfb3063c32f6b989d6ef898d7efa6c0dbf WHIRLPOOL a1254d003d2b69a1375a0c9e6acd86df6181e87529c6bf10389453508938c79d66a30af6b6b563c5cdab7c6fb6e18f7252bb22cce77cb830e970a796a8f4887d
+EBUILD barry-0.17.1-r1.ebuild 2760 SHA256 5828dca215c0511ef373d14265b6455b41ea9a4c2a8da6807fa2dbb31af678f2 SHA512 03deff9af6bf24c97673f67c54a061152e3055e5663eef242a02f28e65581e60d49c62006b1abe32de740d96f9fc52bddc9833a353616d3c8b0bab08b1442024 WHIRLPOOL a26cf5acbd256a4e6efd20e48a3bf46bf70600f584a0f6c0d82ca74b3cd3353852eac05e88cbf7a5d0a5878440de96b9d5b5ab1c67c6629cb2983d452afe0475
 EBUILD barry-0.17.1.ebuild 2584 SHA256 c19bb93b9efeeb52c36507b03634867258ea63bc60524b2724bd2a1df3fa9477 SHA512 68e635712fbb1cbe9d7e2deefe04190d71a45f775bdc9292de8ed006abea844284a9c825bdfd9323e60149ff21357fdd34f383b8508182ee8e70d8ac7e5cc3e6 WHIRLPOOL 4a7ae3b0aeba2c897dc5b57143e4c0abe389f3fbf6891e318f10275ade92c7193a96a10567e9f22f5d775f2092eff5ea09e9b3d2b4dde1b57138b92551354938
-MISC ChangeLog 4115 SHA256 03a20038e81e0d1c084ebdecf1e86f64871ce79e61bbddeff94d162695658c08 SHA512 0b64d8c6f14a51ab58fd699f422d47fa64f31638f92cb49ca41ea84fdd8cc25a372a055238a3fe5d42bc908799d9b1f084b6e7e80e432fa2f490b80bb8cad4b8 WHIRLPOOL f03781dc07ab5918d1b63adb4da12702aba4212c678e09fc17a78b4ee7b67eeacebabd4a39f0ed7f7c4b23712e2476b3f7ab733780194d2020a602bae62762f0
+MISC ChangeLog 4336 SHA256 0f5569e18051ee471b1cf10abb90896a3d1414f95b91c3e9bf58956bc38d1f0c SHA512 e45a672a63173b7cf334e0ad7ffe28e7598453c4c4b87de174c849fc10ec016c9ec9d8702c0a63affc9f5db5434fa20525f568170a3957787d1e68d031cbac4b WHIRLPOOL b673cc636af4e83c4dca6a6980fa487c3f4397b1bb8f088162bce0b2d6f1130d44bd4cd448bdc3a57c18adf2aea1f10fc480a528bde9f0110844bcd365e49597
 MISC metadata.xml 612 SHA256 d2bbc5b8ee764c1bc941bc5375bc3d868ef3d697e86acf6e1ed3b9addeaffcf4 SHA512 c6800b09d94d87786e0ed9bdbc6c1f9759763aae5668fb2878e2c7ebe2a102c8e9feb9f8181966dace44681a81104b2c2d497ea2b4bc065d1da1f89cef16bb2f WHIRLPOOL 4ae3c8be0d94d98c75f6187670fc6193bc8f91e7a487357dec5c80fc65d58d58632b34ada2713785a0c275ed2b4286bb779483a162ec177c829ec436396d9385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQJowjAAoJEEdUh39IaPFNFnEH/AhukHHuAjw+v17VAQ+GJZil
-OPxUo1+3XxV9Qd5S8P5ZKmUPS5je1Zixsde2Gzfmmt7wHb5jWVGLBpOLhIWnIheU
-E+Xsb+d79rNkUNxr6Y60NKIgTWrkRHZMbPjD+PfBiD28BpSxli6NebTMOM6zj8La
-TWsJRZxW0QgAknaR6ifvYWSG+aEScg5Ho+94mwBh4tUeByofKDVdkPzJq3p00hzS
-Tglr7pWu++ur7BhQJT6QMmN2b6QyZldFWTvPuuul0oJ6Co5mWnYDNs/KKswhREU7
-lZHyg50Df2swCdWqrAkWc6Mmyb7ZBmI4zZcf1lDxzfc5Kq0FbrNDuoXsrTA/mAM=
-=Djkc
+iQEcBAEBCAAGBQJQbFuFAAoJEEdUh39IaPFN6BsH/3zMYDePNITm48Hwq7O4+pMS
+v4lTUab1whMn1om5VaP9UA8CqqA6cWOGRcL2Wz3j3gDCb0BvttDXSAsTHTzoHv57
+2HtnuYo84eZvZlV/CCxcVsw3jOQNvBWygoXVdUhz7J1x395sMRScl2fz/Ywxp/k6
+1n6QRFb1Fgn4R7+7kS5VY2r2VSzaT+smj2vQjgBIVy+hHl7wsFg+kKT/XGtIPJ6+
+XwGJF9IHN2spVYewEZRVQUIvfbTJerLpVpZQsjGSIoEi10ehA4E5zpOH8miwpsyJ
+q3fYZbyx94KE8/BCl7rPtkYgoTXB6FoXUdVvUhExVeeBZYICgQFpIwgWczfgb9w=
+=GZDq
 -----END PGP SIGNATURE-----
diff --git a/app-pda/barry/barry-0.17.1-r1.ebuild b/app-pda/barry/barry-0.17.1-r1.ebuild
index b67d102a7f4e..bdc5fada245f 100644
--- a/app-pda/barry/barry-0.17.1-r1.ebuild
+++ b/app-pda/barry/barry-0.17.1-r1.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/app-pda/barry/barry-0.17.1-r1.ebuild,v 1.1 2012/08/11 16:45:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1-r1.ebuild,v 1.2 2012/10/03 15:39:00 ssuominen Exp $
 
 EAPI="4"
 
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	doc?	( >=app-doc/doxygen-1.5.6 )
 	nls?	( >=sys-devel/gettext-0.17 )"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+
 DOCS=(AUTHORS DEPUTY ChangeLog NEWS README TODO)
 
 src_configure() {
diff --git a/app-pda/barry/files/barry-0.17.1-gcc47.patch b/app-pda/barry/files/barry-0.17.1-gcc47.patch
new file mode 100644
index 000000000000..0ea1960263f6
--- /dev/null
+++ b/app-pda/barry/files/barry-0.17.1-gcc47.patch
@@ -0,0 +1,41 @@
+From c0daafaf990f014b811bad103e9b9b205bd7e378 Mon Sep 17 00:00:00 2001
+From: Nathanael Noblet <nathanaelnoblet@gmail.com>
+Date: Thu, 5 Jan 2012 18:25:59 -0500
+Subject: [PATCH] lib: added unistd.h includes for gcc 4.7
+
+Fedora 17 will include gcc-4.7 and as such the packages have all been
+rebuilt. Barry failed because of a change in gcc. The following patch fixes
+the issue.
+---
+ src/j_jdwp.cc |    2 +-
+ src/packet.h  |    1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/j_jdwp.cc b/src/j_jdwp.cc
+index 875f226..279e61c 100644
+--- a/src/j_jdwp.cc
++++ b/src/j_jdwp.cc
+@@ -24,7 +24,7 @@
+ #include <sstream>
+ #include <iomanip>
+ #include <errno.h>
+-
++#include <unistd.h>
+ 
+ namespace Barry { namespace JDWP {
+ 
+diff --git a/src/packet.h b/src/packet.h
+index a89cf1d..52f16f2 100644
+--- a/src/packet.h
++++ b/src/packet.h
+@@ -26,6 +26,7 @@
+ 
+ #include <string>
+ #include <stdint.h>
++#include <unistd.h>
+ #include "protocol.h"
+ #include "data.h"
+ 
+-- 
+1.6.5.GIT
+