gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /gnome-extra
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
53 files changed, 218 insertions, 1412 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index a1efe87d70e0..46890ab085b8 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 3ff35b40d084..8097ebb205cd 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,7 +1,5 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.36.4.tar.xz 4636308 BLAKE2B d701e2220de9aa68a1c5e112de16675c53a33e31441fbfd88d6ac7afa08d60faa3c06d74ee4161f3329b1ba93950f97f32d3cf5714a0de68560053b506425707 SHA512 dea044e12aac92f1cfde18c10f793b75e68e40e27fb9b299c6bdb91e6f19df4224bda7ed32d54a8b8dd517580b69929cff6be0b340e377dbc3bda5c4860f5a3b
 DIST evolution-data-server-3.36.5.tar.xz 4636800 BLAKE2B 5708ec1f064b723cb5421dad50145d2377c2c683ef37fe82d24b6f27a895b89e43c55ae6c900797d477b1af052e0cc6381649c790744d8591010d928822917f1 SHA512 65ec23a665e3a547b10ad6a6be5f0533db269406c3e8db64a63cffb8e1b410e83b9c39bd7cd5dac5ecd5cf61ef96dc529ba1bd00ad0a09b3bf2c4e98f3d156e3
-EBUILD evolution-data-server-3.36.4.ebuild 4200 BLAKE2B 3bce351bf145ed7a50c0f365ffaa06ad4bd807478a7c15478a50e5a53976424a9cd4d676fef2abc53cadcbd823b7171d92ed77ef2fab9f64c45d31b20406318c SHA512 f8dbefdd85d854e85e683cae10de5ff1355ed05cdacb1111db773465a344c0746b8ea61dd1eda2331d7e11af2eb2587010eda8582556862edb2783e6a6b14531
 EBUILD evolution-data-server-3.36.5.ebuild 4255 BLAKE2B 6fd03b8970ba47efeb5d309b921ec5408040182c2ae21132c302717d96b8da3c8f66561851e2d5578bd55fa9bdc6181e4b9cb065add8054ec54433616d7130da SHA512 fae5318c170006755829ca6009a12060c4020f61244bca05d4a0701800c70f5dc915d1419dc898e21f1dbefa08ba76a4c4e12dd8f583ba152976cf7d0d43cd0e
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.36.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.4.ebuild
deleted file mode 100644
index fd92bc61af76..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.36.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake-utils db-use flag-o-matic gnome2 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.42:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.10:3
-		>=media-libs/libcanberra-0.25[gtk3]
-	)
-	oauth? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.11.91:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend)
-		net-libs/libsoup:2.4[vala]
-		dev-libs/libical[vala]
-	)
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_src_prepare
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=${google_enable}
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 7af37b5ed073..b38209b3304a 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,3 @@
-DIST evolution-ews-3.36.4.tar.xz 558764 BLAKE2B 04823d04577b9d5597edf4b534d13f3bd82ac345bcfc5600a28f104917bb3f26513ae2fd7fad7b650728336fdbfac7cd94f4dd4b7cc77789570bf54def38feb0 SHA512 3b0ff6fec5dc857e49386adec9cf4ed962fc1bc95c23cca3852bbb4a63a4a3ae737511964adbccbbc52c409749dbdc71969231d4003ed284f12d655046f4ecdd
 DIST evolution-ews-3.36.5.tar.xz 558900 BLAKE2B 059a72b087287d0e553e085dc764a928d838bc8bd011c16b00f240b29d12bc7cfda98d33f8dc102866f5747313975e32506dc016435342bdb6c35f7d73749b52 SHA512 9cc40ae5d56bc86a8aa4e7aaa36fa10b0841278dd1edb075155bfe3666da4051e4fc4843398f74d00d77f550aaeb93bf576007828da4c574a17d4f17c41bfb7f
-EBUILD evolution-ews-3.36.4.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
 EBUILD evolution-ews-3.36.5.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.36.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.36.4.ebuild
deleted file mode 100644
index 3d5c7d9b8f15..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.36.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.58:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake-utils_src_prepare call, if that works
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index df189addff2d..3e9a9cdd2b93 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-boxes-3.34.4.tar.xz 1191668 BLAKE2B 98a206abdd8a181979b6d40f176b0a1518b51ebd312929c8eab549e6de83b1d299f4c3177d6b2b07873c2e620a744b627adce6bc1c0ef5ae2aac55189377de4f SHA512 025bfe6fe583cedd80b376b96e87a8ecbbb8f4d723490cf18cc2ca73cb959d9e2bae1b784cc1018866c594962d1e508e5a3b9c9562763eb76e7291c5f6189463
-DIST gnome-boxes-3.36.5.tar.xz 1263156 BLAKE2B ebce9f5cfa6740e8d7691bc4ea726999a9c67507472328a4efc3451f8d4fc1a992282fcdf18bb461ef57a05ac153e9b61a96c250002fd4785212124ec7b589b5 SHA512 ed5b844bbfbf420f58fa1ebc465ab971ef7733d6e08c2e2fb31980f76c7a60f8b6aaf91eb4ed392c5aa0de1a66d7d86ef212bc69806229795aade3f75d1f6549
 DIST gnome-boxes-3.36.6.tar.xz 1275972 BLAKE2B a4b6bc98a8ed644020dce7ce5f5f08ae75291e2ac3351d1b3354d495a0579a59a245d63ba22754679b9641088bb71f96cd3abc7944f9996526ad7e6db9552458 SHA512 a37f34ea54d60d2d927dfe07a6ace6bd74910054b63a58bc2782f6dcd087d4a2153db0662d715a1bc67e2687742a162b3f66ff97b7678eb280f46b53765c7f73
-EBUILD gnome-boxes-3.34.4.ebuild 3845 BLAKE2B 015af32def3ba463bb8e3ea71df4fe49d006c214c520cfbbde098e9aa9c8c48851d64b4c3edfa4870580d1793eb39bc0e09abedec4d2a1bf472ec77819079b3d SHA512 2f256357212a84ca77e45127c3032b3e3de1032e9c0d00a24781fbfd54c37328d63b23f73c5be81a7d3c1fff721849cf5eb2e04d76bc41863f864f831b7df1ad
-EBUILD gnome-boxes-3.36.5.ebuild 3846 BLAKE2B 02b095991fdab02dbbc561bdf29cba7a49e491f9abaee1dc594a74cac4aaa30ae348e2ddeb431d223f50aea4f42e31ce18c8579548f5bf7498256dd3026b4dd7 SHA512 c092b3b90179b6ae85796768f25ec8d55fc8af8267d0030579f618b62ee9329d289dbe33f749c90924e669ce7acb405aef34a1b85499cc4301ca92b1e64647c9
 EBUILD gnome-boxes-3.36.6.ebuild 3853 BLAKE2B 0dc09c0bfa2f18d7bf4505d29895d33aa8fccf6cdf8437d00dfc59f671e9c4f40d8607f0ed7fe3dc5fc18595f77672b67781b0278cd463b5186548f2adddec60 SHA512 4dd12bd869e7acd101a65bae9226debf43fadc1cd090b9175caedb6df3e6dcb9a7a373103de62dd84cc1b62cb36d222441b43d660f13f33899790f808363b91a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild
deleted file mode 100644
index 040ecd6bf7b9..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-IUSE="rdp"
-KEYWORDS="amd64"
-
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-# gtk-vnc raised due to missing vala bindings in earlier ebuilds
-DEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22.20:3
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	>=sys-libs/libosinfo-1.4.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-2.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:0/2.0
-	>=x11-libs/vte-0.40.2:2.91
-	net-libs/webkit-gtk:4
-
-	>=dev-libs/gobject-introspection-1.56:=
-	>=dev-libs/libgudev-165:=
-	rdp? ( net-misc/freerdp:= )
-" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${DEPEND}
-	>=app-misc/tracker-miners-2[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	virtual/cdrtools
-	sys-auth/polkit
-"
-# gtk-frdp generates gir and needs gtk+ introspection for it
-# This is only needed for creating the .vapi file, but gnome-boxes needs it
-BDEPEND="
-	$(vala_depend)
-	net-libs/gtk-vnc[vala]
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:2.4[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	x11-libs/vte:2.91[vala]
-	dev-libs/appstream-glib
-	rdp? ( x11-libs/gtk+:3[introspection] )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		$(meson_use rdp)
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.36.5.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.36.5.ebuild
deleted file mode 100644
index 67d2fa2a5014..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.36.5.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-IUSE="rdp"
-KEYWORDS="~amd64"
-
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-# gtk-vnc raised due to missing vala bindings in earlier ebuilds
-DEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22.20:3
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	>=sys-libs/libosinfo-1.7.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-3.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:0/2.0
-	>=x11-libs/vte-0.40.2:2.91
-	net-libs/webkit-gtk:4
-
-	>=dev-libs/gobject-introspection-1.56:=
-	>=dev-libs/libgudev-165:=
-	rdp? ( net-misc/freerdp:= )
-" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${DEPEND}
-	>=app-misc/tracker-miners-2[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	virtual/cdrtools
-	sys-auth/polkit
-"
-# gtk-frdp generates gir and needs gtk+ introspection for it
-# This is only needed for creating the .vapi file, but gnome-boxes needs it
-BDEPEND="
-	$(vala_depend)
-	net-libs/gtk-vnc[vala]
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:2.4[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	x11-libs/vte:2.91[vala]
-	dev-libs/appstream-glib
-	rdp? ( x11-libs/gtk+:3[introspection] )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		$(meson_use rdp)
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 0582e08530d7..68c2b2503c0e 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calculator-3.34.1.tar.xz 965520 BLAKE2B 7dd7af4d2065aee9a8962983ebf723aa06e4b2e3ef98213a89044d70e47057a747a88fdd58185abb272589433f84a6fcd3a3c5fd7dc0281d13f34ccaba690b50 SHA512 43900cebc6b479292a45619f1e4f6afc5264e2dceda5d0049b59f27ebe2a32b5f4b2465a22f33b33b882ab0e737f7048fbe9395b18f9b5d2023da2941b6783f6
 DIST gnome-calculator-3.36.0.tar.xz 983532 BLAKE2B 5e28a82cb93cb944e69d4d7c7cf1a14cd91375ef864cbd5624d87a66ee79f0aff17f871ba734d35ae372b761ce67c809acb6fdfe66597980f33e06fe86d6157d SHA512 5e8d3b17703260928e9d0594a6e0b06b6a25d71590b4ab6c371e0c21be5e53698011407886f09f6bd67660ecbfa182d725d5e3a1c51fe4ea9125b175bd4d279c
-EBUILD gnome-calculator-3.34.1.ebuild 1443 BLAKE2B 58d185671862d68932e3f20a71699e239deab3b19cb666a57ed30c097f425ca78ed74f17676ab10c1b296054637a69b82ded0f823506aa974bb33200c3df8025 SHA512 2ddcad67d36bc63f69ba82e5311e3254fe2e0fd113c8c396996289cf51efce80add1d782f1e3832ee788593b5782e74932b53c69545020f59812a86110dd5355
 EBUILD gnome-calculator-3.36.0.ebuild 1595 BLAKE2B 1f001f68ca0a0035c09d66ce59bc846b2750282cfae7e70f43aebdd865fe757a0358a6eeddc2c671d9b835ad5aafe94b9caa1eab99ef0004a92a21ffa18b457e SHA512 00608448db8af20a0d33678f05446e5a579fee1f924700f847d5653fcc767bc4d1d921f5da69b4e6d6e63f7a0741e989231eaaf968a0bd8fb6969cdb9e76c76a
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
deleted file mode 100644
index eaedf70c3328..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.44"
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
-# altogether, thus we need them installed by gtksourceview[vala]
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libgee-0.20.0:0.8
-	dev-libs/mpc:=
-	dev-libs/mpfr:0=
-	>=x11-libs/gtk+-3.19.3:3
-	>=x11-libs/gtksourceview-4.0.2:4
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	net-libs/libsoup:2.4[vala]
-	x11-libs/gtksourceview:4[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddisable-ui=false
-		#-Dvala-version # doesn't do anything in 3.34
-		$(meson_use !introspection disable-introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index d66e027e40f8..2dd6368b1208 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calendar-3.34.2.tar.xz 588996 BLAKE2B 114ea7a7ee2a8d7cbaa1d47bcb782d16891ef1bdd87838b62ac51f6c20d2f5711cbddc12a35278c7710ee660b18538211c9eafb64a1efa3df57f721aa7b1937a SHA512 6c69a1ee46a5ccfb4d6d1b7a60932412b486ad4576a4c78c89e03270147e30828ecaca6b5f0e27a741eb9d5ed74ca474ba0ddfb6d044748877b6c9ab7ae023a5
 DIST gnome-calendar-3.36.2.tar.xz 605904 BLAKE2B 42b0337a01a5316a60d41eede91c453e3c0fa2b056e9053f8868f344a662fdf4b3de4ade1f1a59b729f2bc3e087cf6b971094cd282d75432a83acc89a21054a7 SHA512 83d0157a3958ff7f16af2f6a06c2c5fdd7ce19bb532c1cda0982ab37d78149f4c0ae252de937103baa56d105a1cf54c2e29174f6f3f969904071e187cf564c33
-EBUILD gnome-calendar-3.34.2.ebuild 1129 BLAKE2B 2a12595c66caa9fe91d1ba09d61a4c30c3ed72e111152925c93aabf2b146d97e4bff0d1b3e0bafa60896f9952223b1fa2c453558a40b3461883164965ba9638a SHA512 da592cc9507de330e516c6c2f22804c07695d174a70453a1dcd3c10663893a83f819c9dfaff2febc0f07fb4a448d8a66c5df9d4eaea8067d8f9d3ab9b19ee14c
 EBUILD gnome-calendar-3.36.2.ebuild 1161 BLAKE2B 552a219456498bfc668ee77679e8d612f02424a93e3ed6203b847345b387ab2993deb220bfd6f67dc5b27ba22aa8dcd849f7cf7729b4f69425f50ec1dc85ba66 SHA512 4370221f5610fad479ead77121c790102cf215ddaf7f4c3a691fe1fb2a2e93820231cd4b61e6a68b5b7f04b5bef8c077dc8afdc81f1319d4b27e1705828c6066
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild
deleted file mode 100644
index 6578d925bed8..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/libsoup:2.4
-	>=dev-libs/libdazzle-3.33.1
-	>=dev-libs/glib-2.58.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-3.27.2:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 306627f68256..064a1d4011af 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-3.34.0.tar.xz 506772 BLAKE2B 04844fa95ac58915694f3bac3fafb78f2117be259fda0b799403563bf5e52a0921d5b7d7fbaa85fd9dd8438b9dcbc2f7aef97f61bd812d62bfd188b81cbe0c35 SHA512 9e59534c5c8257ecab97876fc2742d37fd5dd1aad770ac31dd1c7dbafa9843f992c7cc39e3f5025f5091baf852538eb9d62bb07dd0a5c3c7a6cd69befa61ab52
 DIST gnome-clocks-3.36.2.tar.xz 364544 BLAKE2B bee9d987726cab95d6d447b33b8baf4e684950354e5ee3febe01522ee30574db495aeb4fa1cb9aa070756d611dd6da7bb84d2d164dc9172233d04c37b22daf86 SHA512 7b55a72e10c857e3dd0e6726b46647cb544bcee76f151af9b17a65e83b8a2e06564ed6875a0ac52dcdae6ac0f700b7b39aaf25194af52a5cb5449b2653316af6
-EBUILD gnome-clocks-3.34.0.ebuild 942 BLAKE2B 4aec57393393da6de41e80abb2f7282f789d71990b4554341dbab14dcd544c1ca063c61fe81cdbed95e35138b12a393dd9acda64ad3448337b1da8e2ce79b50d SHA512 99a5a60322ed7feea4492e90ddd4840522816bdd4bc649d26a00ebc724f207dfa445fda76d9989a8c4cb687bd0ea33b8067181d79734ea8a37628934d89031f6
 EBUILD gnome-clocks-3.36.2.ebuild 1058 BLAKE2B b80af52d9fe65dbe3868aedd6a0239559fe70cdf39b95488c6475759122af617701fff945a348f9dd321a95e6971048014971193eab7080b19abf71d90faed43 SHA512 c6c8215ded9bd27e54fc9e6c6d820add3eb359e570c5e219c4b9c3bf7aa653ec37a4381211b2be8a129995ef99b5e5dac608ca52886626bed062fe11d22f58e3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild
deleted file mode 100644
index b2a6ca1bcece..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgweather-3.27.2:2=
-	>=gnome-base/gnome-desktop-3.8:3=
-	>=media-libs/gsound-0.98
-	>=sci-geosciences/geocode-glib-1
-	>=app-misc/geoclue-2.4:2.0
-	>=x11-libs/gtk+-3.20:3
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	dev-libs/libgweather:2[vala]
-	media-libs/gsound[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	meson_src_configure -Dprofile=default
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 28dff55277f9..59e1978ba991 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,7 +1,4 @@
-AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90
 AUX 3.36.0-remove-libcanberra-include.patch 556 BLAKE2B 83f94fc9192c516b99ebb6c9e34e7b3e909312057912382f060a0879b4c4eca2ab975614bc449a574258ed75f02a440848b5d201428e2544e103b738d550df67 SHA512 5c23e608a9f5edfac31569f7d174f44b689e6c7c5db6319e2749bd537e5579ab92f088aaefa04aeab7e206c3d819bf279ab5a3d757d2292f7e47b1826101fc76
-DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38
 DIST gnome-color-manager-3.36.0.tar.xz 2175016 BLAKE2B 263bc58c2a4ebafabebeba958279e4ad607eeca986dda9093c3e9d1a0870f44eefec7248aab11e6b408b063c5d5a28a3cdb88c96a58e3a0a5064055c44989143 SHA512 217c00696d7d0e99ee4cc65ee343c09682387d909feabdd6e4a52f9fd0586dda553b4796fbcb11392b880aa5c5bbaebde27906afb4e3ffd692ee3187023bfaac
-EBUILD gnome-color-manager-3.32.0.ebuild 1844 BLAKE2B 50be2919d7e59c1a8c8425e4fa25d13ef7261b63c71ec2822a5aa948f9d9d4350e88b8438c877a225afc067d8e1408db2b230d665f38909b95e8501b97d57649 SHA512 b77ceb55414a7172c80ba68e49cdb508c6c57765a8675dbbedc7aa3798884110e689bbe856841d7d8d81ce39030501ad84a47ae52181d7929fe4553f5851bb30
 EBUILD gnome-color-manager-3.36.0.ebuild 1084 BLAKE2B 4413e0a0f4150d1a4706010d41a027be5e0e3dc9188e7ecbd3ae3d9dd8daebde09f0c093f6bd91888656a933376da4926787c760e43aa5f302f03926a1b0b4e8 SHA512 401292151e97a6f7733301187faa77bdaf36e8c10a59513179e5c99346146ba816307662dc30df698bc66dbe354c8615c3257c1fbcd0a377a762c69ab77f811c
-MISC metadata.xml 525 BLAKE2B cc643bcc16f4fd5e8a76dd22ec36d3c4a3226d9062594cb313b445218cf9276e7d1b79b9a7a54afd3a2c9454ca1aa6a0e886bd2e2145ffcb7d656db1d538b652 SHA512 81f5a273a4686935f1b0d267fd056d2ba5a8f13750845ef3feda74586ffea0ce1bf98ac0c8a94b61c6bc893fbb9dc5bcb4864a020817bc27d4e61c9008069d2a
+MISC metadata.xml 405 BLAKE2B 1d1b549076134d25c224e0d819ca84352611646a1eb2dc8f3dde57696d8b64410f79093ca165543332b56eb1d321b51396f281be8a0ef21d7c9f310bfd154d0f SHA512 89abcda85bcd2724ff1af758185399a68d75a762bc90eb4da7a453d37e89905f3db3a66084b7bc0b96212df7d6d8f07fb2015c1e8fb7b3a1b5504ece886d569c
diff --git a/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch b/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch
deleted file mode 100644
index a9d3ad465a6f..000000000000
--- a/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 534eed4f8664c9f263d666ed78144c37dc05bf90 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 27 May 2018 19:27:51 +0200
-Subject: [PATCH] Fix unwanted exiv check in packagekit option handling
-
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 9e179fb..08a0f79 100644
---- a/meson.build
-+++ b/meson.build
-@@ -108,7 +108,6 @@ if get_option('exiv')
- endif
- 
- if get_option('packagekit')
--  libexiv = dependency('exiv2')
-   conf.set('HAVE_PACKAGEKIT', '1')
- endif
- 
--- 
-2.19.1
-
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
deleted file mode 100644
index def430c26486..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson virtualx xdg
-
-DESCRIPTION="GNOME color profile tools"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw test"
-RESTRICT="!test? ( test )"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-# vte could be made optional
-RDEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-1.3.1:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2:0= )
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=796428
-	"${FILESDIR}"/3.28-remove-unwvanted-check.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Fix hard-coded package name
-	# https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/3
-	sed 's:argyllcms:media-gfx/argyllcms:' -i src/gcm-utils.h || die
-}
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	local emesonargs=(
-		$(meson_use raw exiv)
-		$(meson_use packagekit)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
index 6f7911fa6dc3..4d2c71f23488 100644
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="packagekit">Enable support for the distro-neutral package
-			manager GUI PackageKit</flag>
-	</use>
 	<longdescription lang="en">GNOME Color Manager is a set of graphical utilities for color management
 to be used in the GNOME desktop.</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 9de10df05ada..87df4fdf17b1 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-contacts-3.34.1.tar.xz 365384 BLAKE2B 3563ce0784c19b2cf61e3cad60afaeaa310c53c68f11da459a3053df6be769fe0bdfea84f106e11fd2921c3f6bf8ef6a03b8cd90a680dc5b46d9a0486fd0c737 SHA512 6dad3fd9d199ad87c642e9f36102a142958cd3f577eba36fa3ed2800af5acb44752fa1f8b7eb8991974c514245af51015e6b5e08636274b9048813c37abcc478
 DIST gnome-contacts-3.36.2.tar.xz 635932 BLAKE2B 9bcdf093d99477d1162c9ea78007e65cf20a1e4038fe284fafa4c174ab1d1d0c2ceb7ec2806c9abeed1c8ab168549c80b2763e65ece22c76a9044781eef8ed5d SHA512 ebbce67aa5c0af55559230c558c5f28b065182d434582431595bffedc25dd0ec3caa44e60f4670b4b2a1f784e90c8dd4f56df937054697b4ea932a39da78f1c1
-EBUILD gnome-contacts-3.34.1.ebuild 1606 BLAKE2B 5471e3e83083b4883f084a84b2c73644adc6798e20d6d20dbc60f5f3d902f87119a6a74acebddccc9f39494bc5bf4474f1e5222c7f882a81c6ed26f7c88606bf SHA512 83e50d5070d7f79ee692963cba4f0600a5c3db216f4e910047f4da79b47c84376d01534dd465412d33c1abf1957c48ba658a99ac4fabe8510462ad0abc7933f2
 EBUILD gnome-contacts-3.36.2.ebuild 1607 BLAKE2B b9cb09c718233406ed755a13fb20e529ab1cc92f44e075b20d6b478d61d62797cdf9d11c13dcc126e2779eea18ed3722f02d70a99267cea6fc0d0418b81d3360 SHA512 18c7531db93c6f2ce45ae3273004c0f056e98c3ba2c9b55477c670b4f291dad19978f9bdf942701d66dcb2ac52f6657a7c92945f5c174ac627d268a56cc56ac9
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
deleted file mode 100644
index daf0636576af..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="telepathy v4l"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.54
-	dev-libs/folks[vala(+)]
-	net-libs/gnome-online-accounts[vala]
-	gnome-extra/evolution-data-server[gtk,vala]
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	gui-libs/libhandy:0.0[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
-	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-base/gnome-desktop-3.0:3=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.23.1:3
-	v4l? ( >=media-video/cheese-3.5.91:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.22 )
-	>=gui-libs/libhandy-0.0.9:0.0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use v4l cheese)
-		$(meson_use telepathy)
-		-Dmanpage=true
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 4411c5d72748..c4002f49cb07 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-getting-started-docs-3.34.2.tar.xz 82634148 BLAKE2B 0e21096e57b8e622b48cc174f15a16c3bd4a99cd6fe54920cca743aefcab2643ad3b4b686fb16de0f0b3b412c58119c9bfa0c12982211d7efdd5cb8fa27cf2f5 SHA512 8ff540e095f5afc07b93b52412e92a6854e83435415ed2c9d6f61a5fdba5a70debfacafaa3c7fde3ccc274b880bf01d98d67dc1023b7c7dafefd7eff5c329419
 DIST gnome-getting-started-docs-3.36.2.tar.xz 81799372 BLAKE2B c4928e00c4acbea73d9195363976f07152b3562287157f82fd88f03ac04cfc579bfd64f3f6564d41b8f1bf0a2c6748b3ba26e7e9fe057c0df6a977db7339fd7d SHA512 d555d491335a5bf7807ffd9f25d658a6507d86b3db26016623cf8b105f73c1258ad9b83dbadd6d91c782457993d51e69fcf114833c573f14e705ef0581484441
-EBUILD gnome-getting-started-docs-3.34.2.ebuild 418 BLAKE2B ec3e85f27f7e6ebb7833f2e9ac90911d98e807a4b8b1b8dd7655cd3071179f91a7f7bce9f40c9f68a1df246e8f70444aaa777ae0735c29173adbccf67c358983 SHA512 e86cce3515aef24960dfe44e05ae429e49ec2f892a44098ff8ab3aed1a13410369486f5f90672e18cb08d7566c5d92580e413f2d06e35d35be80a42ac6ac908a
 EBUILD gnome-getting-started-docs-3.36.2.ebuild 418 BLAKE2B ec3e85f27f7e6ebb7833f2e9ac90911d98e807a4b8b1b8dd7655cd3071179f91a7f7bce9f40c9f68a1df246e8f70444aaa777ae0735c29173adbccf67c358983 SHA512 e86cce3515aef24960dfe44e05ae429e49ec2f892a44098ff8ab3aed1a13410369486f5f90672e18cb08d7566c5d92580e413f2d06e35d35be80a42ac6ac908a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
deleted file mode 100644
index f9651ce7e447..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Help a new user get started in GNOME"
-HOMEPAGE="https://help.gnome.org/"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="gnome-extra/gnome-user-docs"
-DEPEND="dev-util/itstool"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 247df2ee2f94..7fb794ec3fe3 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-logs-3.34.0.tar.xz 755704 BLAKE2B 2f9c494f062adce6f325baf5eb29bd6b9ad8144bf1e5ca5ee5672922ed6086f3ddf5be9dcd0d33c74b9c8ffacd1f2de060b2d62f3ae4b9d2206c1f74d7e88260 SHA512 4c93f85539c0cf51de9fb27212800466ee36bc1e105906456db3854b663bee68024eb10b288327893ba27bf1f5c10feeaf0101baba6a34cf18171a3ba5c8c48a
 DIST gnome-logs-3.36.0.tar.xz 744104 BLAKE2B 585c39577ff1eba6b3af638d0cd5d452cbb20ce0444386fcd8fbbbc0192e59a7cc9139263ecbfb7ada85f71f044a998c51172cae1a7ba481c14c0a1650817cb5 SHA512 3a4a1f6af63f97a8814fcdbcf6e23e6a89dd150f2a5c5ebce21d8b9b74f6a8985ae5b3789aa37857b1631b33108d5048d7cfe32ebb7c7413d8ce27f25c8a58b8
-EBUILD gnome-logs-3.34.0.ebuild 775 BLAKE2B 3448ed177f9cc53d932d69bdcb29c70c5861e45144b3427de7fdf972a63f6aa9bdef2ae5f9ca7e881b037fb4e4c93493600841cefb7b64da6631d38a4f2106f5 SHA512 cd05e10779a19c4474f133146a87bd436c5a64184222f83a98c4b5eeb20dbca46924dce21ba02852d1d9c7f7a30dde4220ae24e5cfd83a7c054972a99e210604
 EBUILD gnome-logs-3.36.0.ebuild 775 BLAKE2B 3448ed177f9cc53d932d69bdcb29c70c5861e45144b3427de7fdf972a63f6aa9bdef2ae5f9ca7e881b037fb4e4c93493600841cefb7b64da6631d38a4f2106f5 SHA512 cd05e10779a19c4474f133146a87bd436c5a64184222f83a98c4b5eeb20dbca46924dce21ba02852d1d9c7f7a30dde4220ae24e5cfd83a7c054972a99e210604
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild
deleted file mode 100644
index e4ad50940fca..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Log viewer for the systemd journal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/glib-2.43.90:2
-	>=x11-libs/gtk+-3.22:3
-	sys-apps/systemd:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure -Dman=true
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index a1a2a8d47a82..975b12ce2c2e 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -2,7 +2,9 @@ AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e12456114
 AUX gnome-shell-extension-dash-to-panel-26-opacity.patch 578 BLAKE2B 64feaf9d1acba25d991d52e10c78741dbe9f948639c951e9b11dfbc1ebb7e83c854ffcb4ac2b3661b5482868bf9de8d91b661775f3eb1f6a762ff36e9b737a0b SHA512 0c09afaabcbbe6c10c930dfc9acb72fabf2c458486bc9f62661aab41bbb2b3fd2fbb430e31c36915dd2233c28486597aba5ccd9fb25c9e7945c10cd856b6e26d
 DIST gnome-shell-extension-dash-to-panel-37.tar.gz 21116028 BLAKE2B 3e35f1f4b809f17e3971b708cdbed9f35a04cccbe651d804f101b70d1067310def60a7c8f6b2ebcf09087ed76a0214ce31e5560c8b8b4ef211bfa1f5befdbf79 SHA512 3f76ffc9e05ece7a96807815b229b6fb3fc391ec1b7ab35fb5db9fd61899f3c626a979f3d286f7f5ffb39890f9c99242c702d84d7690d0c9ee20b35a17e3303b
 DIST gnome-shell-extension-dash-to-panel-39.tar.gz 21123453 BLAKE2B 6cc5bc56368d1e65d601894251642fad1a28508b475a8abcd9566c0a5bd9e48677a98401fa1b263b4df6a0650442d253ab297bdfce5409feec96933fa1d3a67b SHA512 37ff633b3ab04024d65c25e42885e6e9f8b11f5d2e7516fefe7b8ae791b7beac62d7c7a2d5f88fbb8e69e28688f90e4b41cd4d330f381aa7b351e5603a14c007
+DIST gnome-shell-extension-dash-to-panel-40.tar.gz 21130921 BLAKE2B 3f5b60aaf4bece5d14adab616580e127ec62abfe3a68e3fdebe25a16c1a7e498932e350489863cc002cdb78ffacdc52dcc4eb79532da7aeb17d3cafaaeead8f4 SHA512 b59c0fe518c950b63119535cf53a51024d9575994de8a7603707d28b6503f6824324e44ca09d89f206c7d33888593e46604cb5745be366731160adace6d64e05
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-37.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
 EBUILD gnome-shell-extension-dash-to-panel-39.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
+EBUILD gnome-shell-extension-dash-to-panel-40.ebuild 1830 BLAKE2B 6b47c3ea74f6403b20448a843828b03faa49fd3ec10bf2149a839a9d9c1f4ab2044b613918be9794f7e2cfeb980a97db21dedf441d3c5cda8096aa2547b45b84 SHA512 629d04cb5fff0676a7b5ec152cba741455de635278c1114e845b8017db2ab086aa454b2d5b52e052e60ba6ea1f5d2a8ba3f20d090f3faba03249f6b37cbaab82
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
new file mode 100644
index 000000000000..225fca6fd96c
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An icon taskbar for the Gnome Shell"
+HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
+SRC_URI="
+	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="branding"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.18.0
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+extension_uuid="dash-to-panel@jderose9.github.com"
+
+src_prepare() {
+	default
+
+	# Set correct version
+	export VERSION="${PV}"
+
+	# Don't install README and COPYING in unwanted locations
+	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
+
+	# Provide fancy Gentoo icon when requested
+	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
+}
+
+src_install() {
+	default
+	if use branding; then
+		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
+		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
+	fi
+
+	# Install schemas system-wide
+	dodir /usr/share/glib-2.0/schemas
+	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
+	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index a189face115b..3c21282ee69e 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,10 +1,5 @@
-AUX gnome-shell-extension-gsconnect-33-avoid-repetitions.patch 1822 BLAKE2B b8e882b30fe642ac9b4b99dabdbceff3ac45f44ca988f06f42e7509ed150fb304a813b00275cb63f61af78096b8e44e751ccfff201cdb6ed9ca7c10690e4bba1 SHA512 a2be4ed1cebf339b98fbc7c84bb44da20fccac36f7a2ef09a3986baf8a7a177462f544579a1d0b967880915284dbe26d0b108a48e0a4d49fea4de290983642d0
-AUX gnome-shell-extension-gsconnect-33-notifications-limit.patch 1506 BLAKE2B 12054a8465dfdef3fdc52f4b20b66e1607c9df0f429636e4e296a7fe473f761abd717c6f7a0be6ea0f29df1a3c66bf4f24b7b0840f1097f2b7ba3885b46559e8 SHA512 d55a3a389da36f65b435287b0571f3ab3ee661ef892c45b27f3f9d30aeec69b01f9fb2c182e8272d62a1db7df5dea46650d3cf2e094d2df0f5f9b480e0ca93ba
-AUX gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch 1317 BLAKE2B 3972f38098ead8409a5a27f2c3a5fee28ed7923d551e16827a5b65bf1b02393179312e5c5494e5d7104ea7fff50aec096e41dd7010197b2e779ff113fb7167f3 SHA512 c6262256c971826e7aa56bbddca72f3a1731a3b70e472b0c64901c834f4787e26c10d2ed177df6f4901e4b5524c1a80494bde0a5bfdc5c94e8ede9ae686037d7
-DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce
 DIST gnome-shell-extension-gsconnect-41.tar.gz 614195 BLAKE2B ebcf9fca448e27fe0e74bf4118528a5f8f7055ea962d4e928feceaa3257e9ff6f286a2b11631468abac1355c2506a0d8923fe56d4370f37fd7e93fe7cd8e8d45 SHA512 12de97683e4bcbf49774b6b6f93803bb0d0005f3114a581ccd7a7219cc2cb27a0e7b10d45a162c879f27e058d99b791ce33425e465651fe1f4e93f1a332a0eaa
 DIST gnome-shell-extension-gsconnect-42.tar.gz 729438 BLAKE2B 19aea0008487c5c316a6883da176ccba4bf31334abe1ce273cdba91d4fbacfa8a3e003909488e957486ea371043174eefd1ca990470f99ac4ff36ff73cd498cc SHA512 27965435ef9524021e3ce3825af73d9a8b7f602d8c73b524bcf247b6af47ad14b16e83815b1a30e148b109531fbe230e531e1a0b456f5f51c9c96a4c5a3b19a5
-EBUILD gnome-shell-extension-gsconnect-33-r2.ebuild 1842 BLAKE2B dbf4d5d232fa28b389f20225108049f4f2c6367dc6e8f0facd734bf96f55f5e3a824e56563246f7958453d4a97dfa700c8ad32bd33bc8b4a541a442d3f0986ee SHA512 a4d2a37fdda6e53d9fe9faf733ce03216af380c494959374b813be6a42742013021fd5ca39dde2b10ddf856a059c6e47a1a5187d6c39282967b80a29eb553faf
 EBUILD gnome-shell-extension-gsconnect-41.ebuild 1589 BLAKE2B 2fe5b45b50e276f1b075d3541f78bb798a9ce254bcc88c40e9ddcf13a1668386cb97710e33db19fdcd5f71ae11603f42a8d005c6db7b13793526a5af2a328688 SHA512 c74181be8de7a50b6bb1938b9d756563bc7d9f89ecc609a1204a7f3aaadce7f2f801499f4374f8e0ce29b832575e1eace11979b83b7e76fd4446d18cd3b2ffb1
 EBUILD gnome-shell-extension-gsconnect-42.ebuild 1619 BLAKE2B ac709d464e11b0060a789b98137c6092b84c18fff2f201575d34995d207fbc565dadd69c0cdb9a91e55f67fbe5c01fc4554d93543ac465d1ceb79555d6f2c7ed SHA512 cb8b85bfc3a8226b9fb289d0cc81555ac1bab214e5cb3ca11daeeaba220c6b62729ea9c5736eb0688666b816196ff018394eedadb2812260b66c758965fcd52b
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
deleted file mode 100644
index d7ed8780ee0b..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-avoid-repetitions.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/src/shell/notification.js.orig	2020-05-14 13:57:38.781404129 +0200
-+++ b/src/shell/notification.js	2020-05-14 13:57:54.335642763 +0200
-@@ -200,20 +200,27 @@
-         this._notificationPending = true;
-         let notification = this._notifications[localId];
- 
--        // Check if @notificationParams represents an exact repeat
--        let repeat = (
--            notification &&
--            notification.title === notificationParams.title.unpack() &&
--            notification.bannerBodyText === notificationParams.body.unpack()
--        );
--
--        // If it's a repeat, we still update the metadata
--        if (repeat) {
--            notification.deviceId = deviceId;
--            notification.remoteId = remoteId;
-+        // Check if this is a repeat
-+        if (notification) {
-             notification.requestReplyId = requestReplyId;
- 
--        // Device Notification
-+        // Bail early If @notificationParams represents an exact repeat
-+        let title = notificationParams.title.unpack();
-+        let body = notificationParams.body ?
-+
-+        notificationParams.body.unpack() :
-+        null;
-+
-+        if (notification.title === title &&
-+            notification.bannerBodyText === body) {
-+            this._notificationPending = false;
-+            return;
-+        }
-+
-+        notification.title = title;
-+        notification.bannerBodyText = body;
-+
-+       // Device Notification
-         } else if (idMatch) {
-             notification = new NotificationDaemon.GtkNotificationDaemonNotification(this, notificationParams);
- 
-@@ -237,7 +244,7 @@
-             this._notifications[localId] = notification;
-         }
- 
--        if (showBanner && !repeat)
-+        if (showBanner)
-             this.notify(notification);
-         else
-             this.pushNotification(notification);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch
deleted file mode 100644
index 8c2846c5ecbd..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-notifications-limit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 641ccb70724f8967439495e2356b2d7a654053cf Mon Sep 17 00:00:00 2001
-From: Andy Holmes <andrew.g.r.holmes@gmail.com>
-Date: Sat, 4 Apr 2020 17:37:41 -0700
-Subject: [PATCH] Shell Notifications: set a limit of 10 notifications from
- GSConnect
-
-Re-apply the notification limit from GSConnect, set to 10. This should
-stop notifications from growing indefinitely, with the consequence that
-the notifications that end up in the message tray is non-deterministic.
-
-cc #364
-
-Backported to v33 <pacho@gentoo.org>
----
- src/shell/notification.js | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/shell/notification.js b/src/shell/notification.js
-index dc93de955..f345cdde9 100644
---- a/src/shell/notification.js
-+++ b/src/shell/notification.js
-@@ -246,13 +246,16 @@
-     }
- 
-     /**
--     * Override to lift the usual notification limit (3)
-+     * Override to raise the usual notification limit (3)
-      * See: https://gitlab.gnome.org/GNOME/gnome-shell/blob/master/js/ui/messageTray.js#L773-L786
-      */
-     pushNotification(notification) {
-         if (this.notifications.includes(notification))
-             return;
- 
-+        while (this.notifications.length >= 10)
-+            this.notifications.shift().destroy(MessageTray.NotificationDestroyedReason.EXPIRED);
-+
-         notification.connect('destroy', this._onNotificationDestroy.bind(this));
-         notification.connect('acknowledged-changed', this.countUpdated.bind(this));
-         this.notifications.push(notification);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
deleted file mode 100644
index 7301bfe11321..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-33-whatsapp-duplicates.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 959799d934360f95a2e49223b64ffc77bba2736e Mon Sep 17 00:00:00 2001
-From: Andy Holmes <andrew.g.r.holmes@gmail.com>
-Date: Fri, 8 May 2020 21:26:19 -0700
-Subject: [PATCH] Shell Notifications: account for apps that insert newlines in
- IDs
-
-We need to account for the totally reasonable practice of inserting
-literal newline characters in notification IDs, like WhatsApp does.
-
-Not doing so was resulting in such notifications failing to match as
-device notifications, allowing them to be duplicated in the message tray
-
-closes #788
----
- src/shell/notification.js | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/shell/notification.js b/src/shell/notification.js
-index e7a5f67ce..eef623a71 100644
---- a/src/shell/notification.js
-+++ b/src/shell/notification.js
-@@ -16,10 +16,10 @@ const APP_PATH = '/org/gnome/Shell/Extensions/GSConnect';
- 
- 
- // deviceId Pattern (<device-id>|<remote-id>)
--const DEVICE_REGEX = /^([^|]+)\|(.+)$/;
-+const DEVICE_REGEX = /^([^|]+)\|([\s\S]+)$/;
- 
- // requestReplyId Pattern (<device-id>|<remote-id>)|<reply-id>)
--const REPLY_REGEX = /^([^|]+)\|(.+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
-+const REPLY_REGEX = /^([^|]+)\|([\s\S]+)\|([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i;
- 
- 
- /**
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
deleted file mode 100644
index b47a1cf9a3ba..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson readme.gentoo-r1
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.48
-	=gnome-base/gnome-shell-3.34*
-	gnome-base/gvfs
-	gnome-extra/evolution-data-server
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-PATCHES=(
-	# From 'master'
-	# Shell Notifications: set a limit of 10 notifications from GSConnect
-	"${FILESDIR}/${P}-notifications-limit.patch"
-
-	# Don't show duplicated WhatsApp notifications and avoid repetitions
-	"${FILESDIR}/${P}-whatsapp-duplicates.patch"
-	"${FILESDIR}/${P}-avoid-repetitions.patch"
-)
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	# https://bugs.gentoo.org/694388
-	meson_src_configure \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 5cff6a9c2af0..6a241fbe1fee 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-shell-extensions-3.34.2.tar.xz 204860 BLAKE2B 8abd569a18f693f4f7ffd4a20c65453a33bf17cabcc2e77a037085d75936a7fb4a7ee83829c71056830b825e4a9c694ad346e5fb3a844ad41140b6bba8226e68 SHA512 1611115fbedc2f8708b5596b5c44092e5df6666d43596d7a87ec32ee5f83e9e39d2453cffef0e3445f63e811d21ce20f5587a5a27e0fde280d9715d5cc7dc290
-DIST gnome-shell-extensions-3.36.2.tar.xz 207976 BLAKE2B 74be0821693d92f615e95f25bbfc5e670d2af6a7c7d909fd2e0a0eeb1f6e5d18e5809c5c2526dd1ffa734531091c0a1f1f6cb4050657bc7c98faa9f1cf6eb481 SHA512 0adf7ff030d18edb0c4e787fc097bbdda3eb4f10004857dec7a8339c6f2092e58195df409139d034ccc40027186a0309e5a06668d62c26d40bc80c38f8604ee1
-DIST gnome-shell-extensions-3.36.3.tar.xz 207956 BLAKE2B be266e773e8adae06e063eac7b363ac628bde672cc4977ea38d437bfd078d1de61f4fa9402b433d22b61509fb530fa169731decd2e75c822b4c6b693bac61b9c SHA512 812580abb07f03bd82a80ced7aabca5a9daacd0ef1ec5990ee8e8f4cc231f93f880c33adc87519432cad3fc90f3a6fd3e33f4cff0a90c001bfeb825951d40bf9
-EBUILD gnome-shell-extensions-3.34.2.ebuild 1881 BLAKE2B cd917333aacbd79a1b33d1c21d713dc402824bc1f2689c47becc23926411baf21474dbc0a98261f46c9fb8b17b3e906fbeeb9da9abde19b2399681841f184798 SHA512 0ad35ffeef92e2721eb5b8aa02654ac1edf566492316081a34d4c963aae558801b5034de790bb4e2e8abc6f975621397c3e973c294b9638cca93fd18953bf3ed
-EBUILD gnome-shell-extensions-3.36.2.ebuild 1873 BLAKE2B 6fcad76ecc64471d4b7b8b3ca5c4f5604752f37f99f53397f14ef0f7147d2112d1fe77e0293de0abce170b378855dfeb47f907df63e10c03b19b43a73a340fe5 SHA512 a038a8f5a6893a38424cfb59765661b3f8b83dc3e86658783b629720a5c47f58055c89c359754e79c217df27aa196a75841f78b669444ebe671fe87a099acd7e
-EBUILD gnome-shell-extensions-3.36.3.ebuild 1871 BLAKE2B 1c16f0938118bf58bc411dc23260d9994119b4045ed339718187ceeaab197b57cd527736630811987287b9d0adcf82d36ecabc638c34a86346d03e68871dbf64 SHA512 9ebf73cfb78ab7e8d716997f418cf96939ce30cf688b0b526752d22e02574e526aa4f6afa02c4ae489efb3296f6f7deb95a94c1be6b46decce6a98351610625f
+DIST gnome-shell-extensions-3.36.7.tar.xz 207968 BLAKE2B 61e0e817af900d1a385d44cc3fe2a4d2fb89421aa692d9c02d92c6b841b7da248a267194e057fe5c9fb4e08a713bb72c657eb2fd4982b8bbcdb541644307d934 SHA512 b571f369dcd395d882b4afe5da213a52e3989b5e8e11886fd305d6c77a63ff73ed9d52eb7260ab7e880461354b882d659d28930176ca0aa8c1e75b4a39989997
+DIST gnome-shell-extensions-3.38.1.tar.xz 209964 BLAKE2B 38fad074689aa93d0ca16a230db92417ef90363dc9f27be6c1692bc2296ff2019d0c42542f30d552f79c357795fad07e59bc508476b7cf09abfdeb5860487f0f SHA512 256dbb7ad4ae3b759afca85ae1c042f7b3f3cc46b2713f5a6f2f52d1cbc916a1fd8a634e20218a6eeb1baa6141f65c9c19170c5bfe2f7f677b679bbf78b3bce1
+EBUILD gnome-shell-extensions-3.36.7.ebuild 1871 BLAKE2B 1c16f0938118bf58bc411dc23260d9994119b4045ed339718187ceeaab197b57cd527736630811987287b9d0adcf82d36ecabc638c34a86346d03e68871dbf64 SHA512 9ebf73cfb78ab7e8d716997f418cf96939ce30cf688b0b526752d22e02574e526aa4f6afa02c4ae489efb3296f6f7deb95a94c1be6b46decce6a98351610625f
+EBUILD gnome-shell-extensions-3.38.1.ebuild 1758 BLAKE2B a677bb74e045748eb84a657a72247bc9fc7a04351ae2757bebb0bd484a051c9467d38cce5530b5e40975bcdefa912dc06d12433f69eb762d41c02b0df73bbba2 SHA512 308da4ae2bb278c0b0eea574641d9549073aa6223801213dd283af02ca2bbca6ce057b5c4bc56b5de7a63b7f602cc5634c299851fdbd694a4699250eb695bd57
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
deleted file mode 100644
index db67936fca27..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org readme.gentoo-r1 meson xdg
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	dev-libs/atk[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.34
-	<gnome-base/gnome-shell-3.35
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/adwaita-icon-theme
-	>=x11-wm/mutter-3.32[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-lang/sassc
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( dev-lang/spidermonkey:60 )
-"
-
-RESTRICT="!test? ( test )"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the https://extensions.gnome.org/ web interface, the
-gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-src_configure() {
-	meson_src_configure \
-		-Dextension_set=all \
-		-Dclassic_mode=true
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
index 6711e1f3fd73..6711e1f3fd73 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.3.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.38.1.ebuild
index 88401c357a10..00f4147943e1 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.2.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.38.1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eapi7-ver gnome.org readme.gentoo-r1 meson xdg
+EAPI=7
+inherit gnome.org readme.gentoo-r1 meson xdg
 
 DESCRIPTION="JavaScript extensions for GNOME Shell"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="test"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.26:2
 	>=gnome-base/libgtop-2.28.3[introspection]
 	>=app-eselect/eselect-gnome-shell-extensions-20111211
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	>=dev-libs/gjs-1.29
 	dev-libs/gobject-introspection:=
 	dev-libs/atk[introspection]
@@ -31,15 +30,12 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
 	>=x11-wm/mutter-3.32[introspection]
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-lang/sassc
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	test? ( dev-lang/spidermonkey:68 )
 "
 
-RESTRICT="!test? ( test )"
-
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="Installed extensions installed are initially disabled by default.
 To change the system default and enable some extensions, you can use
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index fc33648c467c..293abbf9f1fd 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-system-monitor-3.32.1.tar.xz 676936 BLAKE2B 815c677f637919966868b454b47f9633f130155573f7895e0c70025a59978818051bf8d087761d15416ccb0470c7341365dd95fdeabcdd0711802f828eddfa37 SHA512 badfb98e4508096336bba4be79ce359cf4363649e97c1da534ed96a04de4bc57e12b84ed75bfa9086e00b61b6558ee4af25eee14f0d2636d3ee0b62956122cbd
 DIST gnome-system-monitor-3.36.1.tar.xz 705024 BLAKE2B 93f0bee524797ef76a8c90c9675d12fe4a9bc8c63a48fb86e3212f8be6bcebc26d5098f163b585748ac9832fc38f8591b8fa2509e1a541ed7637aa7c47ce0bca SHA512 52443c0dbcd4fffb7451f540f0e48088a956a4e176af708d198c6ac2054f454dbf910df21925daca484a30d6c1c3526ad634c38ab01f905a08a64b11938c0c2d
-EBUILD gnome-system-monitor-3.32.1.ebuild 1158 BLAKE2B d734f3eb0a4447210fc213ae71f94fd5b796d1c31728e79591b6ee1d3d9f0774ff6f226f9030e26b4d7caa20ca2a4cf704d4ad20000e70aa87defef2c52d2d9e SHA512 62ec004d8732b0195258c7a2b3aaffa6b91fd954cf2292fa3c521e7bc01b3bfa02698b0599f81e1826d642a097c59afc7a47c417b620240a80bd1f66e8791246
 EBUILD gnome-system-monitor-3.36.1.ebuild 1158 BLAKE2B fe1cda5e2a1686b675f516dafdb55852f585e992d33883a53833ff75b73f990a0b90747e4c26362aded27b02bd8a64775519ab349fc3f693ef108e5ee0595554 SHA512 0bfb1f3db867a78a44e56bf1fa57049da56d30179368e4563d87faac6ac0e6a1c7e2518ee69c3910636ec32a57303aeb791a9a18da14f7a8d6b7d5196ba6f9f4
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
deleted file mode 100644
index 2a5ec8b1ed59..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.22:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=gnome-base/libgtop-2.37.2:2=
-	>=gnome-base/librsvg-2.35:2
-	>=dev-libs/libxml2-2.0:2
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-	systemd? ( >=sys-apps/systemd-44:0= )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=sys-auth/polkit-0.114
-" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use X wnck)
-		$(meson_use systemd)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index c9c863305335..bcd6b5e3f549 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-user-docs-3.34.2.tar.xz 15979452 BLAKE2B cf91c33731ced37a685318ebef0948bd175670cdbfe555b1581ecac8f04b1206e4259f7a1c729e3fddc79322a1cc9cadd1e98a5f95646dc7b1afd64f0d324e9c SHA512 3e9c9e720959b758419201b9e0481ea7d352c77e9a195880f1085ba54485ccf787aaba6ef1cbf48c0a9955e879ebd5fc3d4003d195f522d35d4df047038e1fa2
 DIST gnome-user-docs-3.36.2.tar.xz 10568116 BLAKE2B bf53e85276d455bfeed645621b8273ace47644c5de0896f07b46c1dde5316f03385cbedce5ca259fe6c6460d35c090ad0dca8cbf46e3db0df95cc6a832424dc0 SHA512 6f9d5e6c86a377a7c77a89246b1c0555a5ddbbf9e0ec983182b9cc019c03c53d585c71f63fedb67ff1e0547ec65e1c2d832947d7e58ac2f1491c268735617c77
-EBUILD gnome-user-docs-3.34.2.ebuild 947 BLAKE2B 2d63b7d012c49dd350c274f6e7bc2776c58cc2637512bd9dbf139f53a0d1500c7869832f7a0bfd4ed3ca941e459e3d0ba411c4183ac4df738a91f01cacf6bf32 SHA512 e53c4bbe490e9ae8b08abf8bce2e297c665b38bad680cb52866ffa567240d90757a0f9e1bb8f1e9746ed27d227a5f5b0dfc582cf9a25231d73eb50d462e51dbe
 EBUILD gnome-user-docs-3.36.2.ebuild 947 BLAKE2B 2d63b7d012c49dd350c274f6e7bc2776c58cc2637512bd9dbf139f53a0d1500c7869832f7a0bfd4ed3ca941e459e3d0ba411c4183ac4df738a91f01cacf6bf32 SHA512 e53c4bbe490e9ae8b08abf8bce2e297c665b38bad680cb52866ffa567240d90757a0f9e1bb8f1e9746ed27d227a5f5b0dfc582cf9a25231d73eb50d462e51dbe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
deleted file mode 100644
index 33297d29337d..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	test? ( dev-libs/libxml2 )
-"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 7e85c694c7af..146231007a53 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-weather-3.34.2.tar.xz 5957924 BLAKE2B d6257fb7654862f5fbd308bc202ce8b8f98a0b6baa5a150a1729962fa05812a93cd19f9462d83fec3d076b896be1d8166e360811c84bc3ab4f13b212b48884e5 SHA512 9e9ebbdf795b175f7640ad684da7642a3e6a07da4d95c520a8673f0001aac119c5ebe22737d254a75b878f503910265fa0fdf05b1c219063f6b4dfc6bc8d1633
 DIST gnome-weather-3.36.1.tar.xz 5959192 BLAKE2B f0745506ffd2b72a1a5fe0783fe04c563691840fdf2150e7850cd331ba2027b1d1fcbbb4565830d05c7e39e62a2c94e4c87443ce5786cc70f3ebabcc66e97eec SHA512 c3d4b0e7258c0bfbc1ab2b5695d601fe79326e1bed856734edc309c612f1cc0adc9cfd6b4afb4ad3069b864c807ca0b21a60f89feba68f1dacac58d0fd2221be
-EBUILD gnome-weather-3.34.2.ebuild 1333 BLAKE2B 8a40937674d245eaff3481b2e76fe9e1d0d176b5b6c23067a8bad7bc90a4f6b3027862176649051e814b128986e7680d24ed48f417635728fc4359b35a715379 SHA512 4fdace50c44207d79068e06da79d7e88c436cf364eb044798e1872d58cd41748e6fc07b3687bece07b98a182bfa74e93c089deab0effa0015386d319325f23a7
 EBUILD gnome-weather-3.36.1.ebuild 1333 BLAKE2B 8a40937674d245eaff3481b2e76fe9e1d0d176b5b6c23067a8bad7bc90a4f6b3027862176649051e814b128986e7680d24ed48f417635728fc4359b35a715379 SHA512 4fdace50c44207d79068e06da79d7e88c436cf364eb044798e1872d58cd41748e6fc07b3687bece07b98a182bfa74e93c089deab0effa0015386d319325f23a7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild
deleted file mode 100644
index 7dbc4abe0b21..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.56:=
-	>=x11-libs/gtk+-3.20:3
-	>=dev-libs/gjs-1.50
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-3.28:=
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# Tests have a lot of issues, starting with reliance on a system installation,
-# accessing the network and other intermittent failures with network-sandbox disabled
-# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
-# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
-# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
-
-src_configure() {
-	meson_src_configure -Dprofile=default -Ddogtail=false
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 8c882f467c16..4bdc9d853c53 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,8 +1,10 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 AUX gucharmap-update_to_unicode_12.1.patch 1498 BLAKE2B 5ed3c8a254862074fb923ceac25a03478c88ff3fdd33af9aab98f49830045e04a13cf6ea8551d16aee112a5c62ccc71a167926ce5205297a1552f2819193d99a SHA512 aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f
 DIST gucharmap-12.0.1.tar.xz 1678524 BLAKE2B 90923dcb85f132f607007b272f56d091cd51f14d6818fc01fdedc594d736cc1047e4d3165f4ba3cede96ee2c0db4973890e1fde60c294fb848ffb3918988178f SHA512 989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2
+DIST gucharmap-13.0.4.tar.gz 1900442 BLAKE2B 83925f04b23a5984e0180ae86d39842e419fe723604d3e93785241ed33ba56b80d68bfd8c99514ef542e515c78a0b64748781faa962d3a32e26746673ba4d2f0 SHA512 919f3298040962cf1b8636fe82a900e667d1f63c0f92c99b013d10cee7e7d5f074f3ffaa0ab8a8e3685b6764915a4e683e459fb680aeb65247c82c5a8a326bf9
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-12.0.1-r1.ebuild 1936 BLAKE2B a3686c5c86744f975a8e112c4098ffc82f80e1c1def8545b57a26b76c97856fc899afb028fb406fac91e06f69a0fe049847352a09d0620fa13bf1a37d888cafa SHA512 91aa6a98a48bfc3ab55ad150e3ddb3950ccccdae66219b836f54260aabaf5905a8ace69913a7c7478b40e7983becb4e82ae330cf4865d6087a70409abb610ec6
 EBUILD gucharmap-12.0.1.ebuild 1741 BLAKE2B dea36eb5c3be56088a803f974509d12075f488c823c5943d1915ea0cc9ab1328ae09ef1964b939c4b64771bda8bbb44fcc351a5cad86ff7a636f09c3f46c247d SHA512 a30f6df8594982e305da2092af3a26cdb8d014101af5f1b8d0d75b35dbabf68aa34bbc058c279d896907953cbbe6fa52e2ddf2035384ae6e007f77370031deba
+EBUILD gucharmap-13.0.4.ebuild 1408 BLAKE2B 847c4229b69ced665c61e3554f99f6ad0d56328addc3d442ce5b5cfc0b51e9c7d393547157ae7231379a9927f99bd3901fc6fb6dc876ca42b5305eba0bf5e005 SHA512 d3377579514366aecd40241d7848924921249dfc59553a2d81509d3e39b24c827a5cfb7afd2e24a525578b062cba828c278800581e97c30c05a37761c3b4c915
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
new file mode 100644
index 000000000000..44d0478aa587
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2-utils meson vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+UNICODE_VERSION="13.0"
+
+IUSE="debug +introspection gtk-doc vala"
+
+BDEPEND="virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	${vala_depend}"
+
+DEPEND="=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=dev-libs/glib-2.32:2
+	media-libs/freetype:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/pango-1.42.4-r2[introspection?]"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		$(meson_use debug dbg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 97bee11cda75..ea422428e04f 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -5,5 +5,5 @@ AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a
 DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
 DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231
 EBUILD libgda-5.2.8-r1.ebuild 4660 BLAKE2B aad027fbb20b3000fbde445391f5cbd477ac4846081715aab11bf6f8c471dc7271f2818df7ff535ed79af002de7d2f553be1f7a21cc45e7d153a36ff0cd2c30d SHA512 e917df80718a0c2f9d709b352927ef91351779e71e5e875c41f62c5e96f9bc14d4c9c629ffbe8c226804c7cd0e1e8b890f6d549e0e385b9a9b3c2443c72f3712
-EBUILD libgda-5.2.9.ebuild 4477 BLAKE2B 40e2aa28e436423192117e2cd8ea926c9762e38bf71ba5b7fdebe845cbf2361c00e2b500c8080ea0d70a69bc70f9bbfbe9b3b92b953a1cd3fb7ffb4555275467 SHA512 f80cbe24dc52a8d75fc3b365eb6a0aaf0521b4d0c330a9d8cb7ca7e1169f12956ac257fc8d04931bc96461c5b48ecb2f13ff5d2adb9310641adfc517cb8452cb
+EBUILD libgda-5.2.9.ebuild 4500 BLAKE2B 771dd42579b1489ba6da2651791fc87e451972a827b07e39dc170416589b34fdc7972e920ccdf3886c0b0404f969bf60498f4f0787160b82e45f3b988e8c32cf SHA512 dd84b030e1d71e9213898d069e005c96107f9a8e7db6b2e7c91f4ad5778d74101b5ce29de9a1722a359e81827872545e637a0d8dcc88cdef663b1b535235766c
 MISC metadata.xml 682 BLAKE2B fe3f182ba64c3616542f5a03b2df9441f4eb020ab5a274907d53a04ae694c792b01b7262b1ea82162a89cf85428fe2f69c43b194775be932c379928f4e717985 SHA512 e4fc584c8234b923dffeb6af9968146cae4b319b49234be50d4aca144c326d786aaa82c17f330bab16a691036b2392acda0987c0f26993b1dc1a130e9aea3eeb
diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild
index 73305fd1f2fd..3edc6cce0cad 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -146,5 +146,7 @@ pkg_preinst() {
 src_install() {
 	gnome2_src_install
 	# Use new location
-	mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+	if use gtk; then
+		mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+	fi
 }
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 47773be8be95..552b86fa3fe7 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,5 +1,5 @@
 DIST nemo-4.4.2.tar.gz 1462269 BLAKE2B 365cd98a05c0c4aa1c86a3e7a565904852bd02d92ace8593043ae8a58f5b9d3eda71e8b0d329a177ed59c0d8f1330ae61f5bcc6671110e82bbd9baad84faa9f0 SHA512 b951c401f93d04061a0ef0accc810ecc7f0487617f089960ab58886a6ca6ecd0af3a98c47e9a620a4d6f8f530a11af9cae20903d089177e69bfa12f9ca31ec5c
 DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0883db4241f2f0ed2e375e5c8564cff6d878142b55744ce41f49c60aad3f24930398ff68444e32c572d7e9bd SHA512 3c8c95e75e8bc499b56d1fd133f5ccc86ad18dae2219772b732586fd684a4a7a36e51fa61e6b734ad182ffd96636bdf276b8645d049e5ca68795fac274236eb6
 EBUILD nemo-4.4.2.ebuild 1809 BLAKE2B 5641d649cca2dcb39fdc2f9c9984455bc7bb3f76e3a1b706c061380a93c0931837f6d67e676b2bf72b557e62fe557086e7239198e4a732c140b189fa558c6e3a SHA512 8cf22e8df511caf4d79817a7af8865d4dceb4c72683b7de7e20627762cf372ddefa64c02ce3835100d1011be464ae7da41e871335214956be2069f1afa29d954
-EBUILD nemo-4.6.5.ebuild 1879 BLAKE2B 368b85678f5cee187de61f1c4ed12d13012358e5a07021948aafcd7580015ec1cf169c7a80a372a53faea6c726763e1bb99938e434b9e2b3eb5f9f6fcf052953 SHA512 d4280cf08bd7098c4c6d1d4b9b335dbfd0e500bbb74306ecb9b18bb64c1b9eaa8576ee6fc906f12f0965872bd7a4df8f8f5103e0489bb9656b4994c2acbea8e7
+EBUILD nemo-4.6.5.ebuild 1879 BLAKE2B bed95d8374a6612e7a5e75cc7c3cdd7fb56664545ff6456ba5b8ba67de714e4cd5a53938cd160acd5e9a10cf0c66c1ea1dccfab32a80075099a3e078bd36c16f SHA512 c9df147fc7ad01e6a7e4a4d2c76bf6cbe299bb8e8fab62c384b76d2dbe6f999a5e0cc7b3f5069d7aebd55b94aee19c4715ed8720cd5a6529ed23e1ef71b0067c
 MISC metadata.xml 549 BLAKE2B e60bf6d13687fbd3fd8277dbfc61ad428939e2fe91f648dde5e740dd8e5cc7ac75609a95a01fdaf11f721837ac05a01dc5b7c1604c008036a8f01b006dccff27 SHA512 4bff873128b46a56e572f4d9d355ce2016518cadf3fd0ffa00ac0f6b0961fb7efac4873c8a310eacd6862f8bf4265fa1df306e4efa3130330376e03966ad5278
diff --git a/gnome-extra/nemo/nemo-4.6.5.ebuild b/gnome-extra/nemo/nemo-4.6.5.ebuild
index e64955da8359..b74c1d702a22 100644
--- a/gnome-extra/nemo/nemo-4.6.5.ebuild
+++ b/gnome-extra/nemo/nemo-4.6.5.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	gnome-base/dconf:0=
 	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
-	>=x11-libs/xapps-1.4.0
+	>=x11-libs/xapps-1.8.0
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	tracker? ( >=app-misc/tracker-2.0:= )
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 5f7e8175ea80..f5d5d926e4e5 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,7 +1,9 @@
 DIST pch-session-3.34.3.tar.bz2 9189 BLAKE2B 82c8f346ef8b627c4756f6781e0ccc9274c5152cd723ddcf00e23411efdf3ff633ca0078cd0a4b3ebc24e1f2ef79e7d736fdc6f9b46b750f7f88177c7977a408 SHA512 dcada2ac88fec4fe2d893bd0fd76e63fb574452612b3c9286fe42f3c51fba3b2f3992ff3015b11867c01c1d328fcd8f007f9dc1e1e3030c1e722d3b4df4740b5
 DIST pch-session-3.36.1.tar.bz2 9461 BLAKE2B 069e0b8753dab8ccf7e9b8600f15f554bd38f1ee62c63ff77e308ef54013a7e82883b58a9ceedbec5d95dfcf30e398009c217423479b30919fca0de15a1e0d1e SHA512 d8bfd058e3237d2cccdce420be04dac496f9c04ef24b376875d4c9f38fe2e3b7199406e4b3963cc601e3cb3572f187eac6811e9028a276bba2b6a06cb43fde65
 DIST pch-session-3.36.2.tar.bz2 9559 BLAKE2B 072b395039320b23f46a145ebfc7d80adfd5981c95bb14e5a8f70ce3b1004a74431e74a3af1b3ca30c2620f3deb1cc62ffbcb1028f6312459fe59c9dbba68f5f SHA512 2f5a3ad24ffcfb9e8890e6562dcb86d374c355d4ce63e35653f3d2a2daa9bb19399fb68965e83bf9b2c3213c60be9db139ad3d44a6a969e51bfaef78a10da33f
+DIST pch-session-3.36.3.tar.bz2 9575 BLAKE2B 1f7001c50247821b2c9771b8d16bd2b962712c033fde7af225a9aac152abb2a0505b73f5baf5913ce12e05bc7a89abcf0411b2ffa64dc0aa38b2bea0f3f41796 SHA512 b784421b27a446d460191da5a2eb6fbaf53aa4cffbfe8f113bc8c3ef308741ccfd6a208d6f6b1a50839b3a0925b22e6573604fd315496a5c59ae969fc8e6f7a6
 EBUILD pch-session-3.34.3.ebuild 1116 BLAKE2B c40d8b6fe8e344c57ceeebc9ef1299fd77810a8fce722aa9469c9cc327ee288f1f665dab820835ca914b7c7e07dea82344c64fe0795f03a2050d09f3adddd42e SHA512 a0c2d66acf1d40d340747684904b6f08e8fcca8a336828a4711aa7bd8d5f300eb69e6c5eadde8fba8b2a4d38a291008a0b7b74949f8838bf57cabf02cc2c9d07
 EBUILD pch-session-3.36.1.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
 EBUILD pch-session-3.36.2.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
+EBUILD pch-session-3.36.3.ebuild 1286 BLAKE2B a2f84213d944c73db6701b449b97da1603059477ca43ebb13bd3a8e4d6c00bebe9a31afc500efe0fa4edf47fe658356be3ed25a7267f89c0f52b7745926974a8 SHA512 42053487aa5ff7597a1b7e821934f3a22da77a54a2272ea234c65bab41d5a724ae5178ee0be56e4f657a7fe827b7c7879ffcbd5f009202f5778f5cab27871127
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/pch-session/pch-session-3.36.3.ebuild b/gnome-extra/pch-session/pch-session-3.36.3.ebuild
new file mode 100644
index 000000000000..dc5a9627439a
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-3.36.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
+HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# gnome-extra/gnome-tweaks to configure extensions easily
+RDEPEND="
+	>=gnome-base/gnome-shell-3.36
+	>=gnome-extra/gnome-shell-extensions-3.36
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-27
+	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-38
+	>=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0
+	>=gnome-extra/gnome-shell-extension-gsconnect-34
+	>=gnome-extra/gnome-shell-extensions-topicons-plus-27
+	>=gnome-extra/gnome-tweaks-3.34
+"
+BDEPEND=""
+DEPEND=""
+
+pkg_preinst() {
+	gnome2_schemas_update
+}
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 672d0ec40c21..36f28437c49a 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
 DIST yelp-xsl-3.36.0.tar.xz 642608 BLAKE2B 59ee903e4d6cf6e0d40ff6ddecab8d65e9d81f9889afc37b4369136728cb5962d6e941ab39b80ed6e0613f172546cf659ea57a4b77c0f4633463f2b760bf0aeb SHA512 50544ae434a93cf37779db3be4e2b8d4eebd3575e9d31d3db8426f686ae262f4655d8d4b957e673daba4314d8e1c4c7a5e6485ca17b6627424b18087acd74a12
 EBUILD yelp-xsl-3.34.2.ebuild 557 BLAKE2B bddb7cd5cdb86a227e7d952822af17583748910343f306e30637d3bc790357be2cbfdca80afc280e454ba5b44b5b004dc889cb78345e36ba090509b05a0fd73b SHA512 780b30ae2432561ba7d207d25d5101fdedf3fc749dbc2ac01522b74814795049c5057b84e80b20b8755dd813abaee9441b64b0d3cb001f4f1572b0630baa7c33
-EBUILD yelp-xsl-3.36.0.ebuild 561 BLAKE2B 5c0af6cc4c8ea6d142767003300e9b15185f791f1271560c63537764cce7d365ff857eb4ad9db28fd85fbff66e0f15b78b415f36b5230db25dc1375305770cb2 SHA512 5127d9b54d3cab6d3ea4c71067a4090f55d8cf5ee29277891f0fea5dd69b5dae82d8a7d4cf709d37a8c191f4a6105052d0e07bccdf7d5beb45623964242ba489
+EBUILD yelp-xsl-3.36.0.ebuild 557 BLAKE2B bddb7cd5cdb86a227e7d952822af17583748910343f306e30637d3bc790357be2cbfdca80afc280e454ba5b44b5b004dc889cb78345e36ba090509b05a0fd73b SHA512 780b30ae2432561ba7d207d25d5101fdedf3fc749dbc2ac01522b74814795049c5057b84e80b20b8755dd813abaee9441b64b0d3cb001f4f1572b0630baa7c33
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
index 84eb8cd78a9c..185ba651964a 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 9d2426585180..7a1e2332ffa1 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,4 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-3.34.0.tar.xz 1538980 BLAKE2B 5b9af7a0f1b334555d6a4af2aff658a20e1b703f67663437fe4a967d5501382b23b2c8247908a232c79ec93fd6c7e1634816b3ce34eb11e609f4a6734ab06f4c SHA512 799a55df98bf176ee19e9b48ef321734b5df9d8c83bdb5c8c910b3def214039c8730a079d032b88dcc886c70418abb968c85c5c998b8ac340fc5ce27e6228eaf
 DIST yelp-3.36.0.tar.xz 1538076 BLAKE2B d3f8817a54506997581ddc5477c87e2b61be0303c275e9174602a005838f141b1b7ad1904b682dfe3cf1118aaf497abbbfc855c5b57e2f7f3fdf6108a90f3ef1 SHA512 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8
-EBUILD yelp-3.34.0.ebuild 1236 BLAKE2B 4718064927a9cafcbbb1b53146e4d25916183d90e8d7c6c86270d8a547af7f027ae23abeaaeb4103836dd59ffafc3ba6e0badc8b84667bfec5da5ead18ebbf0b SHA512 49c550d5ec380c1708661b6de856bfe610443938ff04d5b10215abdac197fb4c8a24b489c6a7cd3874b595f14d37adfc5cd32b014f4476290fa50fdff5fef50d
 EBUILD yelp-3.36.0.ebuild 1236 BLAKE2B 4718064927a9cafcbbb1b53146e4d25916183d90e8d7c6c86270d8a547af7f027ae23abeaaeb4103836dd59ffafc3ba6e0badc8b84667bfec5da5ead18ebbf0b SHA512 49c550d5ec380c1708661b6de856bfe610443938ff04d5b10215abdac197fb4c8a24b489c6a7cd3874b595f14d37adfc5cd32b014f4476290fa50fdff5fef50d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.34.0.ebuild b/gnome-extra/yelp/yelp-3.34.0.ebuild
deleted file mode 100644
index ed004a1603d1..000000000000
--- a/gnome-extra/yelp/yelp-3.34.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.27.1
-	>=net-libs/webkit-gtk-2.19.2:4
-	>=x11-libs/gtk+-3.13.3:3
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-bz2 \
-		--enable-lzma \
-		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	exeinto /usr/libexec/
-	doexe "${S}"/libyelp/yelp-groff
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /gnome-extra
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)