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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

9 files changed, 221 insertions, 27 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/Manifest b/dev-libs/libgdata/Manifest
index 9f7ef34fddca..b205e81b94ef 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,21 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libgdata-0.13.2-Requires.private.patch 2247 SHA256 0fa33784f7fbdbeda7ed39716f05ae2d6b65da44b9c9de78851dfe573d0df727 SHA512 9a3cbdf07365414ffdbb838a590d902c058187891c00ab0d54731d37b914cd8e241347059526a1e1473ddc1ce780705a1764ffa0573431b5183f805726b64f5e WHIRLPOOL 1ee1aaf718565ced7e33d8bf05eb0ea2e53bc56566d79e36cbc5dcdd461efadc4e90fd27578c9dd1794d63fdd48517eee34c094c77c242fff3c1dc212fe365ca
+AUX libgdata-0.13.2-libgdata.pc-unused-deps.patch 1569 SHA256 8ae6d6776d3702d7f289bca084a30c9be79c0df9927b85925e0ce343ffc4993c SHA512 c98455585e9b85c224ee37fdf1b66c5c8452b28c6b93efe25481b970355ab064b7b85eb6295fe8ee3bb4b63f510361e92a64d5f39d2b260cadcb9a044ce369ae WHIRLPOOL 607edf26949127cca71ce9cf627a4f8284bcd9f1677454202ef37bafd6dec3a8b123734266141540692b372c26caac0f340cb580763b7fcc8dcd332a520f362b
 AUX libgdata-0.8.1-empty-names.patch 5173 SHA256 c7f1f7d380775e7b7e8756f58fb221bb04aec77de4e95b3b9f5f70bb7e0d7add SHA512 a332197998582a78f172065e7228ec893bcf36d2521fb2000e969d86d8c95fc3baf453f044952c2fcb9e5454f2b081704ccbf8dc188668175a0ad907ae81496b WHIRLPOOL f9b4f3a6df5358552487f32927beb476c2a5e9dfe9cc0d4d508f549bb7597fbd41a1dd8ffe0c5d9fb52dbcdcce5937357fd768603a3c86c90869ba5b363a402b
 AUX libgdata-0.8.1-gdata-symbols.patch 1060 SHA256 ffdcf7b030eb2a620ef04b410d4f82dd40cb1dbbaf712378757163d70d6f1b34 SHA512 07e7b645248b9d0a497c2903b24cbef6b0adcf25431b7a171e011c97482208a87e59d4964128c14cc7c36f14705cf8ac41d4708fa7f58c927549389f444a9cfa WHIRLPOOL 5a51c4aceb69e750fce158e4f1252dc11fc18a3e2ccf1457d84e72a1e49142336f7608f9166261b24b1aa4de6a3ac4496e22bec328307e55419fe08ea935c4ff
 AUX libgdata-0.8.1-validate-ssl.patch 1896 SHA256 f4c082641d86aedaf287853dc3200d63c8d9138f7c6df9c3ad49809f66f5da14 SHA512 391b4562a2e2e73a6f494225f1208b0653643f2fe4e73172017823c89f1d3a577b5e2b6de6e40e795206ba5c0705f9f6cbfbf5000000293d30210da20a7971cb WHIRLPOOL 5671a55f68c15aa8af4ee35b4b3aaf30999da7b8df5d8ab20128640b7e4cf729799e6b647a187072964c583ffc0d026f25ab6f1d4e9f13539b1cd6c2616dce87
 DIST libgdata-0.10.2.tar.xz 1129804 SHA256 c028f3f39796fe6cc4841413b95a6c470350166ec8b520d17e6f4ff666f32c4e SHA512 465908c2129169bb09dd8c15d4a321d70d53a094a14663018443dfc6fbcdf45d98916a542511a8d17f5f98b2c4872da862820803aed43978a6158beac9d25aff WHIRLPOOL 8cfd1f5ab60d8995755eb79acd8eb134730849ed483f3788cc27a77ab2951553ae231130ba1b8b1acf920b3adc36adbf0ea9c9f2be60804dd3951a6ab3948644
 DIST libgdata-0.12.0.tar.xz 1156684 SHA256 e5acd1ca88433306e740fc4cb3836f9710358d0acd48d4ddee1876dd77d2aca3 SHA512 7d0542838fc97b0ba80a658a577f33354cd8dd1888d664bce584bbd76e5e3e8f4696314e70e4831f111bcc5e58bdb373753324b599a7e7365ad57e5c5cc7a0cd WHIRLPOOL c5d1720569a5b79a81a3d55ed59ef5ca6f4cbe515eac4ef7db890e0c4900d58e5f2c8f4f29a054eac09cf8f922937b13dcf2ffd862f06ace52c8b5f3b5660e13
+DIST libgdata-0.13.2.tar.xz 1183276 SHA256 3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330 SHA512 611183fa1ff2269f1f59488fd3ba6975802b5ec6b7eb530928ad937bfe632f3c39e582b42d4d7b856014adae9e51fae66a545af0239319c29c9799f7ed3267d5 WHIRLPOOL 3bb2eac46e058291c235c854753e256a530eee21d9afa5ca9296dd87d167a43a47c59cdaaf8fabb0ffd835c80334b6575cb3bc40ac75e53bde1132769a132076
 DIST libgdata-0.8.1.tar.bz2 1201616 SHA256 080be3e677e6098d0f1bbcbaf8e474b4b94fad8a0d07b5a2969c3ab95b68d0b9 SHA512 61d65ceae7b82a497ba4c2c70a0486a108ae8dec9f0d7885fac8d33dd6a4f4d1eff068e39fb2ec5fed69f349de4d393adceca0ee242f2b4cb6045dbd48743643 WHIRLPOOL 0551ddcb3d9abb3e3633ffcb98e67036d5bdb914d3e95405b7c5568b471784548d02d3f4b0c4df4f76d2396a2be6400d564afc10527c2aa5ada9f812609ab8b0
-EBUILD libgdata-0.10.2.ebuild 1961 SHA256 8ccb36009076bc8f2ce76ad53c3a6605ee215818e4bc5cbf0a919d4d79ff08c4 SHA512 3068e7a242ad22740b8cf66320009aa0da69e0308b3e7f7d91a2cd13c7357d74872154c65ec594d62ed379d97af39ae3a90cdf22016aa111d826f44e7b887ac0 WHIRLPOOL e4bd5d025f3ffee42740df0e8266b47266999c8b80bf65163ba271d4b5d80942e318c8074b79a2685c132673d7e1cc428c523e85e358cb395682bd2ef1bcaa5f
-EBUILD libgdata-0.12.0.ebuild 1964 SHA256 fa6e08470ae32c14907f47b160b9e49065a7908e966664d9efa861993d651e6e SHA512 fb6e4f887d7b0b9b54fb22177c5555b279e5aa946d5dff3bde95572f5aa276d52b0ae1ec039057c20ca5087066763e7a7186d57a7a5a58275c85a556b3dd71fe WHIRLPOOL a80c72c77471ed75fb3c6b90960d235467b0dcfd9c5bfa60b0357bba4653c31e7342ed48294a38a5675cc9dbb79b3d91191e2cfcf9bfb5a339411f11196b76c5
-EBUILD libgdata-0.8.1-r2.ebuild 2142 SHA256 20ea9b1b11c83ceb63b84811d08fb2b1dccd0a70191b9543ed29380ec71842b5 SHA512 70e89693e71c016b9535ebf131909fd47820f93a6c32bca38af70bfa87ab7381393035bfa2abe11e05a39a189ec507c131c7adedb9afc7de6d1194d211e70762 WHIRLPOOL da0e42de6e1f263d60b25a593a5ceb35681cf9f79ff12d8dc7d255e46f717cdc61fb09b4fa34ab69837f18759629e2d07991f7d740e7372ccad0e011c15fbd7f
-MISC ChangeLog 8133 SHA256 d7a3d51da93fa408d13c5a6b8aa52d8d2d17da2f873521fb2a7153eb71d4446f SHA512 e0b7c046d2d3ab122789e7ce0a78f7a97440377b7617fbf0ebb42c76e9f0fddf99a06024af37cdb26b7de3e508fd72513b189876cb79f0e1c504519e4c2bfc6d WHIRLPOOL c88e84e2d87a11a0bf5054a547d11f85e74d6b9598043192fc946feef40d4bee5295d9436c45247ba7391c9cf2078d111c38389a444ca3f6f7da8a22e39ee420
-MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
+EBUILD libgdata-0.10.2.ebuild 1972 SHA256 50ce068beba60044d2f82879c3d672add0c6c01e4f5fb8bf144bdf454acc2dba SHA512 d2a1f9dbaea49333064f9fea329ef1de6ce9215fec348017a89216b7580a96f1f4c2a25fd204aafc9f64e1f8f792f311e9aba3f60353f9ada572c3dc4f7270de WHIRLPOOL 3cfab8fddf583b1d5eb2cd605d12648fa534050a5e306032851b740011a5b165c89e7984d1273c66423a55cfd6c3efc4e80985000e3738eaeadda1f8250cb52b
+EBUILD libgdata-0.12.0.ebuild 1955 SHA256 dd866413a8be0aff8cbe956f3696959d5bd3e602ebb83e596e7cadb773357ddd SHA512 d9e625cf560a5c142099f5db45453f38f722674d6d4bd25fb33fd090bfc46c213159839b186256fac5ccdc3cb71cd7639bb7292c21904c6976e8afc294572a2e WHIRLPOOL af4a627dff3010eb64cde0e6c4f01c4fc6d652265b52f48b6c7d414114a6125ed7ab96eb264bb1b4d978fc69f54c5c44e6984033dd927cd6db741b7f34b6ea53
+EBUILD libgdata-0.13.2-r2.ebuild 2215 SHA256 753c91eb8aca991933af3342a0b6e710a7a863eb5cccbd6c35d53df0f801b310 SHA512 becab6009253f05104531345565e17f1a950ba0721d95a9b49c65c1e01f0e0b81369c523e568c350faaedbe2e64a548d9b06ed5441b480098d2bf15ebe7c64a6 WHIRLPOOL ad53f603fc7fb7fdb1d9042ce148b62c8d5c46059aaac81e61fc09d51ab31e70db0757294f64e27e9ca47761b4ff70d97b2f6b06bec0347abe3c309a341921a7
+EBUILD libgdata-0.8.1-r2.ebuild 2136 SHA256 15a222f97fffb3ebd0e534e7765a1422d3f7ccdec711e85a3bf0e74dc78a8570 SHA512 1a974f20e540c5016bc41ae7794796029e759797c258568fcc145b8c9a1014a74a3b1ee8303aa9139f95309e63c6d6149247baa5d50cedc397eab8d0a520576d WHIRLPOOL 8166a582985efe815d3531b32c04e30d3b0d941c2d195902cede702c4518ec6962361b6e0522cf6def0145cde98397ccaec251ca30a535c0e6fa3e74ee6858c2
+MISC ChangeLog 8540 SHA256 7209b5b409ed743eb9b7043612e258e6923f23f4402f19e20494cfd73b01e719 SHA512 7086a8df799f7b05836f1e7fe2646e1084ee235ed69be9383ad21251b03ecd1bdb012284ff839a01d9df60e925b802f9e48e953f90bbe2707e13f79c9e713253 WHIRLPOOL 0c824280ec6e58c7a3f13a3985bdb241e45da5cac5d0feb952d8c1c3f7401dd5a8bcccd1eaaa26a6183d5b81d9785bbc067c41c93aceb37b1f50fb0ef4a9876e
+MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBeo+sACgkQl5yvQNBFVTW8eACfdTrD9heEi412F3zmhcOoA7hm
-KwkAmgM38rElkhRFUnJZZnGQLc7XIq/z
-=8Dl8
+iQEcBAEBCAAGBQJQ0T3YAAoJEJ0WA1zPCt1huVQH/3hD2ZmtoCdkfWSwNRTzSZxi
+SFwKlgHiL1LkCdqe/s5uv75y+abLYGMGA/Z4LEENSkytYp4V2OnvRJ96TQrpScz+
+0yMxHwtfXsodKAVp3+/CHI+aehJ9aip86eozoE/zOwBvjvbuu0C18d4XTRhRMiHg
+BqQoZ4psYGqbXJGhDXlqTrQsqTAyidQvSriviJBWQvnWshUlP47axoYqFWh0ij9D
+1tvmxvsrIcbpi9P4mf/lAxllDKPf2v66skvvWHtvqeZLUOC8idypIxgvUkzPXfc1
+V6/vGNJ7ll6lRx1dFwMEQNdeKAW5KSpUUN4sUunCAzU8hQ+GERwpK4cGcZDyaQE=
+=vr8h
 -----END PGP SIGNATURE-----
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>