gentoo resync : 21.05.2019

21 files changed, 125 insertions, 616 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7cc4885217d2..00eafa494341 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 1b438188e38a..68807593987f 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,7 +1,3 @@
-AUX 3.24.5-glib-2.58-compat.patch 13110 BLAKE2B ee88709637098119bfb3329ab8c1d8fff50fdcd8670498835a76ee98525b6cf02b2cef1e0a97aef6c2a3c4f96a5ed5b4c5f33d9d6d98b7961aad102ce1c50daa SHA512 00961c6ba1c3496487b9c2c57704d5af8471428456953e2f79b3d888d8a45b5454841ecab7bd6f54267e8e9c445d53883f05a2749d526fc266af6869b185b0bc
-AUX glib-2.58-compat2.patch 1361 BLAKE2B 85c6243812c58a759c710a3e3238d0383067381da0a39462006670702b57b89d3ca5915219747279500d89d205a94fd92d58c1ebee0514674d5d21c9d6b4dfe4 SHA512 3fc4180ee317338e1ac8def03c9a0779f0823431ee7de63fa2e15ff46b5d003ff1e7ebca6701a472814d7fe9289bc58a53f560f7c547b6c1b9b1585e0c8f7bbf
-DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4
 DIST gnome-online-accounts-3.30.2.tar.xz 921284 BLAKE2B 9dc503f73ddda64411f73ac865a0355f318ad13789fac0cf7e7a91d16e53b03dee33acca6752060ce54936cfd5050adb8fadfd121158c0496a3f516e35e8fa45 SHA512 3555421adbfec0e7da1c8f3a47415f6c5bc3eaf8b246cf08eb6ee420286a4b40d11bc6e2514bca937b022b95068c9862438fa632d3385503aba2647a4a57976b
-EBUILD gnome-online-accounts-3.24.5.ebuild 2564 BLAKE2B 3079163a311a3cb7284649ddacf36d303263ec2b7fde638724be5f27f69c3c85b6533ed2a2898f4ab85c2a60762d58c7e69fcfef61d9f428f9653b4c974997b1 SHA512 ef3cebd5b5c97524941f40289daf0e6aaef07ae0821ae5be05806fb95f77ff82e2a72033cf541d4badd4b1b8dbbc12d701f2ae93ab6cc76f5f241c11baaf5087
 EBUILD gnome-online-accounts-3.30.2.ebuild 2094 BLAKE2B 50ec41090891c626d2fac7a78419522338dada0b0d984a7c47c6526ca9227203d9f13ec3a61845f998539bcdf79db55d4b54c56dd9b31b0e39226b64f989cc10 SHA512 401fb0d2206311d71e965ec30dc23600a13d7525d0f3850b69666ff6698d537523d5e40b88ac37fe90cf9f9de2eacad2f80d8a4b5c94c0165c26826110d26737
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/files/3.24.5-glib-2.58-compat.patch b/net-libs/gnome-online-accounts/files/3.24.5-glib-2.58-compat.patch
deleted file mode 100644
index 3964d15b86a8..000000000000
--- a/net-libs/gnome-online-accounts/files/3.24.5-glib-2.58-compat.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-From eaaeb46caa8d0068a695c8356402fc7c342d6d09 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 19 Jul 2018 12:54:39 +0100
-Subject: [PATCH 1/2] Build against GLib 2.57.2
-
-(cherry picked from commit 975625cd298d0088fe08189d4f77b10c96601917)
----
-
-diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c
-index 89b60199..b600b943 100644
---- a/src/daemon/goadaemon.c
-+++ b/src/daemon/goadaemon.c
-@@ -1233,7 +1233,7 @@ get_all_providers_cb (GObject      *source,
-   g_free (key_file_data);
-   g_free (group);
-   g_free (id);
--  g_clear_pointer (&key_file, (GDestroyNotify) g_key_file_unref);
-+  g_clear_pointer (&key_file, g_key_file_unref);
-   g_object_unref (data->daemon);
-   g_object_unref (data->manager);
-   g_object_unref (data->invocation);
-@@ -1437,7 +1437,7 @@ on_account_handle_remove (GoaAccount            *account,
-  out:
-   g_clear_object (&provider);
-   g_clear_object (&task);
--  g_clear_pointer (&key_file, (GDestroyNotify) g_key_file_unref);
-+  g_clear_pointer (&key_file, g_key_file_unref);
-   g_free (group);
-   return TRUE; /* invocation was handled */
- }
-diff --git a/src/daemon/main.c b/src/daemon/main.c
-index ae8c22d4..2db8d171 100644
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -128,8 +128,8 @@ main (int    argc,
-   g_clear_object (&the_daemon);
-   if (name_owner_id != 0)
-     g_bus_unown_name (name_owner_id);
--  g_clear_pointer (&loop, (GDestroyNotify) g_main_loop_unref);
--  g_clear_pointer (&opt_context, (GDestroyNotify) g_option_context_free);
-+  g_clear_pointer (&loop, g_main_loop_unref);
-+  g_clear_pointer (&opt_context, g_option_context_free);
- 
-   g_message ("goa-daemon version %s exiting", PACKAGE_VERSION);
- 
-diff --git a/src/examples/introspect-providers.c b/src/examples/introspect-providers.c
-index e5960a81..5cb1a3cc 100644
---- a/src/examples/introspect-providers.c
-+++ b/src/examples/introspect-providers.c
-@@ -153,7 +153,7 @@ get_all (GObject *source_object, GAsyncResult *res, gpointer user_data)
-   g_print ("%s", key_file_data);
- 
-  out:
--  g_clear_pointer (&key_file, (GDestroyNotify) g_key_file_unref);
-+  g_clear_pointer (&key_file, g_key_file_unref);
-   g_free (key_file_data);
-   g_list_free_full (providers, g_object_unref);
-   g_main_loop_quit (loop);
-diff --git a/src/goabackend/goadlnaservermanager.c b/src/goabackend/goadlnaservermanager.c
-index 284922fe..aee245ae 100644
---- a/src/goabackend/goadlnaservermanager.c
-+++ b/src/goabackend/goadlnaservermanager.c
-@@ -175,7 +175,7 @@ goa_dlna_server_manager_dispose (GObject *object)
-   GoaDlnaServerManager *self = GOA_DLNA_SERVER_MANAGER (object);
-   GoaDlnaServerManagerPrivate *priv = self->priv;
- 
--  g_clear_pointer (&priv->servers, (GDestroyNotify) g_hash_table_unref);
-+  g_clear_pointer (&priv->servers, g_hash_table_unref);
-   g_clear_object (&priv->proxy);
- 
-   G_OBJECT_CLASS (goa_dlna_server_manager_parent_class)->dispose (object);
-diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
-index 63ebe21e..428b2841 100644
---- a/src/goabackend/goaexchangeprovider.c
-+++ b/src/goabackend/goaexchangeprovider.c
-@@ -678,7 +678,7 @@ add_account (GoaProvider    *provider,
-   g_signal_handlers_disconnect_by_func (dialog, dialog_response_cb, &data);
- 
-   g_free (data.account_object_path);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_clear_object (&data.cancellable);
-   g_clear_object (&ews_client);
-   return ret;
-@@ -828,7 +828,7 @@ refresh_account (GoaProvider    *provider,
-     g_propagate_error (error, data.error);
- 
-   gtk_widget_destroy (dialog);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_clear_object (&data.cancellable);
-   g_clear_object (&ews_client);
-   return ret;
-diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c
-index c48dc81b..096d54bc 100644
---- a/src/goabackend/goaimapsmtpprovider.c
-+++ b/src/goabackend/goaimapsmtpprovider.c
-@@ -442,7 +442,7 @@ ensure_credentials_sync (GoaProvider         *provider,
-   g_free (smtp_password);
-   g_free (smtp_server);
-   g_free (smtp_username);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
-+  g_clear_pointer (&credentials, g_variant_unref);
-   return ret;
- }
- 
-@@ -1183,7 +1183,7 @@ add_account (GoaProvider    *provider,
- 
-   g_free (domain);
-   g_free (data.account_object_path);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_clear_object (&data.cancellable);
-   g_clear_object (&imap_auth);
-   g_clear_object (&smtp_auth);
-@@ -1474,7 +1474,7 @@ refresh_account (GoaProvider    *provider,
-   g_free (imap_username);
-   g_free (smtp_server);
-   g_free (smtp_username);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_clear_object (&data.cancellable);
-   g_clear_object (&imap_auth);
-   g_clear_object (&smtp_auth);
-diff --git a/src/goabackend/goakerberosprovider.c b/src/goabackend/goakerberosprovider.c
-index 0df52ed3..cbb93ea8 100644
---- a/src/goabackend/goakerberosprovider.c
-+++ b/src/goabackend/goakerberosprovider.c
-@@ -289,7 +289,7 @@ get_ticket_sync (GoaKerberosProvider *self,
-   g_clear_object (&account);
-   g_clear_object (&ticketing);
-   g_free (object_path);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
-+  g_clear_pointer (&credentials, g_variant_unref);
-   return ret;
- }
- 
-@@ -1002,7 +1002,7 @@ start_over:
-   g_free (request.account_object_path);
-   g_free (principal);
-   g_free (realm);
--  g_clear_pointer (&request.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&request.loop, g_main_loop_unref);
-   return object;
- }
- 
-@@ -1044,8 +1044,8 @@ dbus_proxy_reload_properties_sync (GDBusProxy    *proxy,
-   ret = TRUE;
- 
-  out:
--  g_clear_pointer (&iter, (GDestroyNotify) g_variant_iter_free);
--  g_clear_pointer (&result, (GDestroyNotify) g_variant_unref);
-+  g_clear_pointer (&iter, g_variant_iter_free);
-+  g_clear_pointer (&result, g_variant_unref);
-   g_free (name_owner);
-   return ret;
- }
-diff --git a/src/goabackend/goalastfmprovider.c b/src/goabackend/goalastfmprovider.c
-index 63c50588..ab6df253 100644
---- a/src/goabackend/goalastfmprovider.c
-+++ b/src/goabackend/goalastfmprovider.c
-@@ -742,7 +742,7 @@ add_account (GoaProvider    *provider,
- 
-   g_free (data.access_token);
-   g_free (data.account_object_path);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_clear_object (&data.cancellable);
-   return ret;
- }
-@@ -872,7 +872,7 @@ refresh_account (GoaProvider    *provider,
-     g_propagate_error (error, data.error);
- 
-   gtk_widget_destroy (dialog);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_free (data.access_token);
-   g_clear_object (&data.cancellable);
-   return ret;
-diff --git a/src/goabackend/goamediaserverprovider.c b/src/goabackend/goamediaserverprovider.c
-index 9a33d32e..9bf52ad7 100644
---- a/src/goabackend/goamediaserverprovider.c
-+++ b/src/goabackend/goamediaserverprovider.c
-@@ -488,7 +488,7 @@ add_account (GoaProvider  *provider,
-   g_free (data.account_object_path);
-   g_free (data.friendly_name);
-   g_free (data.udn);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   return ret;
- }
- 
-diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
-index 20adff8f..f4ab8c5d 100644
---- a/src/goabackend/goaoauth2provider.c
-+++ b/src/goabackend/goaoauth2provider.c
-@@ -1610,7 +1610,7 @@ goa_oauth2_provider_get_access_token_sync (GoaOAuth2Provider  *self,
-   g_free (refresh_token);
-   g_free (old_refresh_token);
-   g_free (password);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
-+  g_clear_pointer (&credentials, g_variant_unref);
- 
-   g_mutex_unlock (lock);
- 
-diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
-index 2e02405f..3405871d 100644
---- a/src/goabackend/goaoauthprovider.c
-+++ b/src/goabackend/goaoauthprovider.c
-@@ -960,7 +960,7 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
-   g_free (url);
- 
-   g_free (data.oauth_verifier);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_free (data.access_token);
-   g_free (data.access_token_secret);
-   g_free (escaped_request_token);
-@@ -1137,7 +1137,7 @@ goa_oauth_provider_add_account (GoaProvider *_provider,
-   g_free (access_token_secret);
-   g_free (session_handle);
-   g_free (data.account_object_path);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   return ret;
- }
- 
-@@ -1510,7 +1510,7 @@ goa_oauth_provider_get_access_token_sync (GoaOAuthProvider   *provider,
-   g_free (access_token_secret_for_refresh);
-   g_free (session_handle_for_refresh);
-   g_free (password);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
-+  g_clear_pointer (&credentials, g_variant_unref);
- 
-   g_mutex_unlock (lock);
- 
-diff --git a/src/goabackend/goaowncloudprovider.c b/src/goabackend/goaowncloudprovider.c
-index e3c1d9bf..d8ab4691 100644
---- a/src/goabackend/goaowncloudprovider.c
-+++ b/src/goabackend/goaowncloudprovider.c
-@@ -250,7 +250,7 @@ build_object (GoaProvider         *provider,
- 
-  out:
-   g_clear_object (&password_based);
--  g_clear_pointer (&uri, (GDestroyNotify *) soup_uri_free);
-+  g_clear_pointer (&uri, soup_uri_free);
-   g_free (uri_string);
-   return ret;
- }
-@@ -466,7 +466,7 @@ normalize_uri (const gchar *address, gchar **server)
-   ret = soup_uri_to_string (uri, FALSE);
- 
-  out:
--  g_clear_pointer (&uri, (GDestroyNotify *) soup_uri_free);
-+  g_clear_pointer (&uri, soup_uri_free);
-   g_free (scheme);
-   g_free (uri_string);
-   return ret;
-@@ -829,7 +829,7 @@ add_account (GoaProvider    *provider,
-   g_free (server);
-   g_free (uri);
-   g_free (data.account_object_path);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_clear_object (&data.cancellable);
-   g_clear_object (&http_client);
-   return ret;
-@@ -1037,7 +1037,7 @@ refresh_account (GoaProvider    *provider,
-   g_free (uri);
-   g_free (uri_webdav);
-   g_free (data.account_object_path);
--  g_clear_pointer (&data.loop, (GDestroyNotify) g_main_loop_unref);
-+  g_clear_pointer (&data.loop, g_main_loop_unref);
-   g_clear_object (&data.cancellable);
-   g_clear_object (&http_client);
-   return ret;
-diff --git a/src/goabackend/goautils.c b/src/goabackend/goautils.c
-index cc362baf..3cac3d13 100644
---- a/src/goabackend/goautils.c
-+++ b/src/goabackend/goautils.c
-@@ -987,7 +987,7 @@ goa_utils_get_credentials (GoaProvider    *provider,
- 
- out:
-   g_clear_object (&account);
--  g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref);
-+  g_clear_pointer (&credentials, g_variant_unref);
-   g_free (username);
-   g_free (password);
-   return ret;
-diff --git a/src/goaidentity/goaalarm.c b/src/goaidentity/goaalarm.c
-index 8720a025..fa8c6c11 100644
---- a/src/goaidentity/goaalarm.c
-+++ b/src/goaidentity/goaalarm.c
-@@ -81,11 +81,11 @@ goa_alarm_dispose (GObject *object)
-   GoaAlarm *self = GOA_ALARM (object);
- 
-   g_clear_object (&self->priv->stream);
--  g_clear_pointer (&self->priv->immediate_wakeup_source, (GDestroyNotify) g_source_destroy);
--  g_clear_pointer (&self->priv->scheduled_wakeup_source, (GDestroyNotify) g_source_destroy);
--  g_clear_pointer (&self->priv->context, (GDestroyNotify) g_main_context_unref);
--  g_clear_pointer (&self->priv->time, (GDestroyNotify) g_date_time_unref);
--  g_clear_pointer (&self->priv->previous_wakeup_time, (GDestroyNotify) g_date_time_unref);
-+  g_clear_pointer (&self->priv->immediate_wakeup_source, g_source_destroy);
-+  g_clear_pointer (&self->priv->scheduled_wakeup_source, g_source_destroy);
-+  g_clear_pointer (&self->priv->context, g_main_context_unref);
-+  g_clear_pointer (&self->priv->time, g_date_time_unref);
-+  g_clear_pointer (&self->priv->previous_wakeup_time, g_date_time_unref);
- 
-   G_OBJECT_CLASS (goa_alarm_parent_class)->dispose (object);
- }
-diff --git a/src/goaidentity/goakerberosidentityinquiry.c b/src/goaidentity/goakerberosidentityinquiry.c
-index ce591a4c..4f25298d 100644
---- a/src/goaidentity/goakerberosidentityinquiry.c
-+++ b/src/goaidentity/goakerberosidentityinquiry.c
-@@ -100,8 +100,8 @@ goa_kerberos_identity_inquiry_dispose (GObject *object)
-   GoaKerberosIdentityInquiry *self = GOA_KERBEROS_IDENTITY_INQUIRY (object);
- 
-   g_clear_object (&self->priv->identity);
--  g_clear_pointer (&self->priv->name, (GDestroyNotify) g_free);
--  g_clear_pointer (&self->priv->banner, (GDestroyNotify) g_free);
-+  g_clear_pointer (&self->priv->name, g_free);
-+  g_clear_pointer (&self->priv->banner, g_free);
- 
-   G_OBJECT_CLASS (goa_kerberos_identity_inquiry_parent_class)->dispose (object);
- }
--- 
-2.17.0
-
diff --git a/net-libs/gnome-online-accounts/files/glib-2.58-compat2.patch b/net-libs/gnome-online-accounts/files/glib-2.58-compat2.patch
deleted file mode 100644
index 3e8b9c480189..000000000000
--- a/net-libs/gnome-online-accounts/files/glib-2.58-compat2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From acd3e026eda2d88c21e03188f447d9aa32bf1dc6 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 19 Jul 2018 13:56:46 +0100
-Subject: [PATCH] Remove additional unnecessary GDestroyNotify casts
-
-See https://gitlab.gnome.org/GNOME/gnome-online-accounts/merge_requests/8
----
-
-diff --git a/src/goaidentity/goaidentityservice.c b/src/goaidentity/goaidentityservice.c
-index 89307c0e..50428392 100644
---- a/src/goaidentity/goaidentityservice.c
-+++ b/src/goaidentity/goaidentityservice.c
-@@ -685,12 +685,9 @@ goa_identity_service_finalize (GObject *object)
- 
-   g_clear_object (&self->priv->identity_manager);
-   g_clear_object (&self->priv->object_manager_server);
--  g_clear_pointer (&self->priv->watched_client_connections,
--                   (GDestroyNotify) g_hash_table_unref);
--  g_clear_pointer (&self->priv->key_holders,
--                   (GDestroyNotify) g_hash_table_unref);
--  g_clear_pointer (&self->priv->pending_temporary_account_results,
--                   (GDestroyNotify) g_hash_table_unref);
-+  g_clear_pointer (&self->priv->watched_client_connections, g_hash_table_unref);
-+  g_clear_pointer (&self->priv->key_holders, g_hash_table_unref);
-+  g_clear_pointer (&self->priv->pending_temporary_account_results, g_hash_table_unref);
- 
-   G_OBJECT_CLASS (goa_identity_service_parent_class)->finalize (object);
- }
--- 
-2.17.0
-
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
deleted file mode 100644
index a2e0d1afb70a..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos vala" # telepathy"
-REQUIRED_USE="vala? ( introspection )"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	net-libs/telepathy-glib
-	>=net-libs/webkit-gtk-2.7.2:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5 )
-"
-#	telepathy? ( net-libs/telepathy-glib )
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.3
-	>=dev-util/gdbus-codegen-2.30.0
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-# Due to sub-configure
-QA_CONFIGURE_OPTIONS=".*"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-glib-2.58-compat.patch
-	"${FILESDIR}"/glib-2.58-compat2.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-	# telepathy optional support is really a badly one, bug #494456
-	gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-pocket \
-		--enable-telepathy \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-		#$(use_enable telepathy)
-	# gudev & cheese from sub-configure is overriden
-	# by top level configure, and disabled so leave it like that
-}
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 4ef8a97d671d..c80feada7a14 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,6 +1,3 @@
-DIST gtk-vnc-0.8.0.tar.xz 448984 BLAKE2B e9de98a969297832ff6eaba79707a44494b20d944264ac6902596f882b95e8ab1bc6b7eb25e040d17f939d678a81eec730f983942db38d73c81751fc2afd45df SHA512 9b66e4028e56b01af8d0ded5b833fc6c0ba752ac72cd664293b0009868bbec0bc8750b619ece9786eddc06155e390ecccc4c5bc84717c49ac4bd866e6febd8e3
 DIST gtk-vnc-0.9.0.tar.xz 444736 BLAKE2B cf1afc0e856659012738060a584c72d7ad1b70459afd8bf92630d69cf32d380264814304a68a93d8a5a70d6573b6754658450005a2ea2b96f13ae03f9e87fcba SHA512 498b368eb53ac58172db280c80f9da71ce82b636c39f186046e4f674e44c574ff4b63c3f777acc79d32c17d70e4efcdc207768ed49b3d1842bc4b73618296215
-EBUILD gtk-vnc-0.8.0-r1.ebuild 1699 BLAKE2B 2a794a7f9138bec46834e44335e287b4a755053d1ef9c1d50a3c1612e4c5eb349fb3256d4f4d2e40965fae816ce54ef93cae41424bc4908e668edf84089ef9ba SHA512 836b75d87766ba67e6365a62a869694f3ee599b4c336eed8986a955e5e33c4396596c3d2b811da9225add73dcd66e59d596b75b0bb7faafff778a190886225b8
-EBUILD gtk-vnc-0.8.0.ebuild 1666 BLAKE2B 3ee6335e5f0e998a10b5bf526fffd65db5961a38968b25a676dcfedb19585161fbbfd3dee1e02e9ec93582845573cb69e517e18bffded22d70596986940ee684 SHA512 81e1d665c1ab68ce8b857aa557cfa1bb2578948c863826250e9b00d6be723f6cddee482a7be66f8fe91c2ab1599136c4f5a275f31f71374f24f4898e8c31c462
 EBUILD gtk-vnc-0.9.0.ebuild 1700 BLAKE2B 75e0f942874fb58b56f6e86b9ddf156e801b02c63441550ee94af1ccc4708fbce37d200eb84d1067d0eec2515170b2dde183acb646058349dd279c8bf42c4b4d SHA512 cd518601ff7ec08cf8540e9ff619bbb2f011c7d2abe6ee9555a6eb71e3297953d60e58b31160a053a615f5e69e5d8b7a3a8f114e55a9540a194b371d9b243de9
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
deleted file mode 100644
index 61f919fcbe1b..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit vala gnome2 python-any-r1
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples +introspection pulseaudio sasl +vala"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-RDEPEND="
-	>=dev-libs/glib-2.30.1:2
-	>=dev-libs/libgcrypt-1.4.2:0=
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-3.0:0=
-	>=x11-libs/cairo-1.2
-	x11-libs/libX11
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with examples)
-		$(use_enable introspection)
-		$(use_with pulseaudio)
-		$(use_with sasl)
-		$(use_enable vala)
-		--with-coroutine=gthread
-		--without-libview
-		--disable-static
-		--with-gtk=3.0
-	)
-
-	gnome2_src_configure ${myconf[@]}
-}
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
deleted file mode 100644
index f914952ea646..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
-
-inherit vala gnome2 python-any-r1
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="examples +introspection pulseaudio sasl vala"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-RDEPEND="
-	>=dev-libs/glib-2.30.1:2
-	>=dev-libs/libgcrypt-1.4.2:0=
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-3.0:0=
-	>=x11-libs/cairo-1.2
-	x11-libs/libX11
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with examples)
-		$(use_enable introspection)
-		$(use_with pulseaudio)
-		$(use_with sasl)
-		--with-coroutine=gthread
-		--without-libview
-		--disable-static
-		--disable-vala
-		--with-gtk=3.0
-	)
-
-	gnome2_src_configure ${myconf[@]}
-}
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index ede8e2ae6397..2a9ffe2e55a2 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -13,7 +13,7 @@ EBUILD libmbim-1.12.4.ebuild 988 BLAKE2B 07a00a52935fe1802f68a2f451a12c323184f83
 EBUILD libmbim-1.14.0.ebuild 810 BLAKE2B 52706816df8314067a8942676155dd03248a54557fda02eb68c6f72596e3c43056246e3ebe45a9267f3eb3291382116d6a2da04211108cb45bb46268b4a65c21 SHA512 f8d9216416815e67ac3ff0aa8a21bf1256df4e844a8d32ac6accc3fbc42fdee623f66cb93c5398eabc1d245fa52c718b8186862ce882ccb847d439700ac978ae
 EBUILD libmbim-1.14.4.ebuild 815 BLAKE2B 338dd76d93238f75f41ebd107061f25d6021060bedd43786ef72fbe0d8a74fb47f7ee4f71fdabb195e069abacfa17bad40d54a08b339c2904acdaf95cb7825eb SHA512 2bb0ab43a8e3f67c8374478c624efc939af2619763816a0049b24574ecc3f8759212f681c8e9fa4e03b6575f8ea17b14d25170d041945b8651bec9279d61dad0
 EBUILD libmbim-1.16.0.ebuild 815 BLAKE2B 338dd76d93238f75f41ebd107061f25d6021060bedd43786ef72fbe0d8a74fb47f7ee4f71fdabb195e069abacfa17bad40d54a08b339c2904acdaf95cb7825eb SHA512 2bb0ab43a8e3f67c8374478c624efc939af2619763816a0049b24574ecc3f8759212f681c8e9fa4e03b6575f8ea17b14d25170d041945b8651bec9279d61dad0
-EBUILD libmbim-1.16.2.ebuild 810 BLAKE2B 52706816df8314067a8942676155dd03248a54557fda02eb68c6f72596e3c43056246e3ebe45a9267f3eb3291382116d6a2da04211108cb45bb46268b4a65c21 SHA512 f8d9216416815e67ac3ff0aa8a21bf1256df4e844a8d32ac6accc3fbc42fdee623f66cb93c5398eabc1d245fa52c718b8186862ce882ccb847d439700ac978ae
+EBUILD libmbim-1.16.2.ebuild 809 BLAKE2B c4d9bf31b9f66c7a7db41fcf364434493efc060e44aca108b00d61347d5bc427da3c6f2eb6cb7217961994e0e784c75c9b4d070085209cc02309fcdd99baa8b0 SHA512 22f7701c9d9f3d3bbfd299085be8fb6f9afffbeaa13f4593373309f5c167cd9c0cd5e894ed7e7648511db74ebbca4f7e2e5604bc3fef463be7d0ee3691f56586
 EBUILD libmbim-1.18.0.ebuild 824 BLAKE2B 48aee6f7c039487cd4c9d3621d29b5869bd5b5d9ea8770fe9263d865a700311eca66cc299cd286f53a14b05fe0c7a8b3b759dd9f542e3674a0ba28ac0dd94357 SHA512 3514d10062d850f5c04ae30edb78361b287d27a5393b98bf025fcb44753595683225d70f4c2e45b512d9a34ed8cfd1f772e6801eb6f1fe95a12ad30856e30f72
 EBUILD libmbim-1.6.0.ebuild 1023 BLAKE2B cc6e5b462180591769753a4dbd40b0044559efda7fe562d930cbbb623e44216b48b1c0287557b620a867455730ed8a643adba60a986ee20a22681c3eb29a39b4 SHA512 32d7ed0a5e40b0113aa920f67451b4b7494f9ef52dcf20c7e785418409fbf068e898b1b6e762c6e13c97cb8768391b67b9e669fd429196986f78a25a14cf03d0
 MISC metadata.xml 241 BLAKE2B 5323e3cc2a6d62c9fe301f465f7e03b145f6877adc893cf9e3f0fe4863fce3423f3471f62fce04fafc65428fb4781d2d74d796281d9332d0707e45bedec9a1a0 SHA512 d85c72d707e2c7290ff4bf18bbbd34b938cddb7e09528c5d10fa7f141122e3836687c2fff91c1000791457b7f808d3222fe671755a0fc25c157d80c908bc3cae
diff --git a/net-libs/libmbim/libmbim-1.16.2.ebuild b/net-libs/libmbim/libmbim-1.16.2.ebuild
index f10f42cfecdd..595dcdc5bfc9 100644
--- a/net-libs/libmbim/libmbim-1.16.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 79db3f2910d3..6d328bb05e5c 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -16,7 +16,7 @@ EBUILD libqmi-1.16.4.ebuild 1108 BLAKE2B d2be43c1b65dc95941f1aa6c63472f7edaf6278
 EBUILD libqmi-1.18.0.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
 EBUILD libqmi-1.18.2.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
 EBUILD libqmi-1.20.0.ebuild 1128 BLAKE2B dc514b0bb985a390e941147c6e225c9928cab2d469d354c2e6373e29518b99cc18c553bdba8aaddfce9f479cedf5033d546519ee7caaa58478bbd98b225b8bee SHA512 fc736e97cf50eaa908ee2ea5b8f5d9ad16fb1f39624083d76048e5fc2ea864ae1f6b803df1cac870985db80eb71bf487fa4c1673bafc228b3697b5a65cb6087e
-EBUILD libqmi-1.20.2.ebuild 1132 BLAKE2B f22e06f44ec5d8cbc3e5e3933d1e8e5cbe27cfae3c3624bef68469bd7f60da011a66d52b511dca67959e9068dbda8e98ec85cd6ef49a6521832694e25489b6c9 SHA512 631b04acce82f6748efcecbea05e7dc583d461dc243c7f09d11bfbc2144f9d3f187b66dbcc27137474cad7374a884ca2dd28d166f632204711c73341d950bb68
+EBUILD libqmi-1.20.2.ebuild 1131 BLAKE2B 0face20d09b64b7e8b6315a7d9381ab1d8a33768872c04c36f2d3fd2b6bd4d31734df65264d15aa72a0589d76c0a92ffff7e9dcc41059fedd1a5025ee8531e76 SHA512 8e3cf0588a972955d2026512507cf43ee6e946896cd0cec60e934e377a12004df374e49ce8713c3d428af9a3800d2866effb958004caab1b5c4cb90d3835f65d
 EBUILD libqmi-1.22.2.ebuild 1130 BLAKE2B aea3702794c6d733eed557e40bfb471776a0f16e62e45378a3ec86ce0aea5805b4fccba876f0048e9f585f2bb6dbba5dbc2d0d68bb7b8f8eb5a2eaba3823b242 SHA512 a4152f00ca288315529acbdb3ecd1a6ca4220f2f85b5f36ce05341b11a22d7eb8330d3868cc54f267197b93d566e49668652cdf27d2cefa9b758b0d825708c06
 EBUILD libqmi-9999.ebuild 1128 BLAKE2B a79aaf1d60a996f5e9fe3d53a7b1d59b61763720cd3598748141e6d3cc21959a0c07fc327d9ebd508cab7bd1e787df20ad025dca55d22e2255c3ebdbe61fd1db SHA512 57703ca8652c1ff10d999184b55f0e69006602d4ac29faf66eb044f9b3db961adb92c4aab91196e089724755f947c4af203e76aa91e612dd7a140ecb53197c8d
 MISC metadata.xml 416 BLAKE2B f391913e78bcdb06b9c686a460059b4ee38861fa09fa0d50c19418ac3e1d966efd2646694d89d240d13f0a9bf2eb910d952288de153699b9564040efed8b04ab SHA512 4ebf9f46a3c7c6e18e0eb83341bac1b087bb6471a0f3f11663975b8a6e0e1a78f8db680a628dc693c4c3eb825d50717f0b7ed086d90c9d33818f094de2611fe2
diff --git a/net-libs/libqmi/libqmi-1.20.2.ebuild b/net-libs/libqmi/libqmi-1.20.2.ebuild
index 4d318a2b5e6f..f233d8e52a59 100644
--- a/net-libs/libqmi/libqmi-1.20.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
 else
-	KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index dca589b39474..a9f12444d785 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -3,8 +3,10 @@ DIST libtorrent-rasterbar-1.1.10.tar.gz 3902542 BLAKE2B 3a78862ce2825c9da32ab381
 DIST libtorrent-rasterbar-1.1.12.tar.gz 3897237 BLAKE2B 0988b16d79df9499e2f7ab9d568ec560fa701e78fa0c6cc0158629d219259a73f3b2aa8b79d6f9c3a757f97559bc6b354148d5885b29f089a41893df65c92b11 SHA512 6f264ca9fcdcb93c4e16ced4b2657ccb19d47cbd483c3ad9f14909ee7de280b50c15d180c05ebd454236871fceca48cd79647bf89f8cbebf234b8f0f351aa699
 DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160
 DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
+DIST libtorrent-rasterbar-1.2.1.tar.gz 3562762 BLAKE2B 1978356ba00c07c4b89657ebe190b2aa4a938d22e5ab63844fb664312d60f761a07c42b9353f2f500fdf9a08afcb294a39bfb447d255d93b1a45ecc2be629ffe SHA512 a60e38c4c951756786ede69af1a5d56bf6293bcb7d235f0b7feda72f731bc163ea6a7401c4b5f5400b8ce236decff0ae3a1d5fe39c7f8f775e65031677f02074
 EBUILD libtorrent-rasterbar-1.1.10.ebuild 2383 BLAKE2B 8aa73342140939d5842d80d686c127e62e8ab1f3186a2af48144274ea7c531c70ce5bf4ed45efbfe87aa7b341111dbc0158f86810841a4877d3cc1d6e0acff6b SHA512 b493746cc819c8f43e68a53bc06ea7091cec77959bf6d51d3c204c5c793e2871cf093352e6a854c0b79744552e8005382468447a86185b4b58a0c38d20007fd2
 EBUILD libtorrent-rasterbar-1.1.12.ebuild 2383 BLAKE2B 919a3ca47460f14e9e22dbf3bba66539122960051bbbb4957d56e15f7f8dcd7edf8807f637f23b89022b6b2574747edef90f2edbc9b28f4ee005190d7aa384cc SHA512 4365325228634965e650d633ec1378bd8acfcb13398bf98de79b5190782c6e312e525ec8326b7e3eea48d8efddd64c7accae6e3ed138625098fbb1b305e5e381
 EBUILD libtorrent-rasterbar-1.1.13.ebuild 2385 BLAKE2B b5d51c97dcae1ca920224a81cda528297cd71aea5428605d1db66d0c7dba18f1f611b4327fd4400e056e30b97427eb935f1f93551e299231b4e4d77a4ff15573 SHA512 7362ba19287ff719da67543df0f327173713b3161bf2d06af85884724b51485e0a9d5dbe94b434e2556b5f35c544f2b574a5fed6549c81a0893ae88661e0890c
 EBUILD libtorrent-rasterbar-1.2.0.ebuild 2563 BLAKE2B 324eb4c1491dcff9fd62dc82f0e51490b066f52ca673a8e710b77418b8d9dc41a4fb787f63e951eeff62818acdf5bac54e3a04e6167f8e3e61700c0a67a567b2 SHA512 e8f0ce97f77781f9e2ca202bef02837bc612a3407a03b60358fd1c5578c847924103a5c92cbc12eadbca71f9700803a6d495fde32d9d5723d553cd485da2738c
+EBUILD libtorrent-rasterbar-1.2.1.ebuild 2552 BLAKE2B 8bc3757f60e28ca420ca63b2ca19bd265e7ededc67fa8ec0aababa6564d85dec7fdf942d56bc5a0abfdbe60ec05e4258445e89df8b67cd367a05352e0badf856 SHA512 ede60dab739bcaa3fa63a30f953878b4d975aff4a7db48c384d437054c8f9899f0052d4f63299f6b52d30e8dbce40a9a79298683ec8d045be6aecd9e484237ae
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
new file mode 100644
index 000000000000..f8bc1206181e
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1 flag-o-matic
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}-${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable dht dht $(usex debug logging $(usex ('yes' 'no'))))
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="${EPYTHON#python}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index bb47b342b83b..2f4f61af45ff 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,5 @@
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190408.ebuild 1338 BLAKE2B ca708dd1a102da3ce579a974ee29aa31835df92f39c04d159cef990df3c8c780cf93a7fc366b5004c49f1d342562922b62243adc36a42556ae63877ee6623ad6 SHA512 3925e55613ef2bfec421fd61da101838528a05a2c4f62d5b6a71ff8252e0022bee27ca1c81f8ac40619c460cadac1e097e8051bc58d104f8ffd5872220dae04d
+EBUILD miniupnpc-2.1.20190408.ebuild 1337 BLAKE2B d5248f0e817c206a781680bf6f5e2842c6e0533b22ae1bab0373946235d18ed7165a37d0ec5084f6c09aada855dd17b50f450eca0f55305e7349c5c6d35779f4 SHA512 eeec145f6ecd01b157c4e0300669937f192c406276bb2fc736fc6d992be3d9b15686c7ed8b9512f288814f3624c27827201ff8b99b9fba13203da74de9136087
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
index a422b3834f6e..001384d95bd8 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 39cb4cfe175b..e1cf2a517af4 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -6,6 +6,6 @@ DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
 EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
 EBUILD srt-1.3.1-r1.ebuild 1347 BLAKE2B 99c91c175f9c3102e1b29a6f9802c4a73576c2840c5d815494632a77c2ff9334a17ae2cc4b5709132de4dd52bc7cb0db482fa6f5c6f85dfe532e03cefdeed543 SHA512 76c669ab9a37339d041a28fdd888fbab0ea1e36f4f29705fa262b7d68a4cce1d80b9f3e29289f342b951d20a61f65b0b074a03b42cf1ec62fe54ffc1f2d064b5
-EBUILD srt-1.3.2.ebuild 1218 BLAKE2B 291dbced84a2b2e0a6ff6be866a651434697e0e32466913c57303b48a0407472966d0641d9ebe6567776175d3d4916516a079c184d14e83899bef8894c72fcd4 SHA512 873ccebc0bdb95087848c9a7dd6cb70a43bf896e2b29e8acbf0783eb1817246a24eb6a8137f0dffcb97bf0c1761681d268285346c71984dc50e56045c6c254db
+EBUILD srt-1.3.2.ebuild 1216 BLAKE2B 5810178a2bddb2f2073ac57765c433dd26366c79c126b7c821f6a4988a16cd76c15c59ae596e741dc940cb9878968576e45d65c5d46271d40e37acf358299a7a SHA512 9332810835b518e77e614686799316feb7f6632f42a98f7ebd9801c3c9dc946483b54e7cf44cab4729851e5f4fbd165c595478efc2a3c6f65fd5f65f05baa7bd
 EBUILD srt-9999.ebuild 1314 BLAKE2B 190493cd65e60dfb2131cd64910dde9b4d62b10aca1dba5143dd1a34d5f353c22b89b9cfaaae03a3cf3b8f27ed31304aa10533f9c062d396a57be7943e3bd138 SHA512 4c7857ebec342fab43372b5baf7af31455a6a82addff0b5bdaba4df78f733abbaa75f4da5d263313962db51464ab496aca797d00a500bf1f8b0400c9dea1c596
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index 97e04641afd7..bd420bba4fa9 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8615868d4e4c..52b5be70699b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
 DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa
-EBUILD webkit-gtk-2.24.1.ebuild 8333 BLAKE2B ba3466a372079f14ca5cc6e7add3f61c3e4aac077accfac1c5807da62bb7226bc366640873d654ef49301880ddcf0bff21126b5c0064301bb0ef0a9e086f212d SHA512 65022625db7ae7cf19d45525c18675ee3c53122f2c9a3939b80b3e2cafdcc129ae0dd32a319861e6998bc1a9f29e1a0d3806817ca60efc80bbee0fa3e334d9b2
-EBUILD webkit-gtk-2.24.2.ebuild 8335 BLAKE2B a6709f1772d78a91e089a5915ca70289d905b061eed84ba4611a775570de70b94bd88d9a665029c6cea2312d6f04a9a75357ebeca310be3e14cfb5fafbebffca SHA512 294e875fbd235e9d5b088cd92c60b5c32e6381b6d446086b6a263d03caf2ca7e53fc1094cf05687191128799fd31e232c7aec2cb56aefe3c899f966ba4a72102
+EBUILD webkit-gtk-2.24.1.ebuild 8332 BLAKE2B 6f05f3a6f7f7ec01c540eaa08a709c84f4ce745a1d769bac6be2933b5f142031092aa0527c6dad2afbf73d73ee473a6a4ed6e122f5de3bf729b0bcb133f90a01 SHA512 85599d3537f015f2f546b7dd7c38e8f3b2d83d79904724e836a7ecdf22c6999792a863fc05214c4d6e1b5fb237aaf8bb89c54d7be5310d1b58f8122a668faf15
+EBUILD webkit-gtk-2.24.2.ebuild 8333 BLAKE2B ba3466a372079f14ca5cc6e7add3f61c3e4aac077accfac1c5807da62bb7226bc366640873d654ef49301880ddcf0bff21126b5c0064301bb0ef0a9e086f212d SHA512 65022625db7ae7cf19d45525c18675ee3c53122f2c9a3939b80b3e2cafdcc129ae0dd32a319861e6998bc1a9f29e1a0d3806817ca60efc80bbee0fa3e334d9b2
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
index 5e332dec8436..4438db5fb696 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
index 5c4c67891ba9..5e332dec8436 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"