[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/

[Mart Raudsepp]

commit:     3c5020795bc5ad4cc124b7793d7e5cd60e237042
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 21:51:35 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 21:56:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c502079

gnome-base/gnome-control-center: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/gnome-control-center/Manifest           |   4 -
 .../files/3.26.2-gnome-desktop-3-28-compat.patch   |  78 ----------
 .../files/3.26.2-goa-lifecycle.patch               |  95 ------------
 .../files/3.26.2-without-wayland-fix.patch         |  46 ------
 .../gnome-control-center-3.26.2-r28.ebuild         | 159 --------------------
 .../gnome-control-center-3.26.2-r3.ebuild          | 160 ---------------------
 .../gnome-control-center-3.28.2.ebuild             | 149 -------------------
 .../gnome-control-center-3.30.3.ebuild             | 153 --------------------
 8 files changed, 844 deletions(-)

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 633ab568c15..8f8fc06e162 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,8 +1,4 @@
 DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927
 DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a
-DIST gnome-control-center-3.26.2-patchset.tar.xz 159088 BLAKE2B 521af115f7d4372ecf645b915e9081607a6699528b2914e73f11856fc9a8ae80406c210ad97b5d84b616d324d0c1539e2155c5e6db4920cbd8355b85f21a8e3b SHA512 90bf9e19b98dcc39fe5af6604876e5d9fe31358a4da602fe518589d9b3a9261fee3b3785f40a889295e3e7b38370173d03350f475be576830efa2ad74718c19e
-DIST gnome-control-center-3.26.2.tar.xz 7386516 BLAKE2B 156c24bc2ab60943ade1e255976e29478c9b0e9dbad12921a835ec55f09ad62c71886750a50fa74f2a0afb660cac073c9ff54cef4b72c790b6dd91c7cac8aaa9 SHA512 d3ad9067c7e66a3a6bf5b6c058f3862f6e4b59c0254fd47f0b4a9093f3b7e2d7f1900b510aba8bbdac7c1212a0f6cdd4974c3d04003af63edb72ed3e56f7dbca
-DIST gnome-control-center-3.28.2-patchset.tar.xz 75820 BLAKE2B 7f7cda69248862eb9ddba5d69d84c6cf1e550a9db6d914d4f5327b107d01bcb4b40152889ffc13700a8e777b805b037a267e9b641df65612a86099e0851ab417 SHA512 927287e98d1b958b27a644a90fe3da38ba3040a60e4318268f46e764226906d851148370635ab232748f5ef78cf9406b71025738cdec951582042ce4282914c6
-DIST gnome-control-center-3.28.2.tar.xz 5857128 BLAKE2B 253c220fdc759a26f23210a7665323ccdfb18e5f76652791718f2523badbac1f42c9c0fd75e5505c1e3d5f7391abc344b47cb101741ef35ed60859c4c16d7988 SHA512 3e1b54cf1a603ee7c47d8b0f1fb025405c8d133c9e0dbe0eaf2f287eff82109e95581c79f131d227422d682b7049ccb6e6297dba1ff2276cff5f715308195d7f
 DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e628401ea74fa90582721aaffddfb0e3f8e78013edde0d2f712d4433c316b3da08c9ec1038200cfd4e9b1a315b224d2e881d056b0f685f7067eb SHA512 99519c54ef223b94d5101987b7d7dc203c447765ef79374a3f0911282cd77917f64dea7318d70c63b8df8506c058fa1fcb1d71b23488b3ca9be993667509b7d1
 DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc

diff --git a/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch b/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch
deleted file mode 100644
index f90e0514dd7..00000000000
--- a/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 6c98cbb514b2a455dd27f3a32a48e43a65cd29a2 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell@×××××××××.com>
-Date: Tue, 26 Sep 2017 14:12:13 -0400
-Subject: [PATCH 2/2] background: Remove GdkColor deprecation warnings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=788205
-(cherry picked from commit ed03e9c49faafba132ab4077daeaf213b541aed7)
----
- configure.ac                           |  2 +-
- panels/background/cc-background-item.c | 19 ++++++++++---------
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 90579ac9f..f810bfb1f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,7 +97,7 @@ NETWORK_MANAGER_REQUIRED_VERSION=1.2.0
- NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0
- MODEM_MANAGER_REQUIRED_VERSION=0.7
- LIBNOTIFY_REQUIRED_VERSION=0.7.3
--GNOME_DESKTOP_REQUIRED_VERSION=3.21.2
-+GNOME_DESKTOP_REQUIRED_VERSION=3.27.3
- SCHEMAS_REQUIRED_VERSION=3.21.4
- LIBWACOM_REQUIRED_VERSION=0.7
- CLUTTER_REQUIRED_VERSION=1.11.3
-diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c
-index 92220f823..8f8759bd0 100644
---- a/panels/background/cc-background-item.c
-+++ b/panels/background/cc-background-item.c
-@@ -150,8 +150,9 @@ get_emblemed_pixbuf (CcBackgroundItem *item, GdkPixbuf *pixbuf, gint scale_facto
- static void
- set_bg_properties (CcBackgroundItem *item)
- {
--        GdkColor pcolor = { 0, 0, 0, 0 };
--        GdkColor scolor = { 0, 0, 0, 0 };
-+        GdkRGBA pcolor = { 0, 0, 0, 0 };
-+        GdkRGBA scolor = { 0, 0, 0, 0 };
-+        GdkColor p, s;
- 
-         if (item->priv->uri) {
- 		GFile *file;
-@@ -166,13 +167,13 @@ set_bg_properties (CcBackgroundItem *item)
- 	}
- 
-         if (item->priv->primary_color != NULL) {
--                gdk_color_parse (item->priv->primary_color, &pcolor);
-+                gdk_rgba_parse (&pcolor, item->priv->primary_color);
-         }
-         if (item->priv->secondary_color != NULL) {
--                gdk_color_parse (item->priv->secondary_color, &scolor);
-+                gdk_rgba_parse (&scolor, item->priv->secondary_color);
-         }
- 
--        gnome_bg_set_color (item->priv->bg, item->priv->shading, &pcolor, &scolor);
-+        gnome_bg_set_rgba (item->priv->bg, item->priv->shading, &pcolor, &scolor);
-         gnome_bg_set_placement (item->priv->bg, item->priv->placement);
- }
- 
-@@ -996,12 +997,12 @@ static gboolean
- colors_equal (const char *a,
- 	      const char *b)
- {
--	GdkColor color1, color2;
-+	GdkRGBA color1, color2;
- 
--	gdk_color_parse (a, &color1);
--	gdk_color_parse (b, &color2);
-+	gdk_rgba_parse (&color1, a);
-+	gdk_rgba_parse (&color2, b);
- 
--	return gdk_color_equal (&color1, &color2);
-+	return gdk_rgba_equal (&color1, &color2);
- }
- 
- gboolean
--- 
-2.17.0
-

diff --git a/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch b/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch
deleted file mode 100644
index bbc8befdf28..00000000000
--- a/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From a1bc1ae54d2330e32eac7b4df7c07393df87e7da Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@×××××.org>
-Date: Thu, 4 Oct 2018 11:28:15 +0200
-Subject: [PATCH 1/2] online-accounts: Track the lifecycle of CcGoaPanel across
- async calls
-
-Due to an API bug in GNOME Online Accounts, the asynchronous
-goa_provider_get_all method doesn't accept a GCancellable argument.
-This makes it difficult to cancel an ongoing call when the CcGoaPanel
-gets destroyed.
-
-Prior to commit c26f8ae018900a55, this was hacked around by taking a
-reference on the panel for the duration of the call. Instead of
-cancelling a pending call on destruction, it would keep the panel alive
-until the call was over. However, that was lost during commit
-c26f8ae018900a55.
-
-One thing to bear in mind is that GtkWidgets, CcGoaPanel is one, can
-be destroyed by a gtk_widget_destroy call, which is subtly different
-than a simple sequence of g_object_unref calls. When gtk_widget_destroy
-is used, it invokes the GObject::dispose virtual method of the widget.
-It is expected this will cause anything holding a reference to this
-widget to drop their references, leading to GObject::finalize being
-called. However, there is no guarantee that this will happen in the
-same iteration of the GMainLoop. Therefore, it is possible that when
-the goa_provider_get_all call finishes, the CcGoaPanel might be in a
-disposed, but not yet finalized state.
-
-When a GObject is in a disposed-but-not-finalized state, only a very
-limited number of operations can be performed on it. Its reference
-count can be altered, the memory used by the instance struct can be
-accessed, but none of the member GObjects can be assumed to be valid.
-eg., it's definitely illegal to add new rows to the member GtkListBox.
-Hence a boolean flag is used to mark the destroyed state of the panel.
-
-This second part is a small improvement over the earlier hack.
-
-https://gitlab.gnome.org/GNOME/gnome-control-center/issues/208
-(cherry picked from commit 83558429b3f98a4bf4ada17b64f09f073a6b8c38)
----
- panels/online-accounts/cc-online-accounts-panel.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
-index edd140e4b..1640c74c4 100644
---- a/panels/online-accounts/cc-online-accounts-panel.c
-+++ b/panels/online-accounts/cc-online-accounts-panel.c
-@@ -56,6 +56,7 @@ struct _CcGoaPanel
-   GtkWidget *stack;
-   GtkWidget *accounts_vbox;
- 
-+  gboolean   destroyed;
-   guint      remove_account_timeout_id;
- };
- 
-@@ -401,6 +402,8 @@ cc_goa_panel_dispose (GObject *object)
-   /* Must be destroyed in dispose, not finalize. */
-   g_clear_pointer (&panel->edit_account_dialog, gtk_widget_destroy);
- 
-+  panel->destroyed = TRUE;
-+
-   G_OBJECT_CLASS (cc_goa_panel_parent_class)->dispose (object);
- }
- 
-@@ -480,7 +483,7 @@ cc_goa_panel_init (CcGoaPanel *panel)
-                     panel);
- 
-   fill_accounts_listbox (panel);
--  goa_provider_get_all (get_all_providers_cb, panel);
-+  goa_provider_get_all (get_all_providers_cb, g_object_ref_sink (panel));
- 
-   gtk_widget_show (GTK_WIDGET (panel));
- }
-@@ -843,7 +846,7 @@ get_all_providers_cb (GObject      *source,
-                       GAsyncResult *res,
-                       gpointer      user_data)
- {
--  CcGoaPanel *self = user_data;
-+  g_autoptr (CcGoaPanel) self = user_data;
-   GList *providers;
-   GList *l;
- 
-@@ -851,6 +854,9 @@ get_all_providers_cb (GObject      *source,
-   if (!goa_provider_get_all_finish (&providers, res, NULL))
-     return;
- 
-+  if (self->destroyed)
-+    return;
-+
-   for (l = providers; l != NULL; l = l->next)
-     {
-       GoaProvider *provider;
--- 
-2.17.0
-

diff --git a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
deleted file mode 100644
index d045790d6c7..00000000000
--- a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 75dc553f10df3cf48227ec69b9465009eebf7b8b Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@×××××.com>
-Date: Wed, 17 Jan 2018 20:05:03 -0200
-Subject: [PATCH] common: Don't unconditionally define HAVE_WAYLAND
-
-This header unconditionally defines HAVE_WAYLAND when GTK
-is built with Wayland support. This breaks the build when
-building with Wayland disabled.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785414
-(cherry picked from commit 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf)
-[Added HAVE_WAYLAND config.h definition for autotools to fix runtime]
-Signed-off-by: Mart Raudsepp <leio@g.o>
----
- configure.ac                       | 1 +
- panels/common/gnome-settings-bus.h | 2 --
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f810bfb1f..24940a798 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,6 +291,7 @@ AS_IF([test "$enable_wayland" != "no"],
-               [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
- 
-         PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
-+        AC_DEFINE(HAVE_WAYLAND, 1, [Compile with Wayland support])
- ])
- AM_CONDITIONAL(HAVE_WAYLAND, [test "x$enable_wayland" != "xno"])
- 
-diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h
-index ce58f5805..763a9cca7 100644
---- a/panels/common/gnome-settings-bus.h
-+++ b/panels/common/gnome-settings-bus.h
-@@ -5,8 +5,6 @@
- 
- #ifdef GDK_WINDOWING_WAYLAND
- 
--#define HAVE_WAYLAND 1
--
- static inline gboolean
- gnome_settings_is_wayland (void)
- {
--- 
-2.17.0
-

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild
deleted file mode 100644
index 62bb2625cd0..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-# display panel requires colord and gnome-settings-daemon[colord]
-# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.53.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	>=gnome-base/gsettings-desktop-schemas-3.21.4
-	>=gnome-base/gnome-desktop-3.27.3:3=
-	>=gnome-base/gnome-settings-daemon-3.25.90[colord]
-	>=x11-misc/colord-0.1.34:0=
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-	>=sys-apps/accountsservice-0.6.39
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-
-	virtual/libgudev
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3=
-		>=net-libs/gnome-online-accounts-3.25.3:= )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-#	sys-devel/autoconf-archive
-
-PATCHES=(
-	# Lots of patches from gnome-3-26 branch on top of 3.26.2
-	# Makes some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
-	"${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
-	"${FILESDIR}"/${PV}-gnome-desktop-3-28-compat.patch # backport of porting to gnome-desktop-3.28 API changes; but due to runtime issues we ended up still needing to lock the wayland flags between gtk+ and g-c-c (TODO)
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild
deleted file mode 100644
index 3cb36611c3d..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-# display panel requires colord and gnome-settings-daemon[colord]
-# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
-# Requires gnome_bg_set_color, which was replaced with gnome_bg_set_rgba in 3.27.90
-COMMON_DEPEND="
-	>=dev-libs/glib-2.53.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	>=gnome-base/gsettings-desktop-schemas-3.21.4
-	>=gnome-base/gnome-desktop-3.21.2:3=
-	<gnome-base/gnome-desktop-3.27.90:3
-	>=gnome-base/gnome-settings-daemon-3.25.90[colord]
-	>=x11-misc/colord-0.1.34:0=
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-	>=sys-apps/accountsservice-0.6.39
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-
-	virtual/libgudev
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3=
-		>=net-libs/gnome-online-accounts-3.25.3:= )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-#	sys-devel/autoconf-archive
-
-PATCHES=(
-	# Lots of patches from gnome-3-26 branch on top of 3.26.2
-	# Makes some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
-	"${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]; but due to runtime issues we ended up still needing to lock the wayland flags between gtk+ and g-c-c (TODO)
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild
deleted file mode 100644
index e48ea0dd21f..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-REQUIRED_USE="flickr? ( gnome-online-accounts )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# >=polkit-0.114 for .policy files gettext ITS
-clutter_gtk_dep="media-libs/clutter-gtk:1.0"
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-COMMON_DEPEND="
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
-	>=media-sound/pulseaudio-2.0[glib]
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gnome-desktop-3.27.90:3=
-	>=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-3.27.2
-	dev-libs/libxml2:2
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99:=
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	flickr? ( >=media-libs/grilo-0.3.0:0.3= )
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	v4l? (
-		${clutter_gtk_dep}
-		>=media-video/cheese-3.28.0 )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	wayland? ( virtual/libgudev )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	input_devices_wacom? (
-		${clutter_gtk_dep}
-		>=dev-libs/libwacom-0.27
-		>=media-libs/clutter-1.11.3:1.0 )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.1.24
-	net-libs/libsoup:2.4
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=dev-libs/libpwquality-1.2.2
-"
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
-
-	!<gnome-base/gdm-2.91.94
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Patches from gnome-3-28 branch on top of 3.28.2
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use v4l cheese)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		-Dgrilo=$(usex flickr enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		$(meson_use input_devices_wacom wacom)
-		$(meson_use wayland)
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
deleted file mode 100644
index 7beb2fd313c..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-REQUIRED_USE="flickr? ( gnome-online-accounts )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# >=polkit-0.114 for .policy files gettext ITS
-clutter_gtk_dep="media-libs/clutter-gtk:1.0"
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-COMMON_DEPEND="
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
-	>=media-sound/pulseaudio-2.0[glib]
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gnome-desktop-3.27.90:3=
-	>=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-3.27.2
-	dev-libs/libxml2:2
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99:=
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	flickr? ( >=media-libs/grilo-0.3.0:0.3= )
-	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	v4l? (
-		${clutter_gtk_dep}
-		>=media-video/cheese-3.28.0 )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	wayland? ( virtual/libgudev )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.8.0
-		>=net-misc/networkmanager-1.10.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	input_devices_wacom? (
-		${clutter_gtk_dep}
-		>=dev-libs/libwacom-0.27
-		>=media-libs/clutter-1.11.3:1.0 )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.1.24
-	net-libs/libsoup:2.4
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	app-crypt/libsecret
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=dev-libs/libpwquality-1.2.2
-"
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
-
-	!<gnome-base/gdm-2.91.94
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Patches from gnome-3-28 branch on top of 3.28.2
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-	# Extra patch to fix incomplete USE=-cups support in patchset; amend it into the cups optionality commit for next patchset
-	"${FILESDIR}"/${PV}-conditional-cups-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use v4l cheese)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		-Dgrilo=$(usex flickr enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dtracing=false
-		$(meson_use input_devices_wacom wacom)
-		$(meson_use wayland)
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}