summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2013-08-30 22:43:06 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2013-08-30 22:43:06 +0000
commita58050a2bbec3a065d39c3ae027bac14afa44c7e (patch)
treea582399a626080814723b3ac8158d7ba9677d4ba /dev-libs/libgdata
parentversion bump wrt #469598 (diff)
downloadhistorical-a58050a2bbec3a065d39c3ae027bac14afa44c7e.tar.gz
historical-a58050a2bbec3a065d39c3ae027bac14afa44c7e.tar.bz2
historical-a58050a2bbec3a065d39c3ae027bac14afa44c7e.zip
Depend on libsoup-gnome again, clean up old revisions.
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806
Diffstat (limited to 'dev-libs/libgdata')
-rw-r--r--dev-libs/libgdata/ChangeLog8
-rw-r--r--dev-libs/libgdata/Manifest28
-rw-r--r--dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch58
-rw-r--r--dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch45
-rw-r--r--dev-libs/libgdata/libgdata-0.13.2-r2.ebuild78
-rw-r--r--dev-libs/libgdata/libgdata-0.13.3.ebuild68
-rw-r--r--dev-libs/libgdata/libgdata-0.13.4.ebuild6
7 files changed, 15 insertions, 276 deletions
diff --git a/dev-libs/libgdata/ChangeLog b/dev-libs/libgdata/ChangeLog
index 731526de1558..22eb2a86ca6d 100644
--- a/dev-libs/libgdata/ChangeLog
+++ b/dev-libs/libgdata/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/libgdata
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.66 2013/08/06 09:34:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.67 2013/08/30 22:42:28 eva Exp $
+
+ 30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org>
+ -libgdata-0.13.2-r2.ebuild, -libgdata-0.13.3.ebuild, libgdata-0.13.4.ebuild,
+ -files/libgdata-0.13.2-Requires.private.patch,
+ -files/libgdata-0.13.2-libgdata.pc-unused-deps.patch:
+ Depend on libsoup-gnome again, clean up old revisions.
06 Aug 2013; Lars Wendler <polynomial-c@gentoo.org> libgdata-0.13.4.ebuild:
Non-maintainer commit: Fixed dependency on dev-libs/libsoup (bug #479666).
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 7e06607ae655..81440d268899 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,35 +1,19 @@
-----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.13.2.tar.xz 1183276 SHA256 3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330 SHA512 611183fa1ff2269f1f59488fd3ba6975802b5ec6b7eb530928ad937bfe632f3c39e582b42d4d7b856014adae9e51fae66a545af0239319c29c9799f7ed3267d5 WHIRLPOOL 3bb2eac46e058291c235c854753e256a530eee21d9afa5ca9296dd87d167a43a47c59cdaaf8fabb0ffd835c80334b6575cb3bc40ac75e53bde1132769a132076
-DIST libgdata-0.13.3.tar.xz 1193512 SHA256 4bf52706b2ab404f8b128e000509acd9937facf26916d3e907a3db8653f73637 SHA512 d837a4569d33b7a941be3ddc5a08ba1c70c0dd5dfc8dacf380edfadfa019d10ab03cb822e679f28319e0e2eefa0f2ef7cf75c37bf6afcba2fad5fed7eb9e5607 WHIRLPOOL 069677535a01eb676bb30c4c808a4c3c23fed5ac3364e0be75fde015d5a89b6789970554c95a4a2b07f1b97a66de201f36ef6573d9a9b39fabffd4c004a5c0f6
DIST libgdata-0.13.4.tar.xz 1331592 SHA256 ae405145bb6a2109488b7123206b469b141f17317066471dd485b4ea50499c83 SHA512 a9914d64ac36a37e616791c92e211dc32985dd688b427d5a118a0cc9749e36386e7d63a908e82fd8dbbc70c6082056b232f40a2eb2b338271f0c7a42761ff99c WHIRLPOOL 1a403b28ecde115498dbdb802095abe11a28d8512da6da53874c10923e7c446c3c2706843fc89a0372c5107a844946de807a44df794061cbf4b1f8447a65e1bf
DIST libgdata-0.8.1.tar.bz2 1201616 SHA256 080be3e677e6098d0f1bbcbaf8e474b4b94fad8a0d07b5a2969c3ab95b68d0b9 SHA512 61d65ceae7b82a497ba4c2c70a0486a108ae8dec9f0d7885fac8d33dd6a4f4d1eff068e39fb2ec5fed69f349de4d393adceca0ee242f2b4cb6045dbd48743643 WHIRLPOOL 0551ddcb3d9abb3e3633ffcb98e67036d5bdb914d3e95405b7c5568b471784548d02d3f4b0c4df4f76d2396a2be6400d564afc10527c2aa5ada9f812609ab8b0
-EBUILD libgdata-0.13.2-r2.ebuild 2265 SHA256 ec548b49372da338f9f8db14d0fafda77a776625b46797193cc5d6ef1fe16976 SHA512 33b2bd0c1ad0a7be3d28fadcd50c37a2405d234f2fe18046502becedb1fe7bf4b483c34e0ad2b259d305ae73b1bc162bb620a604fd62e48d986a44475695c4bc WHIRLPOOL ccf5bb53e653aae4af6870ce0615e68bfb40b7fda24d83d567e50800ef7f4777825089fb67af0570f63007adbe48bd048041dc3ca861cd301bf9fd5e14ce5443
-EBUILD libgdata-0.13.3.ebuild 1934 SHA256 83037598089151db003faef858663e05cb82942114ba18cb4bb314998ca21308 SHA512 04364eb59c14080cf8266afad3c3d99e7a88faf910bd538e2a3bc0da5095e5ce6a82bda5f3a8a1c3e67bc19a5c9a4efa4949e6cb2c7545d9610246976df9e8ac WHIRLPOOL 5ad1b97e3711a66e376c0597bd4235799a1b94344be5a02410e5bd57667b565d927d14c70030576b22ad328a6f78922585c494a44ac16cbca1cc7887b2603a72
-EBUILD libgdata-0.13.4.ebuild 2026 SHA256 a4db71187e0ea60147f8d129132222fc6cd1067fbc2f8a7f5c84006af85da473 SHA512 e54b9c1bddf42c7dde4aeaccf1217b5fc5806c3b51b2d53d4491c0cca24208cf46d54cfd8c577dbd09bcb2c08fd6607a2c39b97945903efbccb69e90fb9d66c0 WHIRLPOOL 41ecfd666ae49a279501f7843be630496c0587b68969ec60a0be18dc8a469a118ecb74415f18818f5716f9b06ef44ab679f489ae3477232cc507cc756105b02d
+EBUILD libgdata-0.13.4.ebuild 1980 SHA256 01b2fc33d6e94922f4ac381b572f924d8787c7429455bc123e20c35f16d017af SHA512 f9d25d380198f02552f6b4e1fe07108564d326808b8bd1fd59b304ed0f60c4c8d05fff8eb5056c2994204029876002a3ea47048ebed58213f2d7e8a67464648c WHIRLPOOL d8b9b4c061881de1d761a67acdf282c7a8e2d9e53759344e88b3b875a2b3f4a3bf945a1af7c7c1471d5e703c2c0e177774627c9a7149cea5c5ea72db1c64aeab
EBUILD libgdata-0.8.1-r2.ebuild 2136 SHA256 15a222f97fffb3ebd0e534e7765a1422d3f7ccdec711e85a3bf0e74dc78a8570 SHA512 1a974f20e540c5016bc41ae7794796029e759797c258568fcc145b8c9a1014a74a3b1ee8303aa9139f95309e63c6d6149247baa5d50cedc397eab8d0a520576d WHIRLPOOL 8166a582985efe815d3531b32c04e30d3b0d941c2d195902cede702c4518ec6962361b6e0522cf6def0145cde98397ccaec251ca30a535c0e6fa3e74ee6858c2
-MISC ChangeLog 9866 SHA256 3f48db1052cd7ede2b5eaa6fe82e10e4a8f2de2ad584d18b1add59a172a0e72c SHA512 4fa86365fabb1d8c248e4aca5017a926935ce3e915627c22e680c666fd0087e6df5e4cfb7a4022d8c75c13c5deb31d355f99e910bafcd8f61b135a126c93b828 WHIRLPOOL b8247e8aa197c21d029032161ab1d3ed0dafb4da44d54cc50ef609511d9ddd4bffa995d4df196e521c887ac66b1bbca1c6e1ebc7a23fd52cad6e4eb57cc9214e
+MISC ChangeLog 10153 SHA256 044aae3d6950ba445faa610da9866296caeb80e3c30536a7a5ba941b6d556f23 SHA512 379bf3f16036bccb5ad32d9d437d6132aa7999d78f3629c7545e98bb96eef7d56b7825718587ad732ffa2538e8169a7e136f6bda73d8f80074b339cffd596d27 WHIRLPOOL 1504abe905adbbcb740ab6ad7199a94fd2d73484c20ef7ab812f89c3591e2bfef015eec34a54892c349b17b525c9c42504a6b61acf025f7b4291598682040b64
MISC metadata.xml 235 SHA256 528500a122db5bc942917e89b99a9702c661777abd9c67040bfe7bf99d94bf36 SHA512 30bfa33b83835e6e1d74cf8025b2647dfed17b29a77b82e71390edd455b48a386c738462a33010e71ba343c1568bdc3b191dd7a0cb94f3fa9cde9923e650721a WHIRLPOOL 4c7e24efcb3f2238ef614bd0f875ba2ad6d581905c482ae5d87c7bb45312be539ae4bea72e5ec1de86211e98b9a9e523683ca246d90fca349791b56e3418936c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
-iQIcBAEBCAAGBQJSAMMmAAoJEPiazRVxLXTFmIUQAISUpJ/fAnF/VU9C+kWRISbc
-1oixmLcE+HeQy0pChM7nUa3LqOH+V6NiNUY7koHCpMzhXCQiKENIzmGPYN9tw6E5
-Y3Af8Xo3tHh0hCJ2+NYVImSXmfFuaptbCQhmX2vPOSvNiHqwVwEq1egGzulVQd4J
-tX9W1yxMMbIRMOuf9M/DHJpHqVHvkhyHpOjiHNIO75qcPrnd/DhRe/Y66Tf2Uys1
-2PfKb517h2B7keCVOdAQLvClFnAwbVeaP6aoBR8TPrHO8PkqH0DGCtZnfpFkPho7
-uVjRXrVrDPMONwG9tXr89Cg9Xnz5eiLXCVZ+8qT5hjwHeajx6LVEYtXOkNu8Ibs9
-ah9wrNHlpfHYuvrKQF3Kd0EDedn0dy2d/equAXol6zKv/P2ipYemGrdHJLbpBFBV
-9kfmKqdDKnXa/sEWvzMQXMJ9hYnJPX7g3IeQYF7VrGS998NVH5ODP3Jw8QH4Dko/
-fdj9DECj6QoCSgTUkM5qeSx551pYQs9iz1VjRWddJrCQ7m9R28g/90V3kC927vcP
-Qni1Lv/opPCa9+feEX9zCSiSFC+gBvO5aU4zm6qIwXcUNbAS/RwK8bsfY2uim3XU
-dVs2nfe7Wsccds/uJgZPVhcquY5/h24eubtQFYv1py5ef8oxMJ9vBmdWiu9HkY7b
-xfBJMx5uhXcyFz7NaFK+
-=nYje
+iEYEAREIAAYFAlIhH9UACgkQ1fmVwcYIWAaYPACeLNttJBEySFdef3+Xzy5QHpPq
+9VQAn1RvCfsQtLBlX0ndqQNoJWHKTeeL
+=zJtf
-----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
deleted file mode 100644
index 9053640bf653..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.13.2-Requires.private.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 7c1e1b0efb50..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.13.2-libgdata.pc-unused-deps.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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.13.2-r2.ebuild b/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
deleted file mode 100644
index 9c748afe2766..000000000000
--- a/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 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.6 2013/02/02 22:25:51 ago 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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~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
- >=gnome-base/gnome-common-3.6
- 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.13.3.ebuild b/dev-libs/libgdata/libgdata-0.13.3.ebuild
deleted file mode 100644
index 05ea111e8beb..000000000000
--- a/dev-libs/libgdata/libgdata-0.13.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.3.ebuild,v 1.3 2013/05/08 15:05:42 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_VERSION="0.20"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-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 vala"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-REQUIRED_IUSE="vala? ( introspection )"
-
-# 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-2.42
- >=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
- >=gnome-base/gnome-common-3.6
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- # Disable tests requiring network access, bug #307725
- sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf\nOLD_\1:' \
- -i gdata/tests/Makefile.{am,in} || die "network test disable failed"
-
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- gnome2_src_configure \
- $(use_enable gnome) \
- $(use_enable gnome goa) \
- $(use_enable introspection) \
- $(use_enable vala) \
- $(use_enable static-libs static)
-}
-
-src_test() {
- unset ORBIT_SOCKETDIR
- unset DBUS_SESSION_BUS_ADDRESS
- dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/libgdata/libgdata-0.13.4.ebuild b/dev-libs/libgdata/libgdata-0.13.4.ebuild
index f1e32d66b6c5..c01486b19def 100644
--- a/dev-libs/libgdata/libgdata-0.13.4.ebuild
+++ b/dev-libs/libgdata/libgdata-0.13.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.4.ebuild,v 1.2 2013/08/06 09:34:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.4.ebuild,v 1.3 2013/08/30 22:42:28 eva Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -29,9 +29,7 @@ RDEPEND="
gnome? (
app-crypt/gcr:=
>=net-libs/gnome-online-accounts-3.2
- || (
- >=net-libs/libsoup-2.42
- >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) )
+ >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] )
introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
"
DEPEND="${RDEPEND}