Add fix from ChromiumOS for building with gcc-4.7 #424707 by Diego Elio Pettenò. Update to EAPI=4 and add more USE flags to control optional behavior.

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

4 files changed, 93 insertions, 2 deletions

diff --git a/dev-libs/dbus-c++/ChangeLog b/dev-libs/dbus-c++/ChangeLog
index 722ef8ae46b6..8d5160cfb8a4 100644
--- a/dev-libs/dbus-c++/ChangeLog
+++ b/dev-libs/dbus-c++/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/dbus-c++
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/ChangeLog,v 1.4 2012/05/04 18:35:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/ChangeLog,v 1.5 2012/09/10 23:27:32 vapier Exp $
+
+*dbus-c++-0.9.0-r1 (10 Sep 2012)
+
+  10 Sep 2012; Mike Frysinger <vapier@gentoo.org> +dbus-c++-0.9.0-r1.ebuild,
+  +files/dbus-c++-0.9.0-gcc-4.7.patch, metadata.xml:
+  Add fix from ChromiumOS for building with gcc-4.7 #424707 by Diego Elio
+  Pettenò.  Update to EAPI=4 and add more USE flags to control optional
+  behavior.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org>
   dbus-c++-0.6.0_p20111126.ebuild, dbus-c++-0.9.0.ebuild:
@@ -20,4 +28,3 @@
   26 Nov 2011; <elvanor@gentoo.org> +dbus-c++-0.6.0_p20111126.ebuild,
   +metadata.xml:
   Initial import.
-
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..d620880811bf
--- /dev/null
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild,v 1.1 2012/09/10 23:27:32 vapier Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="provide a C++ API for D-BUS"
+HOMEPAGE="http://sourceforge.net/projects/dbus-cplusplus/ http://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
+SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ecore glib static-libs test"
+
+RDEPEND="sys-apps/dbus
+	ecore? ( dev-libs/ecore )
+	glib? ( dev-libs/glib )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-util/cppunit
+	virtual/pkgconfig"
+
+S=${WORKDIR}/lib${P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch #424707
+}
+
+src_configure() {
+	econf \
+		--disable-examples \
+		$(use_enable doc doxygen-docs) \
+		$(use_enable ecore) \
+		$(use_enable glib) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch
new file mode 100644
index 000000000000..2d5771717248
--- /dev/null
+++ b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch
@@ -0,0 +1,38 @@
+sniped from ChromiumOS
+
+https://bugs.gentoo.org/424707
+
+From 154f7861d19a2bd5c79c488f9989610971db451b Mon Sep 17 00:00:00 2001
+From: Han Shen <shenhan@google.com>
+Date: Thu, 31 May 2012 16:49:35 -0700
+Subject: [PATCH] Fixed dbus-c++ gcc 4.7 building problem.
+
+Just add "unistd.h" inclusion to eventloop-integration.h.
+
+BUG=None
+TEST=Manually built using gcc 4.7.
+
+Change-Id: I87bd1f90db6a4c974a5ed8134044e8be2034aff2
+Reviewed-on: https://gerrit.chromium.org/gerrit/24260
+Tested-by: Han Shen <shenhan@google.com>
+Reviewed-by: Yunlian Jiang <yunlian@chromium.org>
+Commit-Ready: Han Shen <shenhan@chromium.org>
+---
+ include/dbus-c++/eventloop-integration.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h
+index 5108340..1b56ab5 100644
+--- a/include/dbus-c++/eventloop-integration.h
++++ b/include/dbus-c++/eventloop-integration.h
+@@ -27,6 +27,7 @@
+ 
+ #include <cstring>
+ #include <errno.h>
++#include <unistd.h>
+ #include "api.h"
+ #include "dispatcher.h"
+ #include "util.h"
+-- 
+1.7.9.7
+
diff --git a/dev-libs/dbus-c++/metadata.xml b/dev-libs/dbus-c++/metadata.xml
index 2a0fc77dcf58..35872ffb7d9f 100644
--- a/dev-libs/dbus-c++/metadata.xml
+++ b/dev-libs/dbus-c++/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="ecore">Use Ecore integration</flag>
+		<flag name="glib">Use glib integration</flag>
 	</use>
 </pkgmetadata>