Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

13 files changed, 10 insertions, 450 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index b3ef1a74ca90..a8aad447e9d4 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index c1f701fd5036..ef66e9770ff3 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,19 +1,16 @@
 AUX 3.24.3-CVE-2018-14424.patch 6513 BLAKE2B ac51cbf4412f53f8460037ca7a811c0f3b883afbd6fabbd248719594e8ec730aab4a9a9e8adece0c53d0dda99f900b0ad450b5d5cf7a74999abd6756983ee4e8 SHA512 7ab8875f15828d8601482953e7b7be96326ff23c0ec945ccbaa401370c622734388daeb6be1043fff8694498dbfe2d7fc74f90bf8c59170df67c78bdb731cd13
 AUX 3.24.3-display-object-lifetime-fix.patch 3235 BLAKE2B d92c20c97f4007121029c1c719c7598af8dbcd181098ec52f0b61f281796d1a9e3981f644cd2bd0ae80025f63faf169db44b91b3075c42566ca0a5dfbd7f9ae3 SHA512 57a585a93754adc2448a2a85a55c90f7f27c5da0689debc93236ac3c26c79cf295abea73bcec5fce3d7651b3998715d11e2b232a35f590e53b52a859bc666523
-AUX 3.30.3-pam-drop-legacy-arg.patch 1123 BLAKE2B ada164a258734709da57dd7b3c098a7475100edb0fd56ebb815c7dffbddb314d208646bdf6bca6e4465fdf0dc4dd995384f28b88dabf538cd9945d7490cdfae9 SHA512 f71e94e5a20183bb246b42ce090c958595c18cef264418af82fd564afc98de1d8b0a051a236ed1a6d5719027ddcf67b3a0dd1800f26dcb257403575961ed32d9
 AUX 49-keychain-r1 193 BLAKE2B e4653256b9a0a23be84286d25278d2addf464cc541d43f57a33ed0390b562d03acf7f9d8510ad1b09d4a3736d2bb2a323f5fcc473014b6f351abb5bee71a419b SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21
 AUX 50-ssh-agent-r1 255 BLAKE2B d197daa7db7da3fc667e5bd561d2edf46b484365130a2d72259c4a2f316ec3af957599cd2c755f7e517ff32ed59e068d1dbcd47da6961534668786403590ff20 SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
 AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
 AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2
-AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
 DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345
 DIST gdm-3.26.2.1.tar.xz 1119568 BLAKE2B 42ccd3d30a5b22124777792ea3e0bb003771df1d3c5a729d29ff14efe5c6365a82126e6b204301b22dd51e4aaffcef4e018b8fdda45eb52e3b76bd921aca9312 SHA512 4a0009935f2f86803a4dd6cdc01c80c9ee89fb8a71f82ffa6fadb16322e4c7f51d82e0e887c30aa09d1b242c3cc82a1ec0d83463e5d8942719a747f6945cbec9
 DIST gdm-3.30.3.tar.xz 1261224 BLAKE2B 338f946a24d2a7e4b3cf34ac6accff01f8e7ce5032ee4ce79a96b1a755693e09788c6225e45de9a91ae4afea595a0562511104a467e561ec179c3ad61810468f SHA512 17aed5bf7d27b07553703873cda28a711d6135497d36e4c241bcf1ab3552b31007cc241dab394dccf8a4f1daccf7d55ba39edf91f4b22bdea5c2aa1ea17404b8
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-3.24.3-r1.ebuild 5913 BLAKE2B b3e84ae6eb46748fa125bb494134e3c0cf8e90d6583c0a270c96e513b0f0f5af5f5cb113a86047038a6a10a0c25add778d7307a886e51d67a156b0dd50decd37 SHA512 24875f6229628dd2f7e8810c473491df1a03a8577782ffd6b538828ee7b92a16de2f54f39abc319e066ede4e5ac46c6082bd3112afc9a51fc199d2dc20df22cc
 EBUILD gdm-3.26.2.1-r1.ebuild 5938 BLAKE2B 4a666f06ee67a8b1ce137ff3a493f376d2561e037295277a9992784766971b5a567cba67ec9f21fee0853423f5b9cac87b110c96170f1b3a5654f5544e92cf44 SHA512 35913f4e965cc212774daf5f6e3de1ac3c769a59d04e1e012ee3651a2d00bbf2b78994c6e0451a1ecb3814f8edfe2c8d92e56f38d3444d3eac605756b79ebfa0
-EBUILD gdm-3.30.3-r1.ebuild 6801 BLAKE2B 1594dab56cf1c55939cceb9c8c1427442ad4132b5f0f66dde5ec0f271e762507ae0622186034bfbed5e3953da552c8ffe8b1833e22ec5dede28f779c86d0c330 SHA512 b8aa9d7cbcfa2bcecb808c7f7923a34a5adbe3ea141657473948b2a5bd7757955d1c84b7e0300282bc4d449382f6644bc67d10f3a8cb79d5e29600cbe5bdb657
 EBUILD gdm-3.30.3.ebuild 6017 BLAKE2B 9d67099f2fc1c4aac168b0588b255fb7b56351da611d58c86e8c86a9f02f6e7c2ff1d08e6995e9a99899e9081a65f0828eb6bde829a581f06fd599fc7184436a SHA512 b8454b9a4c0c14b1ceebe10ebb9852c978f700f7d3be2642c0d4a446b323a0ca585b7555e899e1627cd3cf2f6ac9a0b61366da87c47ac0340170f56080e32786
-MISC metadata.xml 561 BLAKE2B c2f402e5b3695ebfd886f93f3974b82c0e287e971f81b3ffdd9d956edac9b80fa90829900da238c47421c64b87394d5c9bdd1c4675c0cf37a0e3681c746ba3cc SHA512 203bc4a106b2ce4270dbfbc91f45d6c488b41449b317370dfe1e3c26d2a28bd457d13bfa67e6b7c65f1520fca0cd0ca36197f2063dc4fdd296f76e156dbf4895
+MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844
diff --git a/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch b/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch
deleted file mode 100644
index 8d82a284bf50..000000000000
--- a/gnome-base/gdm/files/3.30.3-pam-drop-legacy-arg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a26ed5502622c22daa175861fa9d651a32131cf5 Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Sat, 16 Feb 2019 08:47:45 +0100
-Subject: [PATCH 1/2] pam-exherbo: drop legacy pam_systemd argument
-
-kill-session-processes=1 is long gone
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-(cherry picked from commit 13e6666b1e1000d757ac5621a83105110f55e3e3)
----
- data/pam-exherbo/gdm-launch-environment.pam | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam
-index 8c13b3bc..51a8e003 100644
---- a/data/pam-exherbo/gdm-launch-environment.pam
-+++ b/data/pam-exherbo/gdm-launch-environment.pam
-@@ -8,7 +8,7 @@ auth        required    pam_permit.so
- 
- password    required    pam_deny.so
- 
---session    optional    pam_systemd.so kill-session-processes=1
-+-session    optional    pam_systemd.so
- session     optional    pam_keyinit.so force revoke
- session     required    pam_succeed_if.so audit quiet_success user = gdm
- session     required    pam_permit.so
--- 
-2.17.0
-
diff --git a/gnome-base/gdm/files/pam-elogind.patch b/gnome-base/gdm/files/pam-elogind.patch
deleted file mode 100644
index e17bed395b54..000000000000
--- a/gnome-base/gdm/files/pam-elogind.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 96e605d6bd832a89f022872492a9c9cb1eb62f66 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 19 Mar 2019 23:13:29 +0200
-Subject: [PATCH 2/2] pam-exherbo: Support elogind
-
----
- data/pam-exherbo/gdm-launch-environment.pam | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam
-index 51a8e003..c697a528 100644
---- a/data/pam-exherbo/gdm-launch-environment.pam
-+++ b/data/pam-exherbo/gdm-launch-environment.pam
-@@ -8,6 +8,7 @@ auth        required    pam_permit.so
- 
- password    required    pam_deny.so
- 
-+-session    optional    pam_elogind.so
- -session    optional    pam_systemd.so
- session     optional    pam_keyinit.so force revoke
- session     required    pam_succeed_if.so audit quiet_success user = gdm
--- 
-2.17.0
-
diff --git a/gnome-base/gdm/gdm-3.30.3-r1.ebuild b/gnome-base/gdm/gdm-3.30.3-r1.ebuild
deleted file mode 100644
index fe94fdcdbc45..000000000000
--- a/gnome-base/gdm/gdm-3.30.3-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0:1.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.35
-
-	x11-base/xorg-server
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libxcb
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-
-	sys-auth/pambase[elogind?,systemd?]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.9.4 )
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot with systemd, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
-	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
-	# rc-update add xdm
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Drop legacy argument to pam_systemd.so, included in 3.32
-	eapply "${FILESDIR}/${PV}-pam-drop-legacy-arg.patch"
-	# Support pam_elogind.so in gdm-launch-environment.pam
-	eapply "${FILESDIR}/pam-elogind.patch"
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
-	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
-	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
-	# so lets try always having it in VT1 and see if that is an issue for people before
-	# hacking up workarounds for the initial start case.
-	# ! use plymouth && myconf="${myconf} --with-initial-vt=7"
-	local myconf=(
-		--enable-gdm-xsession
-		--enable-user-display-server
-		--with-run-dir=/run/gdm
-		--localstatedir="${EPREFIX}"/var
-		--disable-static
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-default-pam-config=exherbo
-		--with-pam-mod-dir=$(getpam_mod_dir)
-		--with-udevdir=$(get_udevdir)
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec
-		--without-xevie
-		$(use_enable systemd systemd-journal)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_with audit libaudit)
-		$(use_enable ipv6)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_enable wayland wayland-support)
-		$(use_with xinerama)
-	)
-
-	if use elogind; then
-		myconf+=(
-			--with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable gdm.service
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index ac51d07ebe21..747420ed8b55 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session management</flag>
 	<flag name="fprint">Enables experimental fingerprint authentication using
 		<pkg>sys-auth/fprintd</pkg></flag>
 	<flag name="plymouth">Enable support for smooth transition from
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index c7ea1334cc05..803cedaa2bc6 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -14,6 +14,5 @@ EBUILD gnome-control-center-3.24.4.ebuild 4912 BLAKE2B d850ac29017bc316776eea8c6
 EBUILD gnome-control-center-3.26.2-r28.ebuild 5258 BLAKE2B c4b203840af046a6ccc95d74ccab2304306ac094840ec18c6e6ba56f95fa59c4091160778bc1e6d62277c3457f32131b8aee8146ac997bcb7ecd36646f01599e SHA512 a83508a628d7bccf46c77a9fd77ca9c952dd31c7417b6642d13706698c6ba74a9be261643a5b36dfde1a995c231ed399b2c467511a4a8216f0c808382999c053
 EBUILD gnome-control-center-3.26.2-r3.ebuild 5270 BLAKE2B e5dcca2bc3a6ab5d474ec1461d19072b5b1933e08319b9d7c8df8d59dffce3b1dc111b3fd834187c69fc53ee110f77173ba65c60c5f37a1429d0cf673e909801 SHA512 34eebe34fe2b6cd05164bb364c4b6eaf6f2c064792cb032e9a53202030ca029314669eb92e9aeffd3095158e2e4d605aa772c72f4dfddd14527b10cd82c3e995
 EBUILD gnome-control-center-3.28.2.ebuild 5235 BLAKE2B 4a6094a68fec23b788565f78e034ae798e1ebee31b9f03a4b3f880b84863b7507e579530403e5e575f6568e12805f2495ebdc298a199f1db65b347d2c70e1b8a SHA512 0ea26b9e5f265c16a5280d81d864717f8bfbe999c6b26e1863259c4a4d60fa8435c126b686fa9879c5448135ff7436f24dda0cdf215b9054eae6ee88cd5b2b8b
-EBUILD gnome-control-center-3.30.3-r1.ebuild 5837 BLAKE2B 9a1a6e80e77851803e860046037b29c7ca6ea9e571b500cafd4f24d036babcd6648a816568baa6c8844917af17614831fb83120d1704c04e3b510b092f26b285 SHA512 b2f93f7e95ababbd00b28dc83e941add95db0316f1a565f5e66228c1beac43a58f88a1e01bc3f65d0277ffd3b2b8d3c8c0d1d9cb296326bf5c3bde3d23fbf72b
 EBUILD gnome-control-center-3.30.3.ebuild 5449 BLAKE2B deba6ca1be7aa03a8ac2f84848512001acf095a31dac0083fcf18c6a3755ffb43cea96e5ab4005c080b7400f0c46fb891b54332b796424f98c1ed4d755d1a8f8 SHA512 fb1ad500a5e25b0dba48e42bf746209fdf051805a99e953a802d4dd949d3e198b4a33d29ac6cc5675915ed48716eeeb7a6b41ed0a4a3f0de2f4e41f45520a5ee
 MISC metadata.xml 675 BLAKE2B e22d57c5a893d8c2a20851671a82741ea1918a6792444898a808a2b50668fd0fc6d712025b167fff6371644e7eaa182ef4bfd0a85718f7fee57fb0d586ff62cf SHA512 debac95237dacc2b937bb9d4a75f569f10c7798434a2b22cff342d51b7c50a6a78af1aeddf0ee3274cac332b55d25b2d3da8482b49d8d355e6428aca11e1b908
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
deleted file mode 100644
index 52614b63f917..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.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
-
-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 elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd v4l wayland"
-REQUIRED_USE="
-	flickr? ( gnome-online-accounts )
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-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
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# 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}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( app-admin/openrc-settingsd
-		sys-auth/elogind )
-	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
-}
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index cbdd77513ad0..ad5e0a247f7a 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,5 +1,5 @@
-EBUILD gnome-extra-apps-3.24.2.ebuild 2327 BLAKE2B 904ee371be166b8aa3585664a511dffa2fc446676932515af20e7a502f395bbfdc4284739a1d2896fdc23b01988411911965ae60cdb6c96ff6cb97b2d3e3f1b6 SHA512 3568ca1528ed3f5300244451f1bab719d60cf5137ccabad3437c5551ca40f0ae3760ec800ec08fe5407e4257421299a9ead13ce47583556d41191859d68a25f8
-EBUILD gnome-extra-apps-3.26.2.ebuild 2537 BLAKE2B a079e19ecc458ce1807031c027aa3574e5655e9146a4f5fc03b85f351c18ca236feb7f9ed7ed1b12d78eaae3913fabbb7264d6542a9b62fc87397e0acf4169ba SHA512 be76ec1d5d5aab3e2940b0640c11f07556541925bb640c27caee77043613d56f231256459a8ade52c7db5df51594251887a509ad5ac75485c9f638d24df36d5b
-EBUILD gnome-extra-apps-3.28.2.ebuild 2447 BLAKE2B da5727bfa0e460a535e6b0ff8ee839ae76f6fb18c13a20fa6e0420e8797dba27ba410348bb33f9f460f82c29dd467b274d12c10024df6c99bc26accaf0d7e2c4 SHA512 6e48c5bf41895b3aef7cc6e477cbe3faa75fe0945a68f864fd49cae8410f6382c112e19b6b9b9a0b48f7653d84ae0455703454ab60ca4da733ef2d9d8a73f1bd
-EBUILD gnome-extra-apps-3.30.2.ebuild 2468 BLAKE2B af2e7dd53330e25924debb236f53624f3804554aa4e7bc2437ef547df4a1278992e96d1ae82f82131cb005ed4e3a6e65e20ead2216d29bee70d87ad3d23d0e45 SHA512 5483a4b0b1c19e7cf80f99868eaddb75aacce0b7b97c01d2c01a555448bb38a719e7e8a38db30ce56035f20acb1513e685d03105ecd68dd45ae604ef21a48ee9
+EBUILD gnome-extra-apps-3.24.2.ebuild 2331 BLAKE2B 1de7437ed424274cf4f005319da33d5d0556560889bacd2e191fa3c3c4e78081b71f895c653a9ea2463684ae0a9392033a867b9c74dde3a9b506b3226897245d SHA512 cb58fc592771921bc669899f8d42e70d995488ef79a5d2876a009b4dc5d8b06d1a529d75647e605ec6621a4ef2a5364aedb1eb2c8be7760d0b090445958eb8be
+EBUILD gnome-extra-apps-3.26.2.ebuild 2538 BLAKE2B 8be0227a8ff521dea1934538f784430ee9f7c32e1ab719c4eb1d865a853865af53d153ac28d69622b6e31f4b0a07036052abad3be6a3f8bacaaadc69fa8f0862 SHA512 3296693e3d3088f70b82f73195e8b804e72c7d8b829bec8c467cfcc4aea091d0ce1907168bb648d9d4f65291ab893899165635c3726ecc637145ca88c3b4ea4a
+EBUILD gnome-extra-apps-3.28.2.ebuild 2448 BLAKE2B 1871a0373a37565583cc4729a7478ae9e41cf2bec063ce1fe1544ffb82cb6db5efb27fb93d0450ef6a07432554b40ae2c305c3da2577d6ab87e1211589df51c9 SHA512 1a85f134623eab6e7044fe226f3546eef0b821055d5507c8871625b489c844ea25e5fd0241e44df77a9638b0085b3510a41d4a49fd9f7ccac0a9d5730650091b
+EBUILD gnome-extra-apps-3.30.2.ebuild 2469 BLAKE2B d6edcad7fb86d65ddbcc5f761d10e6f5b2c09fc49dfddad58b287b5faa1ce8172d347cf0196da51fa81d7bdbd355c710fcc5c70fa666ac0aad660452f4d8ceee SHA512 2593b092cfda666ae4e3b1d4f8a917e2585a9c423e30016acf102b9d3f46d6b73aa85a80b0fdaa590dc1476fd6b3d03250179a0fef219eb3fad10da07468ec6b
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
index e516ccbc8be6..30f1f7ac3157 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="Sub-meta package for the applications of GNOME 3"
 HOMEPAGE="https://www.gnome.org/"
 LICENSE="metapackage"
 SLOT="3.0"
-IUSE="+games share +shotwell +tracker"
+IUSE="+games +share +shotwell +tracker"
 
 KEYWORDS="amd64 x86"
 
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
index 5cc0533b8530..ed49b6726619 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Sub-meta package for the applications of GNOME 3"
 HOMEPAGE="https://www.gnome.org/"
 LICENSE="metapackage"
 SLOT="3.0"
-IUSE="+games share +shotwell +tracker"
+IUSE="+games +share +shotwell +tracker"
 
 KEYWORDS="~amd64 ~x86"
 
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild
index 77c441a3ddeb..02e761ad4f84 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.28.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Sub-meta package for the applications of GNOME 3"
 HOMEPAGE="https://www.gnome.org/"
 LICENSE="metapackage"
 SLOT="3.0"
-IUSE="+games share +shotwell +tracker"
+IUSE="+games +share +shotwell +tracker"
 
 KEYWORDS="~amd64 ~x86"
 
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild
index 16f33ac0c8e8..a0a0a670b4dd 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.30.2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Sub-meta package for the applications of GNOME 3"
 HOMEPAGE="https://www.gnome.org/"
 LICENSE="metapackage"
 SLOT="3.0"
-IUSE="+games share +shotwell +tracker"
+IUSE="+games +share +shotwell +tracker"
 
 KEYWORDS="~amd64 ~x86"