[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/files/, gnome-base/gnome-shell/

[Mart Raudsepp]

commit:     a6c7879c731370c2ed78aebe2dae65a686cc4136
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 22:14:15 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 22:14:15 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a6c7879c

gnome-base/gnome-shell: remove old

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

 .../gnome-shell/files/3.26-bluetooth-flag.patch    |  72 --------
 .../files/gnome-shell-3.12-bluetooth-flag.patch    |  50 ------
 .../files/gnome-shell-3.14.0-bluetooth-gold.patch  |  31 ----
 .../files/gnome-shell-3.14.0-defaults.patch        |  25 ---
 .../files/gnome-shell-3.20-fix-nvidia-crash.patch  | 106 -----------
 .../gnome-shell/gnome-shell-3.26.2-r2.ebuild       | 194 ---------------------
 .../gnome-shell/gnome-shell-3.26.2-r3.ebuild       | 183 -------------------
 gnome-base/gnome-shell/metadata.xml                |   4 -
 8 files changed, 665 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
deleted file mode 100644
index 65686954..00000000
--- a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Mon, 10 Sep 2018 13:17:39 +0200
-Subject: [PATCH] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
----
- js/misc/meson.build |  2 +-
- meson.build         | 15 ++++++++++++++-
- meson_options.txt   |  7 +++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 20489496c..3071f9dfb 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set('datadir', datadir)
- jsconf.set('libexecdir', libexecdir)
-diff --git a/meson.build b/meson.build
-index b82c41398..7d342ff61 100644
---- a/meson.build
-+++ b/meson.build
-@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_req)
- x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
- 
--bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
-+bt_dep = []
-+enable_bluetooth = get_option('enable-networkmanager')
-+if enable_bluetooth != 'no'
-+  want_bluetooth = enable_bluetooth == 'yes'
-+  bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth)
-+  have_bluetooth = bt_dep.found()
-+
-+  if not have_bluetooth
-+    bt_dep = []
-+  endif
-+else
-+  have_bluetooth = false
-+endif
-+
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 18899ffdb..9191f8c0e 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -16,6 +16,13 @@ option('enable-man',
-   description: 'Generate man pages'
- )
- 
-+option('enable-bluetooth',
-+  type: 'combo',
-+  choices: ['yes', 'no', 'auto'],
-+  value: 'auto',
-+  description: 'Enable bluetooth support'
-+)
-+
- option('enable-networkmanager',
-   type: 'combo',
-   choices: ['yes', 'no', 'auto'],
--- 
-2.18.0
-

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
deleted file mode 100644
index 2fa93af2..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@×××××.fr>
-Date: Thu, 28 Feb 2013 18:48:32 +0330
-Subject: [PATCH 2/3] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway.  I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a30e65..aa710f0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [
- ])
- AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
- 
-+AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth],
-+	AS_HELP_STRING([--without-bluetooth],
-+		[Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
--        [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
--	 AC_SUBST([HAVE_BLUETOOTH],[1])],
-+	[AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-+	 AC_SUBST([HAVE_BLUETOOTH],[1])
-+	 AC_MSG_RESULT([yes])],
- 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
--	 AC_SUBST([HAVE_BLUETOOTH],[0])])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
- 
- PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
- AC_SUBST(CALENDAR_SERVER_CFLAGS)
--- 
-1.9.0
-

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch
deleted file mode 100644
index cc2b2e65..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6b43368c9b10ba112e4272f66c507a0da9cf7e13 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-Date: Sat, 15 Mar 2014 17:48:41 -0400
-Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
- ld.gold
-
-For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect:
-the libgnome-bluetooth-applet must be linked to the binary that actually
-uses a function from libgnome-bluetooth-applet, i.e. to libgnome-shell.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=726435
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a73eaae..c8fd46f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -315,7 +315,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
- libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
- 
- libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
--libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la
-+libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) $(BLUETOOTH_LIBS) libgnome-shell-base.la
- libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
- 
- ShellMenu-0.1.gir: libgnome-shell-menu.la
--- 
-2.1.2
-

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch
deleted file mode 100644
index b6064225..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-defaults.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6b658660e822a550da55c735c826ec75b6c0efee Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Tue, 10 Dec 2013 23:33:51 +0100
-Subject: [PATCH 1/3] Alter list of default applications
-
----
- data/org.gnome.shell.gschema.xml.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
-index 92cef3f..9e783bb 100644
---- a/data/org.gnome.shell.gschema.xml.in.in
-+++ b/data/org.gnome.shell.gschema.xml.in.in
-@@ -31,7 +31,7 @@
-       </_description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-+      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-       <_summary>List of desktop file IDs for favorite applications</_summary>
-       <_description>
-         The applications corresponding to these identifiers
--- 
-2.1.2
-

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch b/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch
deleted file mode 100644
index 19eda8e8..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.20-fix-nvidia-crash.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 26d339b91744dab5135ee9ea1d46fda62448ad95 Mon Sep 17 00:00:00 2001
-From: Jan de Groot <jgc@×××××××××.org>
-Date: Mon, 11 Apr 2016 14:00:33 +0000
-Subject: [PATCH] Initialize framebuffer objects early so clutter will not
- abort a few operations later.
-
-Checking offscreen for COGL_INVALID_HANDLE is not sufficient, as cogl_offscreen_new_with_texture doesn't initialize framebuffer objects but lets Cogl solve this the lazy way. cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE anyways.
----
- src/st/st-theme-node-drawing.c    | 35 +++++++++++++++++++++++------------
- src/st/st-theme-node-transition.c | 18 ++++++++++++++++--
- 2 files changed, 39 insertions(+), 14 deletions(-)
-
-diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
-index 1f28ed9..4a6a234 100644
---- a/src/st/st-theme-node-drawing.c
-+++ b/src/st/st-theme-node-drawing.c
-@@ -2247,22 +2247,33 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state)
-                                        COGL_TEXTURE_NO_SLICING,
-                                        COGL_PIXEL_FORMAT_ANY);
-   if (buffer != COGL_INVALID_HANDLE)
--    offscreen = cogl_offscreen_new_with_texture (buffer);
--
--  if (offscreen != COGL_INVALID_HANDLE)
-     {
--      ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height};
-+      CoglError *error = NULL;
-+
-+      offscreen = cogl_offscreen_new_with_texture (buffer);
-+
-+      if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
-+        {
-+          ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height};
-+
-+          cogl_framebuffer_orthographic (offscreen, 0, 0,
-+                                         state->box_shadow_width,
-+                                         state->box_shadow_height, 0, 1.0);
-+          cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
- 
--      cogl_framebuffer_orthographic (offscreen, 0, 0,
--                                     state->box_shadow_width,
--                                     state->box_shadow_height, 0, 1.0);
--      cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);
-+          st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
- 
--      st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
--      cogl_handle_unref (offscreen);
-+          cogl_handle_unref (offscreen);
- 
--      state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),
--                                                               buffer);
-+          state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),
-+                                                                   buffer);
-+        }
-+      else
-+        {
-+          cogl_handle_unref (offscreen);
-+
-+          cogl_error_free (error);
-+        }
-     }
- 
-   if (buffer != COGL_INVALID_HANDLE)
-diff --git a/src/st/st-theme-node-transition.c b/src/st/st-theme-node-transition.c
-index 1eef17b..f3350a1 100644
---- a/src/st/st-theme-node-transition.c
-+++ b/src/st/st-theme-node-transition.c
-@@ -242,6 +242,8 @@ setup_framebuffers (StThemeNodeTransition *transition,
-   StThemeNodeTransitionPrivate *priv = transition->priv;
-   guint width, height;
- 
-+  CoglError *catch_error = NULL;
-+
-   /* template material to avoid unnecessary shader compilation */
-   static CoglHandle material_template = COGL_INVALID_HANDLE;
- 
-@@ -269,13 +271,25 @@ setup_framebuffers (StThemeNodeTransition *transition,
-   if (priv->old_offscreen)
-     cogl_handle_unref (priv->old_offscreen);
-   priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
-+  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), &catch_error))
-+    {
-+      cogl_object_unref (priv->old_offscreen);
-+      cogl_error_free (catch_error);
-+      priv->old_offscreen = COGL_INVALID_HANDLE;
-+      g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE);
-+    }
- 
-   if (priv->new_offscreen)
-     cogl_handle_unref (priv->new_offscreen);
-   priv->new_offscreen = cogl_offscreen_new_with_texture (priv->new_texture);
- 
--  g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE);
--  g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE);
-+  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->new_offscreen), &catch_error))
-+    {
-+      cogl_object_unref (priv->new_offscreen);
-+      cogl_error_free (catch_error);
-+      priv->new_offscreen = COGL_INVALID_HANDLE;
-+      g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE);
-+    }
- 
-   if (priv->material == NULL)
-     {
--- 
-2.7.1
-

diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
deleted file mode 100644
index 84ff9806..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome-meson multilib pax-utils python-r1 systemd virtualx
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.53:2[dbus]
-	>=dev-libs/gjs-1.47.0
-	>=dev-libs/gobject-introspection-1.49.1:=
-	dev-libs/libical:=
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.21.3
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.26.0:0/0[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8:=[introspection] )
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session is needed for gnome-session-quit
-# 3. Control shell settings
-# 4. Systemd needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-# 8. IBus is needed for nls integration
-RDEPEND="${COMMON_DEPEND}
-	app-accessibility/at-spi2-core:2[introspection]
-	>=app-accessibility/caribou-0.4.8
-	dev-libs/libgweather:2[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	>=x11-themes/adwaita-icon-theme-3.19.90
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	>=dev-util/gtk-doc-am-1.17
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/${PN}-3.22.0-defaults.patch
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.26-bluetooth-flag.patch
-)
-
-src_configure() {
-	gnome-meson_src_configure \
-		-Denable-man=true \
-		-Denable-documentation=false \
-		-Denable-systemd=$(usex !openrc-force yes no) \
-		-Denable-networkmanager=$(usex networkmanager yes no) \
-		$(meson_use nsplugin enable-browser-plugin)
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	gnome-meson_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	else
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	fi
-}
-
-pkg_postinst() {
-	gnome-meson_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}

diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild
deleted file mode 100644
index 8ec8d239..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=dev-libs/glib-2.53.0:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.47.0
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-	>=x11-wm/mutter-3.24.0:0/1[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.21.3
-	>=x11-libs/startup-notification-0.11
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.8[introspection]
-		>=net-misc/networkmanager-0.9.8:=[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( >=sys-auth/elogind-237 )
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	media-libs/libcanberra[gtk3]
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-libs/mesa
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	>=app-accessibility/caribou-0.4.8
-	app-misc/geoclue[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
-
-PATCHES=(
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/${PN}-3.22.0-defaults.patch
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.26-optional-bluetooth.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins
-	sed -e 's/mozilla/nsbrowser/' -i meson.build || die
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use nsplugin enable-browser-plugin)
-		#$(meson_use gtk-doc enable-documentation) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work
-		-Denable-man=true
-		-Denable-bluetooth=$(usex bluetooth yes no)
-		-Denable-networkmanager=$(usex networkmanager yes no)
-		-Denable-systemd=$(usex systemd yes no) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
-	pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}

diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index 301d00be..6f32c6fd 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -19,10 +19,6 @@
 		and suspend support.</flag>
 	<flag name="ibus">Enable support for enhanced input methods through
 		<pkg>app-i18n/ibus</pkg></flag>
-	<flag name="openrc-force">Skip systemd dependency (#480336),
-		enabling this flag will become your setup to be fully
-		unsupported by upstream and downstream Gnome team. Do not
-		try to enable it unless completely needed</flag>
 	<flag name="telepathy">Ensure presence of telepathy chat integration</flag>
 </use>
 </pkgmetadata>