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

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

3 files changed, 50 insertions, 2 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/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
+