Fix building with gobject-introspection-1.30.

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

4 files changed, 114 insertions, 6 deletions

diff --git a/dev-libs/libgdata/ChangeLog b/dev-libs/libgdata/ChangeLog
index cda0db6734eb..b4285a944d34 100644
--- a/dev-libs/libgdata/ChangeLog
+++ b/dev-libs/libgdata/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgdata
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.37 2011/11/08 21:54:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.38 2011/11/15 22:54:00 tetromino Exp $
+
+*libgdata-0.8.1-r1 (15 Nov 2011)
+
+  15 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgdata-0.8.1-r1.ebuild, +files/libgdata-0.8.1-gdata-symbols.patch:
+  Fix building with gobject-introspection-1.30.
 
 *libgdata-0.10.1 (08 Nov 2011)
 
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index aeed005cf273..14cb43966aab 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libgdata-0.8.1-empty-names.patch 5173 RMD160 9acdbca20a3f7f146a372826c710362f624723bb SHA1 45e94481032149d95f17a0fbe44226e21fe9a71b SHA256 c7f1f7d380775e7b7e8756f58fb221bb04aec77de4e95b3b9f5f70bb7e0d7add
+AUX libgdata-0.8.1-gdata-symbols.patch 1060 RMD160 35397d13d19b35ea7a706dcc2a18284544ad9f97 SHA1 d2f9997c672d21fe9ac7553c05e8f07f378e1d09 SHA256 ffdcf7b030eb2a620ef04b410d4f82dd40cb1dbbaf712378757163d70d6f1b34
 DIST libgdata-0.10.0.tar.xz 1126664 RMD160 6d88a72b469e9d4969334d4531cc0f582d6eb48f SHA1 49c8f23c2689068b20ddc6b8e02f3888adb644bb SHA256 af4805304763b93058773bbfdb06925189159196066207f275cb34b1b5c552ec
 DIST libgdata-0.10.1.tar.xz 1131224 RMD160 c2762edb71b3ddc0c83a0e748eb057f66c702800 SHA1 5e42e3c03ed4f1decd0eadd4f57c7cdd66d6f109 SHA256 d7f27b1019905792246336599cadc7470b362806ed5e2c038a9f7c0da257f6ef
 DIST libgdata-0.8.0.tar.bz2 1240410 RMD160 4a5dd9dd291e487be846443daad8f1f4af2f6843 SHA1 3d0beebfb248d8d684762492755c3e195220f929 SHA256 1a816dda7de8ce162e00cc1c782a5ae25230a36d56c590a67d86848058797c9f
@@ -9,13 +10,14 @@ DIST libgdata-0.8.1.tar.bz2 1201616 RMD160 ff56052332399e29a0a615d9128524cb2a178
 EBUILD libgdata-0.10.0.ebuild 1861 RMD160 2e2bcd9b1092decd19600199c14c34daef2dedbb SHA1 11337c374e53c3577070cab870724085c20116d8 SHA256 6adc5b33c15eeaf4168f2d4111f3ee2eaed4744d245cd96bcd974b34a1e5bea3
 EBUILD libgdata-0.10.1.ebuild 1855 RMD160 76d871e3b3738f884c5de1bc22de883d0bd8c8af SHA1 012bc768ff6c4fcd28e53265459a917c677b00a3 SHA256 660055d7a4b779a05dfed8124b9f89551aecdd52a9271a8ba0f8a5681897c1ec
 EBUILD libgdata-0.8.0.ebuild 1618 RMD160 961836d0262133dc529c114f83d4383a3323acf2 SHA1 de6817401e1121150c931d68c9afa1b8f2b36c38 SHA256 b3c1d02a7391a60d84c4015c91de6765e9118955b3aa01b4053d44273c59620d
+EBUILD libgdata-0.8.1-r1.ebuild 1879 RMD160 55c17fe688ad5cb4653e85bea323118354c97cab SHA1 55e3a342bf84eaabfb3684a9d2c51ebab66ba37c SHA256 2504c5767cd41e0c4e5d42948b8426c399b38ebd3faf84419712b7a587ef81e9
 EBUILD libgdata-0.8.1.ebuild 1756 RMD160 c95df6764b8a1298049051e416d34b7240eb7f0f SHA1 4b51a76e4ed644c11bd7130d8b150519d8d3eead SHA256 f2811263f327c053800c09faa5242e7ffc62f42ae7c6a431a4f315155544644a
-MISC ChangeLog 5422 RMD160 301e275849b5a103e2b8204333603571cc01939a SHA1 493281771e707c6b6ff33e6583121cd6c0375165 SHA256 996d0e6642ec690aba9528b7a3ca938e7c46ea0ccaef842246dd1bd945881b84
+MISC ChangeLog 5642 RMD160 a92ac4b0beed28cd37b3bba7c82333327391d538 SHA1 91cca9e32b8d13109d8bf43ea3aaff6ebd8a326e SHA256 ab8d1240d638cf41041487c2e09a42e2c61774c714322cfec468fbb4d9ab7126
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk65pQcACgkQ1fmVwcYIWAZqHgCgncjxgWHTXoQmV29cB+1pG62q
-9coAn1mYkjvatvnymF4aP9z7i3evR3iU
-=3s8i
+iF4EAREIAAYFAk7C7Y0ACgkQdjK8w9WeBnAiugD/Z2ZKMSIc5XAcBdOaECuVM29a
+ckAyuckMVkWZnLij8P0A/jXjaPQShUZXrxrREZz3K8LU05E58gm2E9m0xZ+AppOa
+=rmZf
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgdata/files/libgdata-0.8.1-gdata-symbols.patch b/dev-libs/libgdata/files/libgdata-0.8.1-gdata-symbols.patch
new file mode 100644
index 000000000000..0477b5678101
--- /dev/null
+++ b/dev-libs/libgdata/files/libgdata-0.8.1-gdata-symbols.patch
@@ -0,0 +1,33 @@
+From 60330e8a42e80c4dd647c55a4b99c44d67cedfc0 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip@tecnocode.co.uk>
+Date: Mon, 15 Aug 2011 22:15:57 +0100
+Subject: [PATCH] core: Add missing symbols to symbols file
+
+Closes: bgo#656529
+---
+ gdata/gdata.symbols |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/gdata/gdata.symbols b/gdata/gdata.symbols
+index 1220ce9..a2d0590 100644
+--- a/gdata/gdata.symbols
++++ b/gdata/gdata.symbols
+@@ -94,6 +94,7 @@ gdata_query_get_etag
+ gdata_query_set_etag
+ gdata_youtube_standard_feed_type_get_type
+ gdata_youtube_service_error_get_type
++gdata_youtube_service_error_quark
+ gdata_youtube_service_get_type
+ gdata_youtube_service_new
+ gdata_youtube_service_query_standard_feed
+@@ -646,6 +647,7 @@ gdata_documents_query_get_reader_addresses
+ gdata_documents_query_add_reader
+ gdata_documents_query_add_collaborator
+ gdata_documents_service_error_get_type
++gdata_documents_service_error_quark
+ gdata_download_stream_get_type
+ gdata_download_stream_new
+ gdata_download_stream_get_service
+-- 
+1.7.8.rc1
+
diff --git a/dev-libs/libgdata/libgdata-0.8.1-r1.ebuild b/dev-libs/libgdata/libgdata-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..6be7dde7fe00
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.8.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.8.1-r1.ebuild,v 1.1 2011/11/15 22:54:00 tetromino Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="http://live.gnome.org/libgdata"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnome +introspection"
+
+# gtk+ is needed for gdk
+RDEPEND=">=dev-libs/glib-2.19:2
+	|| (
+		>=x11-libs/gdk-pixbuf-2.14:2
+		>=x11-libs/gtk+-2.14:2 )
+	>=dev-libs/libxml2-2:2
+	>=net-libs/libsoup-2.26.1:2.4[introspection?]
+	gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	doc? ( >=dev-util/gtk-doc-1.14 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable gnome)
+		$(use_enable introspection)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Disable tests requiring network access, bug #307725
+	sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf\nOLD_\1:' \
+		-i gdata/tests/Makefile.in || die "network test disable failed"
+
+	# Allow Google Contacts' user defined fields to have empty names, upstream bug #648058
+	epatch "${FILESDIR}/${P}-empty-names.patch"
+
+	# Fix building with gobject-introspection-1.30; fixed in 0.10.x
+	epatch "${FILESDIR}/${P}-gdata-symbols.patch"
+}
+
+src_test() {
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	dbus-launch emake check || die "emake check failed"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgdata.so.7
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.7
+}