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.

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

5 files changed, 117 insertions, 4 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++/Manifest b/dev-libs/dbus-c++/Manifest
index 97226aba421a..4252bcc3f5ff 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 SHA256 4f1c7633d224da33dcfb0b10f19ac1656df09d757152909d1f6b04b66ffa8c67 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2 WHIRLPOOL cde935b6c7eb148e1221f1a3137fe24dd53543d27f81694a240f565d205dd1999cb99aaa4c99a8d1202648282e002300ab6b9e69796dd0d1c4266acb7ba011ef
 DIST dbus-c++-0.6.0_p20111126.tar.bz2 1287009 SHA256 17d042818c6f1611f7441e365ea4b7bb8424cda03cd182d413b42904a6293f7f SHA512 1e2460eff6b6146ce9444ebdc34344a709ee1ebffde8ea1cecbeec5f8305455a7edec323bfa48792fb28f83b833049468e221c58f724049cb53f8e9811ed2959 WHIRLPOOL d08abd010b6a7d6506316cd0b12c1478267b330b584ddb468a922b5bb697cb6dd5babae6b4eb451abc41211008ad50450be94d50a2784fd868a1214c5ad53ad5
 DIST libdbus-c++-0.9.0.tar.gz 466362 SHA256 bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319 WHIRLPOOL 71df5476368591aa289ee35e5b5eacf6f9322bc5fb6c0180f18ff4deac28700d4903b54ac8a0208600062e147f7ae50c0865f7c1cb71a0b2219377120f73ffab
 EBUILD dbus-c++-0.6.0_p20111126.ebuild 798 SHA256 f9ebe6957d46124df5d2e9855d3f912a673e9d6bec43f928e3511a19d0f7db49 SHA512 29aa24bd9a5c2a78c16e65612257b4e8ae29a1d7d26b3a5e94c720b6e356d1dd11a4f9376d323a90e91a4c6f7d95c45cbdc3e1a433cf52143fad83195bae720a WHIRLPOOL 8e544bfb89a31203d1af8d0138063a056206fed98d92ac71a7a1292e7dff03b28919cf4299a41f992e7352fdb30c2c34eb4e114c2c96d25607ef39bc71a3ec27
+EBUILD dbus-c++-0.9.0-r1.ebuild 1083 SHA256 55711fceec3d5a87a54384b9c7969b6fab457dd5ddbace21e0e4f4693b5b13e0 SHA512 d3a7a648e15df27f3d99aeacddfd4084ca7d5a9ab69dc34f25f53b077fd5cd04f6e8b001319813d9a73502dd83435cef9fa0cb473c5a7befdf9860ac5c6f99f0 WHIRLPOOL 491012ae7cccfe7e366dd980fa5dee7087dccc766a644612321d00bdc32c3cef5500048e72baa1033993f307b88c2907cb6e6942ec1bfdcbac807460b4ec83bd
 EBUILD dbus-c++-0.9.0.ebuild 917 SHA256 3e66b578f5917a2cbc7dd9f44c5ad468504f6e6107130ddaab0c77fb9d0c6552 SHA512 9a93e24f9a7f25bc6182fb4d0c636cda1eba6374352fec7a539274078f65856573ecf455ac3e8a9253bca94e5b87943e40dff7c17bf7e82c2fe1811341fb95a2 WHIRLPOOL 09b493e27e37363f244b04ed876a448d8cfa4f2b21fafde24b340e694cda940ee9b424f352d9d3f8a8d5eb622610841a727dc4ab1ef991bf6398496d0ae39ffc
-MISC ChangeLog 775 SHA256 a0550bf9441cdb86d710d58de8547570322385d45ec63a072978a8444e1dae8d SHA512 d263c0ca3e7d1017dd139c8b06d0782c59dd1429a3a4aab24a98b9e4b6e71a606a72db4eaa7c1aaabe202e7527761ea4e59d8a0ad3ac17ad4a4d13655b2a0e4f WHIRLPOOL d7c65a7423c42101b60c0c29ee049dc35070fd40203c5f7efe9ddcc4c1eb47ccd133f14362714a21433ba9af55b4da1a2aba01b5ea8ae8c06427e6ae53ca7f10
-MISC metadata.xml 396 SHA256 0203905a4674f613bac67ba7d4300fcccc9fa7e979028bae669b1ec0a7b00448 SHA512 99fa5db3f61a4bdf54c200753fa8caa454d4fe5b939faa9fbf618719fc70003860c1cf2db4ce4eefb555235bee4c625aade50f37f252eedd966d74637f99a239 WHIRLPOOL 938230e4ff2195b9fbc0d3dfd0fa8ee36a8d0d0e590cbb1b0e2f1f8aee5be4f2917068e38ee16a94305903e263ce6cc4589a432eebc1ae8a1b6ce032d05188f9
+MISC ChangeLog 1098 SHA256 ea2660fe74cfba5022c80a58782be6fbe969fdddab4cf3490c29d03b7c34a9d1 SHA512 588ae99e0569677e3649ccf1cf204c67e4aef8018b4b30768affb121357558946b55135377d4bdbe7d9e3585a67c068c48ac86d23bec8a12de9b5bb54b463638 WHIRLPOOL 5001de569235551e28eb1a95694bc6ffd27f25c965898f3c8552a683b574eb498e4711a45fc823db3f5fde0e109de5dfca3cb9ea8267d203b453ac5efa9ca9fd
+MISC metadata.xml 444 SHA256 3b4216e83fe0560724019cbabe3ef00a5ed33cec61b99b27317cbe8b4fa903f5 SHA512 fdf2ff7585cc81ef52dc408e44d75831b3909fe339dce2ead8f6eb10c1a56815b634be82baa0aa2ca79568b2993110c28de914e83d3d762b21d390b30952cc04 WHIRLPOOL 54bf8ed496940da8cdca0a0ab1e3c0f75bd1367591aef25f48708f33526748e277c27c3887855422181a86e4c45b1d34f615594ba6c9f81aa62fdb15d57b7a1d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQTnftAAoJELEHsLL7fEFWn60QAJbl7N7Qpu/wYuCKAc8V3O/R
+9VX4Q1Gv7Biu5RUl4ne32OVYtnEx4DPBzeVRfKCvu9BLlzVv4C6ruZ60v8fOdFoi
++zMAIpbSDAUHyZeA1TQWSGPbu1fbxp3o425ZXKo6+H69J3MlsMWYoGno+E3GFFvp
+roTMvtPE+StuVmEVBTmwM1+UwlgCDW0EnCiSnjke/Sras6RioZOED0vEboiRl1bQ
+e2/1fmqTLlVpqhQZJK0Csxzhk8D4qzBAyRiOOeONcrvfng23Qh6ahYhw62NvP8BE
+9sArbHZZTRXHQ/DPmfqsIolX4Weq1VJVYd+hDyfgxw/haTbPDracBKyIhTkfo/5u
+GTHHGFg4wU1NTORZpgOqlKiNUzl8JB8/U9hZIK7S8tIJyEiqyUsupFGaBXihdTgR
+TL6ZFsTFBgefK8jOa3QnwQ0WBqb+VX73MRqa1eYK3JJjn4PNBzCgo1m7qfuM5a4s
+NMfSXJcP4KwbYmlMGg89UDfh8rnov7ghPJST54ZlauZ2qKZeoysu8LqcIOIPak9R
+mXMexoUYYxTZwGSbjSf5EpCx0Wv8PY9Kk9+OsCYuUlXvlomfAECJjoclZWsNwd2N
+4J0v/E98onfEme9SPOqiwwFu7b2AiXJtSGCDUfh+zJoQZg+VftCJccvAdDKV7RfE
+JwoAvQeODdxSb6KDP0Sv
+=mJ2o
+-----END PGP SIGNATURE-----
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>