Version bump for gnome-3.6. Update license. Drop useless doc USE flag, switch to global introspection flag.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

8 files changed, 205 insertions, 19 deletions

diff --git a/dev-libs/libgdata/ChangeLog b/dev-libs/libgdata/ChangeLog
index 4682e00fdf97..da9b46196685 100644
--- a/dev-libs/libgdata/ChangeLog
+++ b/dev-libs/libgdata/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libgdata
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.55 2012/09/23 05:53:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.56 2012/12/19 04:08:55 tetromino Exp $
+
+*libgdata-0.13.2-r2 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgdata-0.8.1-r2.ebuild, libgdata-0.12.0.ebuild, +libgdata-0.13.2-r2.ebuild,
+  +files/libgdata-0.13.2-Requires.private.patch,
+  +files/libgdata-0.13.2-libgdata.pc-unused-deps.patch, metadata.xml:
+  Version bump for gnome-3.6. Update license. Drop useless doc USE flag, switch
+  to global introspection flag.
 
   23 Sep 2012; Anthony G. Basile <blueness@gentoo.org> libgdata-0.10.2.ebuild:
   keyword ~ppc, bug #379651
diff --git a/dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch b/dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch
new file mode 100644
index 000000000000..9053640bf653
--- /dev/null
+++ b/dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch
@@ -0,0 +1,58 @@
+From 4e72579d1bbb302776a42551cbfb560ddd4258b3 Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell@canonical.com>
+Date: Fri, 5 Oct 2012 09:15:51 +1300
+Subject: [PATCH] core: Split packages into public and private so the .pc file
+ has correct depenencies
+
+https://bugzilla.gnome.org/show_bug.cgi?id=685464
+---
+ configure.ac   | 12 ++++++++++--
+ libgdata.pc.in |  3 ++-
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2ee881b..76d4898 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,7 +62,11 @@ AC_SUBST(GDATA_API_VERSION)
+ AC_SUBST(GDATA_API_VERSION_MAJOR)
+ AC_SUBST(GDATA_API_VERSION_MINOR)
+ 
+-GDATA_PACKAGES="glib-2.0 >= $GLIB_REQS libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS libsoup-2.4 >= $SOUP_REQS oauth >= $OAUTH_REQS"
++GDATA_PACKAGES_PUBLIC="gobject-2.0 glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS libxml-2.0 libsoup-2.4 >= $SOUP_REQS"
++GDATA_PACKAGES_PRIVATE="gthread-2.0 oauth >= $OAUTH_REQS"
++GDATA_PACKAGES="$GDATA_PACKAGES_PUBLIC $GDATA_PACKAGES_PRIVATE"
++AC_SUBST([GDATA_PACKAGES_PUBLIC])
++AC_SUBST([GDATA_PACKAGES_PRIVATE])
+ AC_SUBST([GDATA_PACKAGES])
+ 
+ PKG_CHECK_MODULES(GDATA, [$GDATA_PACKAGES])
+@@ -87,7 +91,11 @@ AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome], [Whether to enable GNOME s
+ AC_MSG_RESULT($enable_gnome)
+ AM_CONDITIONAL([ENABLE_GNOME], [test "x$enable_gnome" = "xyes"])
+ 
+-GNOME_PACKAGES="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
++GNOME_PACKAGES_PUBLIC=""
++GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
++GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
++AC_SUBST([GNOME_PACKAGES_PUBLIC])
++AC_SUBST([GNOME_PACKAGES_PRIVATE])
+ AC_SUBST([GNOME_PACKAGES])
+ 
+ if test "x$enable_gnome" = "xyes"; then
+diff --git a/libgdata.pc.in b/libgdata.pc.in
+index ed1f4a4..cc927a7 100644
+--- a/libgdata.pc.in
++++ b/libgdata.pc.in
+@@ -6,6 +6,7 @@ includedir=@includedir@
+ Name: libgdata
+ Description: GData client library
+ Version: @VERSION@
+-Requires: @GDATA_PACKAGES@ @GNOME_PACKAGES@
++Requires: @GDATA_PACKAGES_PUBLIC@ @GNOME_PACKAGES_PUBLIC@
++Requires.private: @GDATA_PACKAGES_PRIVATE@ @GNOME_PACKAGES_PRIVATE@
+ Libs: -L${libdir} -lgdata
+ Cflags: -I${includedir}/libgdata
+-- 
+1.8.0.2
+
diff --git a/dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch b/dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch
new file mode 100644
index 000000000000..7c1e1b0efb50
--- /dev/null
+++ b/dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch
@@ -0,0 +1,45 @@
+From 25fca0ba204a99bc4c1c8411067a8b88042d32e1 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 16 Dec 2012 00:34:18 -0500
+Subject: [PATCH] build: Do not add unused gnome dependencies to libgdata.pc
+
+https://bugzilla.gnome.org/show_bug.cgi?id=690281
+---
+ configure.ac | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 76d4898..b4698c2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,17 +91,20 @@ AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome], [Whether to enable GNOME s
+ AC_MSG_RESULT($enable_gnome)
+ AM_CONDITIONAL([ENABLE_GNOME], [test "x$enable_gnome" = "xyes"])
+ 
+-GNOME_PACKAGES_PUBLIC=""
+-GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
+-GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
+-AC_SUBST([GNOME_PACKAGES_PUBLIC])
+-AC_SUBST([GNOME_PACKAGES_PRIVATE])
+-AC_SUBST([GNOME_PACKAGES])
+-
+ if test "x$enable_gnome" = "xyes"; then
++	GNOME_PACKAGES_PUBLIC=""
++	GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0 goa-1.0 >= $GOA_REQS"
++	GNOME_PACKAGES="$GNOME_PACKAGES_PUBLIC $GNOME_PACKAGES_PRIVATE"
+ 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
+ 	PKG_CHECK_MODULES([GNOME], [$GNOME_PACKAGES])
++else
++	GNOME_PACKAGES_PUBLIC=""
++	GNOME_PACKAGES_PRIVATE=""
++	GNOME_PACKAGES=""
+ fi
++AC_SUBST([GNOME_PACKAGES_PUBLIC])
++AC_SUBST([GNOME_PACKAGES_PRIVATE])
++AC_SUBST([GNOME_PACKAGES])
+ 
+ # Various necessary functions and headers
+ AC_CHECK_FUNCS([strchr])
+-- 
+1.8.0.2
+
diff --git a/dev-libs/libgdata/libgdata-0.10.2.ebuild b/dev-libs/libgdata/libgdata-0.10.2.ebuild
index bd9ce0182ae2..d629520a4b9d 100644
--- a/dev-libs/libgdata/libgdata-0.10.2.ebuild
+++ b/dev-libs/libgdata/libgdata-0.10.2.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/dev-libs/libgdata/libgdata-0.10.2.ebuild,v 1.3 2012/09/23 05:53:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.10.2.ebuild,v 1.4 2012/12/19 04:08:55 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,9 +11,9 @@ 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"
+LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="doc gnome +introspection static-libs"
+IUSE="gnome +introspection static-libs"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 # gtk+ is needed for gdk
@@ -29,8 +29,9 @@ RDEPEND=">=dev-libs/glib-2.19:2
 	gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
-	doc? ( >=dev-util/gtk-doc-1.14 )"
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/dev-libs/libgdata/libgdata-0.12.0.ebuild b/dev-libs/libgdata/libgdata-0.12.0.ebuild
index 826750266740..cb56fa85caa7 100644
--- a/dev-libs/libgdata/libgdata-0.12.0.ebuild
+++ b/dev-libs/libgdata/libgdata-0.12.0.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/dev-libs/libgdata/libgdata-0.12.0.ebuild,v 1.1 2012/05/06 07:39:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.12.0.ebuild,v 1.2 2012/12/19 04:08:55 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,9 +11,9 @@ 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"
+LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="doc gnome +introspection static-libs"
+IUSE="gnome +introspection static-libs"
 KEYWORDS="~amd64 ~x86"
 
 # gtk+ is needed for gdk
@@ -29,9 +29,9 @@ RDEPEND=">=dev-libs/glib-2.30:2
 	gnome? ( >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.14 )"
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild b/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
new file mode 100644
index 000000000000..8d4c2e5930f2
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild,v 1.1 2012/12/19 04:08:55 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools 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/13" # subslot = libgdata soname version
+IUSE="gnome +introspection static-libs"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+# gtk+ is needed for gdk
+# configure checks for gtk:3, but only uses it for demos which are not installed
+RDEPEND="
+	>=dev-libs/glib-2.31:2
+	>=dev-libs/libxml2-2:2
+	>=net-libs/liboauth-0.9.4
+	>=net-libs/libsoup-2.37.91:2.4[introspection?]
+	>=x11-libs/gdk-pixbuf-2.14:2
+	gnome? (
+		app-crypt/gcr:=
+		>=net-libs/gnome-online-accounts-3.2
+		>=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable static-libs static)
+		$(use_enable gnome)
+		$(use_enable introspection)"
+
+	# Two patches to correct deps in libgdata.pc, bug #444270
+	# upstream, in 0.13.3
+	epatch "${FILESDIR}/${P}-Requires.private.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=690281
+	epatch "${FILESDIR}/${PN}-0.13.2-libgdata.pc-unused-deps.patch"
+
+	eautoreconf
+
+	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"
+}
+
+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
+	preserve_old_lib /usr/$(get_libdir)/libgdata.so.11
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.7
+	preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.11
+}
diff --git a/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild b/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild
index 76294d83a522..a97a233c6ff8 100644
--- a/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild
+++ b/dev-libs/libgdata/libgdata-0.8.1-r2.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/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild,v 1.8 2012/04/16 18:07:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild,v 1.9 2012/12/19 04:08:55 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -10,10 +10,10 @@ inherit autotools 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"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="doc gnome +introspection"
+IUSE="gnome +introspection"
 
 # gtk+ is needed for gdk
 RDEPEND=">=dev-libs/glib-2.19:2
@@ -26,9 +26,9 @@ RDEPEND=">=dev-libs/glib-2.19:2
 	gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	doc? ( >=dev-util/gtk-doc-1.14 )"
+	gnome-base/gnome-common"
 # eautoreconf requires gnome-base/gnome-common
 
 pkg_setup() {
diff --git a/dev-libs/libgdata/metadata.xml b/dev-libs/libgdata/metadata.xml
index 44825d13c084..dad9001338dc 100644
--- a/dev-libs/libgdata/metadata.xml
+++ b/dev-libs/libgdata/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-	</use>
 </pkgmetadata>