[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgdata/, dev-libs/libgdata/files/

[Mart Raudsepp]

commit:     74aac669fba62ce2a3ca70f0224fe299ee7ea5ce
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 20:28:02 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 21:19:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74aac669

dev-libs/libgdata: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/libgdata/Manifest                         |   2 -
 dev-libs/libgdata/files/0.17.7-fix-x86-tests.patch |  29 ---
 .../files/0.17.7-streams-https-tests.patch         | 204 ---------------------
 dev-libs/libgdata/libgdata-0.17.6.ebuild           |  62 -------
 dev-libs/libgdata/libgdata-0.17.7.ebuild           |  69 -------
 5 files changed, 366 deletions(-)

diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 9aa58d6fa85..98cc2607b4e 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,3 +1 @@
-DIST libgdata-0.17.6.tar.xz 1526804 SHA256 8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0 SHA512 940e5155b0cda0604e09efcdeabbfcb54ebe97b40d1086823802d3a49fdb7fcfc97749ae218c15d30e4981d01e34d1ae3bed01c1ee9a283063761527a9405731 WHIRLPOOL d3d36ae14e2e6502a42766f3efd75001d50c8376cfe4c3e3addbbe30e2455323f399f813eb18d78f88a83353507f01fe0d8e312e8f05dc6bf2d28a38e5ba73f0
-DIST libgdata-0.17.7.tar.xz 1448528 SHA256 8a663ef314a6d20b73c762072e0c1353fa7ec1ca3c2dee6fb85927cbda0d44fd SHA512 92ded8480262f59b6b2f8271fbb77b9b75905ca53f80a24bcf239fd06ead219ffa8af4b576b38368297c1a4f49722b3960202b8ea2b03011781d5fdfa77bbfd6 WHIRLPOOL 73ca7fad7c444f9bd8fe0e31082f79c99bf7091aa142071df70384fdc48649b15ff1b4d772dafdcdc1ec702cda2ad49cec3a67c4e80a56cd0a11ea05aff3cea7
 DIST libgdata-0.17.8.tar.xz 1464812 SHA256 e5e735bfac219c6cbe4a14df481cb3cb4b1c4b8b5e70f9a105a884035bc3a161 SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0 WHIRLPOOL e0772008cdf0816efe118f69f9bcc86d85de2a26fc2fd5127bcdb942af264536764da130ccb194a01f0bb97ad9bb070eec84c659e9e82b64a4f7eeb6b0602797

diff --git a/dev-libs/libgdata/files/0.17.7-fix-x86-tests.patch b/dev-libs/libgdata/files/0.17.7-fix-x86-tests.patch
deleted file mode 100644
index fc74f44c07b..00000000000
--- a/dev-libs/libgdata/files/0.17.7-fix-x86-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2e1bd073426b42a7e207314f1cef1402509ce12a Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@×××××.com>
-Date: Mon, 6 Mar 2017 06:28:32 +0100
-Subject: tests: Fix setting properties on i686
-
-Without the cast, an integer literal will have to wrong size for a
-64-bit integer parameter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=779641
----
- gdata/tests/general.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdata/tests/general.c b/gdata/tests/general.c
-index 6b41f25..75232de 100644
---- a/gdata/tests/general.c
-+++ b/gdata/tests/general.c
-@@ -1309,7 +1309,7 @@ test_query_properties (void)
- 		g_assert_##cmptype (gdata_query_get_##name_underscores (query), ==, new_val); \
-  \
- 		notification_received = FALSE; \
--		g_object_set (query, name_hyphens, new_val2, NULL); \
-+		g_object_set (query, name_hyphens, (val_type) new_val2, NULL); \
- 		g_assert (notification_received == TRUE); \
-  \
- 		g_assert_##cmptype (gdata_query_get_##name_underscores (query), ==, new_val2); \
--- 
-cgit v0.12
-

diff --git a/dev-libs/libgdata/files/0.17.7-streams-https-tests.patch b/dev-libs/libgdata/files/0.17.7-streams-https-tests.patch
deleted file mode 100644
index 3d958a79f58..00000000000
--- a/dev-libs/libgdata/files/0.17.7-streams-https-tests.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 106937d394fe3b8edbfb506273ae429d7ded2c2c Mon Sep 17 00:00:00 2001
-From: Philip Withnall <philip.withnall@××××××××××××.uk>
-Date: Tue, 20 Sep 2016 17:04:33 -0700
-Subject: core: Assert that all downloads, uploads and queries are HTTPS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-All callers should be using HTTPS already — for peace of mind, let’s
-assert that’s the case.
----
- gdata/gdata-download-stream.c |  7 ++++---
- gdata/gdata-service.c         |  4 +++-
- gdata/gdata-upload-stream.c   | 10 ++++++++--
- gdata/tests/general.c         |  6 +++---
- gdata/tests/streams.c         | 26 ++++++++++++++++++++------
- 5 files changed, 38 insertions(+), 15 deletions(-)
-
-diff --git a/gdata/gdata-download-stream.c b/gdata/gdata-download-stream.c
-index 67a3514..7613fd2 100644
---- a/gdata/gdata-download-stream.c
-+++ b/gdata/gdata-download-stream.c
-@@ -233,7 +233,7 @@ gdata_download_stream_class_init (GDataDownloadStreamClass *klass)
- 	/**
- 	 * GDataDownloadStream:download-uri:
- 	 *
--	 * The URI of the file to download.
-+	 * The URI of the file to download. This must be HTTPS.
- 	 *
- 	 * Since: 0.5.0
- 	 **/
-@@ -355,9 +355,10 @@ gdata_download_stream_constructor (GType type, guint n_construct_params, GObject
- 		priv->cancellable = g_cancellable_new ();
- 	priv->network_cancellable_id = g_cancellable_connect (priv->cancellable, (GCallback) cancellable_cancel_cb, priv->network_cancellable, NULL);
- 
--	/* Build the message */
-+	/* Build the message. The URI must be HTTPS. */
- 	_uri = soup_uri_new (priv->download_uri);
- 	soup_uri_set_port (_uri, _gdata_service_get_https_port ());
-+	g_assert_cmpstr (soup_uri_get_scheme (_uri), ==, SOUP_URI_SCHEME_HTTPS);
- 	priv->message = soup_message_new_from_uri (SOUP_METHOD_GET, _uri);
- 	soup_uri_free (_uri);
- 
-@@ -928,7 +929,7 @@ reset_network_thread (GDataDownloadStream *self)
-  * gdata_download_stream_new:
-  * @service: a #GDataService
-  * @domain: (allow-none): the #GDataAuthorizationDomain to authorize the download, or %NULL
-- * @download_uri: the URI to download
-+ * @download_uri: the URI to download; this must be HTTPS
-  * @cancellable: (allow-none): a #GCancellable for the entire download stream, or %NULL
-  *
-  * Creates a new #GDataDownloadStream, allowing a file to be downloaded from a GData service using standard #GInputStream API.
-diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
-index 2433339..9db75ba 100644
---- a/gdata/gdata-service.c
-+++ b/gdata/gdata-service.c
-@@ -581,9 +581,11 @@ _gdata_service_build_message (GDataService *self, GDataAuthorizationDomain *doma
- 	GDataServiceClass *klass;
- 	SoupURI *_uri;
- 
--	/* Create the message. Allow changing the HTTPS port just for testing. */
-+	/* Create the message. Allow changing the HTTPS port just for testing,
-+	 * but require that the URI is always HTTPS for privacy. */
- 	_uri = soup_uri_new (uri);
- 	soup_uri_set_port (_uri, _gdata_service_get_https_port ());
-+	g_assert_cmpstr (soup_uri_get_scheme (_uri), ==, SOUP_URI_SCHEME_HTTPS);
- 	message = soup_message_new_from_uri (method, _uri);
- 	soup_uri_free (_uri);
- 
-diff --git a/gdata/gdata-upload-stream.c b/gdata/gdata-upload-stream.c
-index bb52ac8..c8340be 100644
---- a/gdata/gdata-upload-stream.c
-+++ b/gdata/gdata-upload-stream.c
-@@ -307,7 +307,7 @@ gdata_upload_stream_class_init (GDataUploadStreamClass *klass)
- 	/**
- 	 * GDataUploadStream:upload-uri:
- 	 *
--	 * The URI to upload the data and metadata to.
-+	 * The URI to upload the data and metadata to. This must be HTTPS.
- 	 *
- 	 * Since: 0.5.0
- 	 **/
-@@ -428,11 +428,17 @@ gdata_upload_stream_constructed (GObject *object)
- {
- 	GDataUploadStreamPrivate *priv;
- 	GDataServiceClass *service_klass;
-+	SoupURI *uri = NULL;
- 
- 	/* Chain up to the parent class */
- 	G_OBJECT_CLASS (gdata_upload_stream_parent_class)->constructed (object);
- 	priv = GDATA_UPLOAD_STREAM (object)->priv;
- 
-+	/* The upload URI must be HTTPS. */
-+	uri = soup_uri_new (priv->upload_uri);
-+	g_assert_cmpstr (soup_uri_get_scheme (uri), ==, SOUP_URI_SCHEME_HTTPS);
-+	soup_uri_free (uri);
-+
- 	/* Create a #GCancellable for the entire upload operation if one wasn't specified for #GDataUploadStream:cancellable during construction */
- 	if (priv->cancellable == NULL)
- 		priv->cancellable = g_cancellable_new ();
-@@ -1300,7 +1306,7 @@ create_network_thread (GDataUploadStream *self, GError **error)
-  * @service: a #GDataService
-  * @domain: (allow-none): the #GDataAuthorizationDomain to authorize the upload, or %NULL
-  * @method: the HTTP method to use
-- * @upload_uri: the URI to upload
-+ * @upload_uri: the URI to upload, which must be HTTPS
-  * @entry: (allow-none): the entry to upload as metadata, or %NULL
-  * @slug: the file's slug (filename)
-  * @content_type: the content type of the file being uploaded
-diff --git a/gdata/tests/general.c b/gdata/tests/general.c
-index 070d34c..2420629 100644
---- a/gdata/tests/general.c
-+++ b/gdata/tests/general.c
-@@ -1425,7 +1425,7 @@ test_service_network_error (void)
- 	service = g_object_new (GDATA_TYPE_SERVICE, NULL);
- 
- 	/* Try a query which should always fail due to errors resolving the hostname */
--	g_assert (gdata_service_query (service, NULL, "http://thisshouldnotexist.invalid", NULL, GDATA_TYPE_ENTRY,
-+	g_assert (gdata_service_query (service, NULL, "https://thisshouldnotexist.invalid", NULL, GDATA_TYPE_ENTRY,
- 	                               NULL, NULL, NULL, &error) == NULL);
- 	g_assert_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_NETWORK_ERROR);
- 	g_clear_error (&error);
-@@ -1434,11 +1434,11 @@ test_service_network_error (void)
- 	 * Filed as bgo#632354. */
- #if 0
- 	/* Try one with a bad proxy set */
--	proxy_uri = soup_uri_new ("http://thisshouldalsonotexist.invalid/proxy");
-+	proxy_uri = soup_uri_new ("https://thisshouldalsonotexist.invalid/proxy");
- 	gdata_service_set_proxy_uri (service, proxy_uri);
- 	soup_uri_free (proxy_uri);
- 
--	g_assert (gdata_service_query (service, "http://google.com", NULL, GDATA_TYPE_ENTRY, NULL, NULL, NULL, &error) == NULL);
-+	g_assert (gdata_service_query (service, "https://google.com", NULL, GDATA_TYPE_ENTRY, NULL, NULL, NULL, &error) == NULL);
- 	g_assert_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROXY_ERROR);
- 	g_clear_error (&error);
- #endif
-diff --git a/gdata/tests/streams.c b/gdata/tests/streams.c
-index 91b35c6..1de8e50 100644
---- a/gdata/tests/streams.c
-+++ b/gdata/tests/streams.c
-@@ -161,6 +161,7 @@ create_server (SoupServerCallback callback, gpointer user_data, GMainLoop **main
- 	GMainContext *context;
- 	SoupServer *server;
- #ifdef HAVE_LIBSOUP_2_47_3
-+	gchar *cert_path = NULL, *key_path = NULL;
- 	GError *error = NULL;
- #else /* if !HAVE_LIBSOUP_2_47_3 */
- 	union {
-@@ -178,12 +179,21 @@ create_server (SoupServerCallback callback, gpointer user_data, GMainLoop **main
- #ifdef HAVE_LIBSOUP_2_47_3
- 	server = soup_server_new (NULL, NULL);
- 
-+	cert_path = g_test_build_filename (G_TEST_DIST, "cert.pem", NULL);
-+	key_path = g_test_build_filename (G_TEST_DIST, "key.pem", NULL);
-+
-+	soup_server_set_ssl_cert_file (server, cert_path, key_path, &error);
-+	g_assert_no_error (error);
-+
-+	g_free (key_path);
-+	g_free (cert_path);
-+
- 	soup_server_add_handler (server, NULL, callback, user_data, NULL);
- 
- 	g_main_context_push_thread_default (context);
- 
- 	soup_server_listen_local (server, 0  /* random port */,
--	                          0  /* no options */, &error);
-+	                          SOUP_SERVER_LISTEN_HTTPS, &error);
- 	g_assert_no_error (error);
- 
- 	g_main_context_pop_thread_default (context);
-@@ -216,20 +226,24 @@ build_server_uri (SoupServer *server)
- {
- #ifdef HAVE_LIBSOUP_2_47_3
- 	GSList *uris;  /* owned */
-+	GSList *l;  /* unowned */
- 	gchar *retval = NULL;  /* owned */
- 
- 	uris = soup_server_get_uris (server);
--	if (uris == NULL) {
--		return NULL;
--	}
- 
--	retval = soup_uri_to_string (uris->data, FALSE);
-+	for (l = uris; l != NULL && retval == NULL; l = l->next) {
-+		if (soup_uri_get_scheme (l->data) == SOUP_URI_SCHEME_HTTPS) {
-+			retval = soup_uri_to_string (l->data, FALSE);
-+		}
-+	}
- 
- 	g_slist_free_full (uris, (GDestroyNotify) soup_uri_free);
- 
-+	g_assert (retval != NULL);
-+
- 	return retval;
- #else /* if !HAVE_LIBSOUP_2_47_3 */
--	return g_strdup_printf ("http://%s:%u/",
-+	return g_strdup_printf ("https://%s:%u/",
- 	                        soup_address_get_physical (soup_socket_get_local_address (soup_server_get_listener (server))),
- 	                        soup_server_get_port (server));
- #endif /* !HAVE_LIBSOUP_2_47_3 */
--- 
-cgit v0.12
-

diff --git a/dev-libs/libgdata/libgdata-0.17.6.ebuild b/dev-libs/libgdata/libgdata-0.17.6.ebuild
deleted file mode 100644
index 6fba2b2023c..00000000000
--- a/dev-libs/libgdata/libgdata-0.17.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
-REQUIRED_USE="
-	gnome-online-accounts? ( crypt )
-	vala? ( introspection )
-"
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-# configure checks for gtk:3, but only uses it for demos which are not installed
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/json-glib-0.15
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
-	>=x11-libs/gdk-pixbuf-2.14:2
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable crypt gnome) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable static-libs static) \
-		$(use_enable test always-build-tests)
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	export GSETTINGS_BACKEND="memory" #486412
-	dbus-launch emake check
-}

diff --git a/dev-libs/libgdata/libgdata-0.17.7.ebuild b/dev-libs/libgdata/libgdata-0.17.7.ebuild
deleted file mode 100644
index 6497d8b043b..00000000000
--- a/dev-libs/libgdata/libgdata-0.17.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
-REQUIRED_USE="
-	gnome-online-accounts? ( crypt )
-	vala? ( introspection )
-"
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# configure checks for gtk:3, but only uses it for demos which are not installed
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/json-glib-0.15
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
-	>=x11-libs/gdk-pixbuf-2.14:2
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.25
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=780081 - remove with 0.17.8
-	if use test && ! has_version '>=net-libs/libsoup-2.55.90:2.4'; then
-		eapply -R "${FILESDIR}/${PV}"-streams-https-tests.patch
-	fi
-	# x86 test fix from upstream git post-0.17.7
-	eapply "${FILESDIR}/${PV}"-fix-x86-tests.patch
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable crypt gnome) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable static-libs static) \
-		$(use_enable test always-build-tests)
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	export GSETTINGS_BACKEND="memory" #486412
-	dbus-launch emake check
-}