gentoo resync : 05.04.2019

53 files changed, 387 insertions, 1271 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 927ae34f380f..96badb132b6b 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 fa52fbae8de7..e8827cff42d0 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -9,5 +9,4 @@ DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56b
 EBUILD evolution-data-server-3.24.7.ebuild 4179 BLAKE2B 735021316c8e2e9eb46a4033e9789e33edd470d227c14b7971db0dc4aba89e90bb0632f9ca4fdd519221e8c9542df879df04b227109b2c21e313381130121a46 SHA512 007b8e12ff9ab7659862f047be1d1e455983e75ecd8eabea2c3ff8897fcfdcf814d9c0239c7c64e16e58a60b3a2225061a731a260afeea4072ac37b50d59b151
 EBUILD evolution-data-server-3.26.6.ebuild 4225 BLAKE2B 31cec53985d6c542a5be2c4e45cfced3ed1e1291e7b25692fe0193f4a3099b54377b1062b80be07d835c48738d3c94b61aad740d9c36f5a30565f7bab1409797 SHA512 759b523a6f3538c96e8979e2f54eb314c92ea16dc635ae4d469008c7a7c0b66da4585c810a8b447bd0cbc19231fb092d50eac8b4d23da0d3a7c33b58546c3632
 EBUILD evolution-data-server-3.30.5-r1.ebuild 4389 BLAKE2B 800a884455c9c8b73a971e66a330e51579266cfbb4bfb7df5cd841d9222a1c47101f0273efa70804490da43e70f5b17556428ec0c322a4d96865f8ae1406be2f SHA512 e1b5d4ca83788fe531ae6d22645835e9328956f35f39293725e598cb33389073190f1d428b22427086a1bb3b32ae4ea03abb188c8ac72ca8ce443807b416f9ac
-EBUILD evolution-data-server-3.30.5.ebuild 4288 BLAKE2B 44f328cfb1a8a5113612b6972872f7effb1505222a7d52b8e0dd6c180bb1fb9dda996f4c98f344217bed57e8880e39cc3fcd33d1d9ce5c8593b6cb47380418d3 SHA512 0426d5c7c037e24d7b0a92564ed22b9ccd1c21e971fd89b2b0e052f0d7a7d42b047445af00387c454f6561a7320d2e0c45702c9f5c11949b67aa0ee45f605605
 MISC metadata.xml 1146 BLAKE2B e40a9c9473a90caad62d2e2e0855e3365828a991171bbc56ed5aeba2c7c467af49a975048d7ef7f0665c1825a2f46708a85889b018e544f10a994bfca7c4eb8e SHA512 c152f4577ccbb14e3ea87fa05328303ef6bd4d5b4e4de554a6a77308a0687fe2ae13658b4e62efd1ec133b8a92e79f64a1babc2d9f9932c0bbc9c511855e9643
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5.ebuild
deleted file mode 100644
index 1252f45a478b..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 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" # subslot = libcamel-1.2 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 ~x86-fbsd ~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
-# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend
-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.2:=
-	>=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}
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-# 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 )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-# 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 oauth2_enable
-	if use oauth || use gnome-online-accounts; then
-		oauth2_enable="ON"
-	else
-		oauth2_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=${oauth2_enable}
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DENABLE_UOA=OFF
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=$(usex oauth)
-		-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 8f189a17f3f9..5f53974f5e6d 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,11 +1,8 @@
 AUX 3.24.6-DESTDIR-honoring.patch 1196 BLAKE2B e6996ff088f5e5f3b1e4db6b1f85524d61ba35798d76cf46f07c9efe8587dadeab08b78f3a8d0ad8602ebe6899c72e0d0804e2835ba634afddf610ec0ff54488 SHA512 dc837d7150a42e9e03856b36a1f417ac1b850722f1475efacfa00bf724d45fddc03eb61d3f8f4c7e74884c672dd1f18bed86987cd3f22bbefa6ad7f514368a07
 AUX 3.24.6-libical3-compat.patch 1623 BLAKE2B f8fc567f2c86cbe6392de5750e8a01155d49a9bb79912d1e3f066be0b03eae90be4d39b72d3fa2eb92129d378d5647a697c3813d253f26980bed5a51e838a811 SHA512 2f1a607cf44d69bdd7a14551f0b95cc01c34a86f92741fce848b3d90e6e4bc8c35e9bf02426c742da3ab8bb4bc01c4533bac8c95894f11bb57290da19dec95bb
 DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
-DIST evolution-ews-3.26.6.tar.xz 485624 BLAKE2B 7e9b13fff05122a54fe502d0d4bd1f0ba895259b89d074d9f39ab4e56bdd2794e780c61023294ceea79adb94f80a42a232e4cc1743c41b062c1b03c9276a6253 SHA512 eeee228699989d0407ed65d2b8fa37f643890b40084484a125738dc9a10152de435cbc9e3109c1aa5ae90daeb4aba6e06da135c84d7f7e0fd330f5d8448383ee
 DIST evolution-ews-3.30.5-certificate-validation.patch.xz 6928 BLAKE2B eb1f070797231f14cc71cce2f19a0dc925edc0f67eca9267568c835e878d9f1567aaad7dd8a14c88abb047af8db8220239c78d62387329c9d38e5c5eda21822b SHA512 2d4fa5f9c24bf92ab4e5105cc5d265907e8af760d7c969ffdf74d090795948e1f9e0e84f5d051c2a6c4324ed49cc2c23f23ebdccf67fa8baab965c612ad807e6
 DIST evolution-ews-3.30.5.tar.xz 525252 BLAKE2B 510666cdf6bdb95e73799256daa9b4c753ed70de71798d3acb73eb55c30158a7b6b56fe7617150ec0a1f5ce20676da8a3ab4608fca06f009ea16fbc234770736 SHA512 6b17fd73b461e0ddd725ee87c854fca45fbc14f10922a60aff5a9a25b56728f1f16a0d3196b4bc3cba83e75655c15244c3bf2442fa17449c7466ab95371e93d7
 EBUILD evolution-ews-3.24.6.ebuild 1306 BLAKE2B f82629ba467605d6c359c1b2c0db19a912332e6c1c32126a70919131d15b639bac496004c344a9078932fe262c5c84ff669aa2a3e30cdc5fd76ae969e9bd0675 SHA512 b270f0ec8019b39bd49157c393be0ba1bf305fe4dba9bb7a0e18e89c6095b6c0b5af662b21b9f4cb87c9f4ea629ebe36e339125976977afbc31601f516df2a7d
-EBUILD evolution-ews-3.26.6.ebuild 1344 BLAKE2B e025ee9a418d81c330477555274ecd30bad7da25ca7e8a5e06c23f3dd669e21bfaa5971565d5dd67270e9dcb006bd789d5b1f5b588266fd0f1f825084e9d81ae SHA512 282ef39e4e16313950fc516dd1d599e4fafd0b84a9d1e1f4adb43b2167647610ea021d767eed2c8e710d00aec117e68bbb471570aca08c3a3fbe183323752d91
 EBUILD evolution-ews-3.30.5-r1.ebuild 1501 BLAKE2B e9893a75ac1c933f48989f0d94ea06f84ed36e23a9ae0f5e968912b2d3b7c0889c162d518f47d35ef9f09666bbf37a0fe0610bdb4cae5e99a8a0dddd494301ca SHA512 5755e5c381c4921c73f3f3d613ec35e2c41ee5d4f9d9c05b781762ccc35f6206228b8fbccf47c98484c20c107d9e8ba3597ff26bc74086095cb0ec784a2d248c
-EBUILD evolution-ews-3.30.5.ebuild 1316 BLAKE2B 9b85c6d2263d6311a452161e59e50085c35d152e057b2a56d240bedfba28a403f994f6b6a85a4d48909375eb77e9d9499fa2c7ab32b5dd7b3c3c3b4fd9d4179d SHA512 16895fb7c1316de5cca4a25970fcb13cacbcc9d5215d1e09011fbe96a4df244d76118a403cc2fdfef855d8853cde7108122fa137b8e7fb95cd08554f23a9a4fe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.26.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.26.6.ebuild
deleted file mode 100644
index 2d35e29eb5ce..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.26.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-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"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.46:2
-	dev-libs/libical:0=
-	>=dev-libs/libmspack-0.4
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-3.24.7:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42: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/evolution-ews/evolution-ews-3.30.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.30.5.ebuild
deleted file mode 100644
index b309eac19dce..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.30.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.46:2
-	dev-libs/libical:0=
-	>=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.42: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-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index be0371249b34..97159325376b 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-calculator-3.24.0.tar.xz 1358368 BLAKE2B 81ad42598418b11f2436ebf482bbf93547460990cdb464efb3107e93010081f3d687bf99c80d35d9a6576b5d838218c7ea07e81256abfa358ce78031d80b346d SHA512 55968f3a307748050089652394a3652b8e199be9abf87d43e732874526dc2f08c4521e302a69afd2c09705ffa67a890fc2217503dd31ef51959df9189364c22f
-DIST gnome-calculator-3.30.0.tar.xz 1069768 BLAKE2B c59848760da90f76648b8de888bd41319bc077eeabe729792142aa36ca634b439ab1d4a07318afaa335e511d5bc68937cca4aa7ce63c331064d809c8d4880283 SHA512 16d99c1919614bef4ce4e056543e369563c7ac773e77f3a9e5a09eaddd33f18077b2ba287b1a925ad39f6832236de7f7924dc7a76621ace7b02412d0166df0c2
 DIST gnome-calculator-3.30.1.tar.xz 1070308 BLAKE2B dca8e16f754d7ae7ac3371dbe65fcaacf51c251d377cc696c7c9a9ca6b4d9c0f6431acd06c3091e3d3e0f468cc599953452cbbe4de33473e365425ca3add602f SHA512 4c909f36d1e6ff594b9ab76419a6b50962cf4b5de606c4996d311e5ef6511a20d5c3b310919b271b1a0120ed6a0794644faf5a390d94b71ec6bb89883d498565
 EBUILD gnome-calculator-3.24.0.ebuild 834 BLAKE2B 8ac1c3a59b54f95aaa319c587bc7267943052de6418cb2628315a90fede5b7ce50460e25edc4d91b59f280476c40b2af57c7634e0206715d34899400282359d5 SHA512 1d4108b7525b94ddcc4783b8b68b1a5bdaa1d04194cc97f6e4e56cbf1fbbb96144d3d25804556c8a8030b63293332fc463726cd34afffab2b9f17e577a863c9e
-EBUILD gnome-calculator-3.30.0.ebuild 1079 BLAKE2B 817b5b446868ece0e521c4abab2cf9fb10881ade44da4bed2f1e2265af731a998cfc1401d15a1e2395828f02a79347553bb3425ee51c80f3c61d11fe6d83cd70 SHA512 d3160045dda86fbcab46e1f9f90cd45eaf237ba4c03311e8f805fbc113120f49bcc35b793db9266fbac9c2e5490d9c847c7fc5ac349794a456a597784761e47a
 EBUILD gnome-calculator-3.30.1.ebuild 1094 BLAKE2B 3cd3ed1e3f24d910d8550fae1bf0635ac1ad2ae1eca5d0a3b9380f6617e74228ad87b600183329e7c7d26bf39904fde5f347d3189fc9b7977d0945528ae57a7e SHA512 0e9abe98145d515633be30e0a390fec919ea2cce9b5289d8dacfa53d1c61b074b039a29b8f2adfba7684e4bc509a5395f2f5bb997e7423135fb203929eb59c7e
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.30.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.30.0.ebuild
deleted file mode 100644
index 54fc94cc7069..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.30.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~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:2
-	>=x11-libs/gtk+-3.19.3:3
-	>=x11-libs/gtksourceview-3.15.1:3.0[vala]
-	>=net-libs/libsoup-2.42:2.4
-	dev-libs/libxml2:2
-	dev-libs/mpc:=
-	dev-libs/mpfr:0=
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 8a951f61c06b..89f3dfe94d2b 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,9 +1,7 @@
 AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
 AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
-DIST gnome-calendar-3.26.4.tar.xz 2443244 BLAKE2B a3117b4599e435959f515d4e1740adf66fb43a0138a325e38bbb2d269ed55407216e6ec8d4c1aae659cd3d0794f71d8dc7134dff786227b46405f7f9c06b1412 SHA512 6b7ee4fe409b9eeb9a84307142b4aab85e348f623a64bf66db09f9432e7c958e0bf83db7fe65c6d57efad84518cf2f859282e58ffdafefa6d8c30d863fb5007e
 DIST gnome-calendar-3.30.1.tar.xz 2443936 BLAKE2B 1826488ee03742a9350e589954723264318450d50fa7175955deee8fb3b3bbf2a29fbc6106644bccc062dd45bd9a16e7f40e2928c488bc333ba35d00f2411f25 SHA512 acb428f123fe716b41c4e828213b1106296731b5aa99607838219b8e6c802b22d3481eaa91429cfb34bc3d098344f406ea86c5e2f794f26414ba05bf0189fe29
 EBUILD gnome-calendar-3.24.3.ebuild 1154 BLAKE2B 577693f10c479791872e5ae80006a809547fe53cedc0c4b154ae3e044d525f3aedc2f81fb191cb6eade11fcc67acd7581a2c92bb3352a924285701128bd77263 SHA512 f2b3a07725ee80d4f6bcd98a309637cb40561d8340a6ca797f63983b67a78373fe2830b7172be1454ecb0f7f454444937b1458aa025b87885c4999674ab4a536
-EBUILD gnome-calendar-3.26.4.ebuild 1178 BLAKE2B 4db78e34bf1af1da3c4895ebc6828d3d3d2613374da0db00357c8e29d9797d750cbba19fce89dc62be5f99635a7e57b20596fcd96714930168c65bbab3bdae86 SHA512 b6f74cd72ecf47689d2987bf8b61d8526c1fe25368b5cef546e08bb57d9d680236cb93e731efb15b603f86ab46abed00fcf247f0d2b601ef10bdb16770805d47
 EBUILD gnome-calendar-3.30.1.ebuild 1287 BLAKE2B c2bfe0cba7a4034b3f1d7c25352297afd5e3f71c442b4d512b18c29b0104fc13860a66cc9b317e1c62666329530f6305530f2ab3927359ad91be5c35595fd64b SHA512 f343c80a65542873643bf46d17907dd1f1768340b266356f8582fceaff6780865b5227ed560bde7621d9a47cca0b811664a9ea7695fb26c91d957c26a9e33e42
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.26.4.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.26.4.ebuild
deleted file mode 100644
index d95be9546576..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.26.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson 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 ~x86"
-IUSE="gtk-doc"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-# FIXME add docs
-RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3
-	>=gnome-extra/evolution-data-server-3.17.1:=
-	>=dev-libs/libical-1.0.1:0=
-	net-libs/libsoup:2.4
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_use gtk-doc enable-gtk-doc)
-}
-
-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 31b277dcdcef..3e39b727b767 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-clocks-3.24.0.tar.xz 954576 BLAKE2B 848303243391bfbc5ae2fcd8bfb4f3320ccb8465098d95379aaecf856341f05171964eda1a0a8637e04b5330cee6343003ec25063157f6d8ba0abcc22aa3f6ef SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1
-DIST gnome-clocks-3.26.1.tar.xz 800056 BLAKE2B 3ab9d611c9ef9f5b09ae3c5bd257a38582363e73da76f64784382d16c287fcd06524cd4d024a606328073c46604862a249f9ae5bbf5dbb31acd786a512bc2537 SHA512 226e0e253b5168aec8113da3018371dbf29716e4c0ba49c856333d66f6572a2bb846cca64cfc24dff55da577d0f60dce4eadfeb256eaa737d4040ee13fc62f85
 DIST gnome-clocks-3.30.1.tar.xz 798904 BLAKE2B 58ffb56191cfb07912c1575291f752aadb5549ae5e369cb4c8904756d1ab5e666591ead6756992090921741abbfcf751e2d3ff76ed82d688caf135c7c091c888 SHA512 62fc817a3ea3155b650865f6d5056ba3370da319389206d921e315be878159ff26d0b3063a2c31c85af7447ead10c5fb62bf1dfe4613e2bfac1d01b0ca7b8b3c
 EBUILD gnome-clocks-3.24.0.ebuild 700 BLAKE2B 6eb7773cd6c818eed081337668cdd1a83cab80e946f8fc94635b895eff454f55d410297a113b58223ce8df2510418eeb188ac02fdcb4c38d6e049b8a6bf4aba7 SHA512 a108464748a745e78c230d635d1085fcbbc2b2a96b9a01a6fec6b63e7384b38377bd6e4fe40fd7a1784f0b970f6b772d36b08760e4812e160f9b7481d2bbb192
-EBUILD gnome-clocks-3.26.1.ebuild 829 BLAKE2B bdaff514c60cda0aae4ce34001df95d79275c6973e4f8dfa81044755c032022878db030014527dde50e4b62b22815b2803917c8205386125bb35a968afaf6fd5 SHA512 b224e94479e7513eb282b956561f623dc6b3d1a8ef74f7293a165815b4df9d39739de4bce25d75c73ac29cee9e4625cb5096a8ecfe90a0b3ac9aee33bb91392e
 EBUILD gnome-clocks-3.30.1.ebuild 831 BLAKE2B 869982ae9bad020d688fa1ad4536a8b9ba885bd0d808d47fdadefb42d5837f01e541db6ae447b25f42db0358bece924e792069fac661132b50889a5af91a9796 SHA512 db6b6e374d5c34f716ba482ce3fa581d73e584460f034f7584b875bddc8313ac621ba93123b3f0987e5078e85008efa221e30c837ea5a2c8351677239782bc68
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.26.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.26.1.ebuild
deleted file mode 100644
index 0f3fcd618e6e..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.26.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson 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.14:2=[vala]
-	>=gnome-base/gnome-desktop-3.8:3=
-	>=media-libs/gsound-0.98[vala]
-	>=sci-geosciences/geocode-glib-1
-	>=app-misc/geoclue-2.4:2.0
-	>=x11-libs/gtk+-3.20:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index e1f048a6103a..8e11fa4d19d3 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,11 +1,7 @@
 AUX 3.22.1-fix-vala-0.35-part1.patch 884 BLAKE2B 2994fc2b28bbe8f3b547542b100324fce5d95b385ea8edc1013c86c1e0df1dabafb4306b8153953c67a36e1d96e1c658c599afea5f1c3e3a7d617d01c05d3224 SHA512 73754d230efe89d3e3273e1d24a69e58e45a8d6e74fce1a41f7a7889aa58189fcc2f5edf36ce2418c43871716634301308f0c211f0f18282cb409d009669bdf2
 AUX 3.22.1-fix-vala-0.35-part2.patch 1501 BLAKE2B ca7149152cae32912977bb8a2ca420d1711fcff5e2b18e040d9969e246a0398f66ad09cee72f22b282d6eec834d10721a99d270ba873d782f09bc6e30b7c80d6 SHA512 700772e2c87bfad32e408f20653a20976c0a3b243fd4bc8b6ed61cb9fe34f1b1f572b877aa05e9b9c3854cc444d5d7fc1c26dcd9ac28bf76694eb02c2e31bb4c
 DIST gnome-contacts-3.22.1.tar.xz 788820 BLAKE2B 8f620334dd380e8cb690f7b71d3a99a921f5814ab230690a60be6022150db7a6a0f74e426e72d8d027eb5280e1b6bfd04fa7b0b030519bb19e4718ca0c9f2120 SHA512 d93ed6c65ffdabe1925cc795b88ff374fe69e03fcd36af7c2fc67a5236b90ab6af4bd269b6fc3b344fcd6b4688d866628b8b090bb62de95f8bd0c2e40c26a107
-DIST gnome-contacts-3.26.1.tar.xz 974588 BLAKE2B da989125408702099ecd1afaad6c06ab1cbeda2309bc7b207be671c833792a325bbbba0ebc6561f960d2c524ebd51743a60d5b792a0c2b8126318d38a6d801aa SHA512 1ba445efd71dbc77213d75011b0abcffcf6fe534cba14cf8ca92890e8dfb7b44d9565399200aa7aa03862cf08be60289b78501a1807a760bb1e68f0fe46c4685
-DIST gnome-contacts-3.30.1.tar.xz 369392 BLAKE2B ba3e9263b1de210efec88d2ccecaaf7ae7a6761a5997e213d1a0d9a7694fed54f8123b792e138ec8ac67843408562e320a5490c5daf51478b763b9fbcb21adda SHA512 4aa5629299233d24c36ec1c67d412fc421d5b6836c9759a0278bebe0239897ec6046e3aa8ea7ef10c5e537ec9aed67346221a353f683e18032a708eb333826d7
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
 EBUILD gnome-contacts-3.22.1-r1.ebuild 1840 BLAKE2B 3678c0ff5796cb2bfed0d35954e0553bdb6b94c79fd9e4d120fac3a307351c948c4cf2d733878002907af6416548ef6c18063fce60a48b022e3f0faa9130e6d2 SHA512 81cfe1119ad2b63bb3041eecae2b4a5b0dc0e1b8e4901f6ad74cb1c52004abcd820dd131f3b2bac0e0d7b067c69c2a53a84187ab7f9019d991f81de79def191d
-EBUILD gnome-contacts-3.26.1.ebuild 1605 BLAKE2B 93f08053b6dfbc85916e9871cb4747e6d05d8933631ee5d06c3ee371eeda2e7cb16ad0350f24b7b39d475e13e0c4f5a57ccddacb156201a61ad3d2e9e7d38c33 SHA512 5d0d89ad60b377cdbda70c8a08f057ca7537a65b449ff7d80e18f6f899cae532a7e5f9e05471daa141413d7d8b397a477ccaa5d3da20dd2acac45d9ca0c4b277
-EBUILD gnome-contacts-3.30.1.ebuild 1719 BLAKE2B 3d412a3232f8b2a696ada524f44b009ea85b92a2869e058de47e370a475c3cea7e40b4f199522da891501b3dde47584b47395e4b46d718bec43a4aac789f1b14 SHA512 b6e689e1bfbdbc9b35bb0e02388be10ff9dcaff3f0614a7649f2146f56ab4e34f54b9bf841a40677a9096322c23892f7dd9a8008232c0ee635e29d0122c0eac2
 EBUILD gnome-contacts-3.30.2.ebuild 1526 BLAKE2B 3dca7f4502f9e58498c3a0406d5ea3ee9299ae0ea061d40497484234cf1d460aee249b3b863c19f2e8e355af6f2dc02796378555daa88197bb3bf11e3076a915 SHA512 239947e0657bbf89fa08ab669dbe6198bfef934933872fa3a5d4292d968ce525b08fd98961f231d140be327cba56b72dab415376dbe0f38d598eaef9a024e63c
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.26.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.26.1.ebuild
deleted file mode 100644
index 0496d35861d3..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.26.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-0.9.6:=
-	dev-libs/folks[vala(+)]
-	gnome-base/gnome-desktop:3=[introspection]
-	gnome-extra/evolution-data-server[vala]
-	net-libs/telepathy-glib[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=dev-libs/folks-0.11.4:=[eds,telepathy]
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
-	>=gnome-base/gnome-desktop-3.0:3=
-	media-libs/clutter:1.0
-	media-libs/clutter-gtk:1.0
-	media-libs/libchamplain:0.12
-	net-libs/gnome-online-accounts:=
-	>=net-libs/telepathy-glib-0.22.0
-	>=sci-geosciences/geocode-glib-3.15.3
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.20.0:3
-	x11-libs/pango
-	v4l? ( >=media-video/cheese-3.5.91:= )
-"
-DEPEND="${RDEPEND}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Regenerate the pre-generated C sources, bug #471628
-	if ! use v4l; then
-		touch src/*.vala
-	fi
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-man-pages \
-		$(use_with v4l cheese)
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.30.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.30.1.ebuild
deleted file mode 100644
index 7144fd7e808d..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.30.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.24"
-
-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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-0.9.6:=
-	dev-libs/folks[vala(+)]
-	gnome-base/gnome-desktop:3=[introspection]
-	gnome-extra/evolution-data-server[vala]
-	net-libs/telepathy-glib[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
-	>=dev-libs/libgee-0.10:0.8
-	>=dev-libs/glib-2.44:2
-	>=gnome-base/gnome-desktop-3.0:3=
-	net-libs/gnome-online-accounts:=[vala]
-	>=x11-libs/gtk+-3.22:3
-	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
-	v4l? ( >=media-video/cheese-3.5.91:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.22 )
-"
-DEPEND="${RDEPEND}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Regenerate the pre-generated C sources, bug #471628
-	if ! use v4l; then
-		touch src/*.vala
-	fi
-
-	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
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 513d6f8b0877..477786539dbb 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 BLAKE2B 628dab2c9a938f3b265855443e794c1575586d0579692e1a21bae77dd497989cd061cff4dd97090f11719916f24742eedfc81bacb4fdf31536eca78cdd221d6f SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d
-DIST gnome-getting-started-docs-3.26.2.tar.xz 119168700 BLAKE2B 2b694dcc01e0a75c6c412f056b330b22232de540ac6c8f2cfe7927270479383e8255e996c15b86693e5cde5822703217aafbf7c3c1aaea1ea73c172fe479afb3 SHA512 9a8447d18f54efa23041f9d28ca8cfcbb18a7917de29f0c7806eb7384f98c23bdd501ef07ab7556e4b74796df2c8a8b531041c9b6eafe71f6e03102ba47e2b00
 DIST gnome-getting-started-docs-3.30.0.tar.xz 110244480 BLAKE2B 91acfa8731a60bb98c88ffb23bf46ba5bc83feee51ed8a6ae7ffff5d5e7c7c5695db9fe715d54ffaa7b1cbe2fbc9c0dcae86b577f81deec6acb7bb57d92f788f SHA512 15d7db0aba5c4ce056700ff6f1d5c23ad5cad5c113ed9c83aa0e569262d6c489bb48eedc697d25e25d3cfae7df3b8da039b84c612b9eba9346b4b4c2b4494952
 EBUILD gnome-getting-started-docs-3.24.1.ebuild 424 BLAKE2B 64093399bab07a9e68c313ab3084eb774543e336106b9f46517fcd27ec476c5cae4cc36091a1234c386374953ef0cce20c046a4db7942112b850cacdb84aab26 SHA512 adfea1597f4471168fed28f8de0f9002c83b95c47f5cfc254044252deac204bff92e29ef4514c66d35e6c043935afe0f9e3c249df8388a3bc501e2bda1fe45ff
-EBUILD gnome-getting-started-docs-3.26.2.ebuild 420 BLAKE2B bd6ba897e99ed0762e61cc444736ad90a20646d6feb95f71a96b3a407e4f275d0eb4de89c800fbbc501b9f5aad32c46bfadfa6d5a39f07d75d928f480b7d4b5a SHA512 63b3c5758d16a21ed2896f2ebb7d9eb4a94ee387797396f77b5495976bfd5f2f5591e58d26654b470266eb63462a675c5ed586d45cdad905b10b90926ee4974a
 EBUILD gnome-getting-started-docs-3.30.0.ebuild 420 BLAKE2B bd6ba897e99ed0762e61cc444736ad90a20646d6feb95f71a96b3a407e4f275d0eb4de89c800fbbc501b9f5aad32c46bfadfa6d5a39f07d75d928f480b7d4b5a SHA512 63b3c5758d16a21ed2896f2ebb7d9eb4a94ee387797396f77b5495976bfd5f2f5591e58d26654b470266eb63462a675c5ed586d45cdad905b10b90926ee4974a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.26.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.26.2.ebuild
deleted file mode 100644
index 6eaff71d29e9..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.26.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 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-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
new file mode 100644
index 000000000000..baae3ac74a8e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-dash-to-panel-19.tar.gz 21031128 BLAKE2B f2df2fa7f4967b03cb99e86740f0738ec805427ef13d7dd1e86296b4ffd1dd2a154ffb7eb8c6a36a8d589b16635fe8f608182ebc11f2708eb1436bdf72097b01 SHA512 f5ab8d5aa397dbf4a7fc5d9e4584016fc5382c026cef6f58649923edf28f0c1f46cb1ec6ff32466ee4cb84b6b0ed30eac1b1924608ad02f34b1c24ec7bb91635
+EBUILD gnome-shell-extension-dash-to-panel-19.ebuild 987 BLAKE2B 106a3e349a01d78e42ddc60434d8326714387974b18230b596877f12bac2a8fc50d9f89e5336c003b93a06f016d7c062eb707e4ddbddd8af98fb6d62c04ed930 SHA512 86932b7e09a96d5dcc09e718831985ca6055199f6d10b5e04b2b168bdf9f46f320d70d913198b4e0e4d24018e061ca57605f56c510788e8e728ae43e16691359
+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-19.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-19.ebuild
new file mode 100644
index 000000000000..0fa5259a3e20
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-19.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+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}"
+
+src_prepare() {
+	default
+	# Set correct version
+	export VERSION="${PV}"
+}
+
+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-dash-to-panel/metadata.xml b/gnome-extra/gnome-shell-extension-dash-to-panel/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
new file mode 100644
index 000000000000..c7d1d871bd3a
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -0,0 +1,3 @@
+DIST desktop-icons-19.01.1.tar.xz 41624 BLAKE2B bc528d0abf1951db50594fcb44260ae235890b90fb5c180e83dc91e7bc27a13b1508809ca88f2dbbd50ff30e47ce865242f21a983298e0ae69bd699cf7cfc9a5 SHA512 04f9752bb75c6ca008337f57f88ce3e0000f34c54982adac58519bd6d0767763f7c94c9a0145f2e2836fc3053b68aef828f1960f7efdcc6b97ace3dbc8dbd9e8
+EBUILD gnome-shell-extension-desktop-icons-19.01.1.ebuild 994 BLAKE2B 2437efc33a3626791384ed68771c7fa4ad95113eec648655748945b432e80a3a3da7edc841a0d8918c627ad9c2674c6d8ab3422a7a2d3f99066ad001eef0fc0f SHA512 ac41aa884df785d169f6936f5bbffe952026003034f0a6778c40af522ad008fe3fee1bbcb5ca52217d153597658cf80835375e6dc0d3da48252109768a4a2c52
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.01.1.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.01.1.ebuild
new file mode 100644
index 000000000000..2cea16162aa2
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.01.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A GNOME Shell extension for providing desktop icons"
+HOMEPAGE="https://gitlab.gnome.org/World/ShellExtensions/desktop-icons"
+SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/c15ece9cbe50ca428e195eba96e12fd4/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.30.0
+	>=gnome-base/nautilus-3.30.4
+	sys-apps/xdg-desktop-portal
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+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-desktop-icons/metadata.xml b/gnome-extra/gnome-shell-extension-desktop-icons/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 37def91cf9ff..3ea9aae8c3ba 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-shell-extension-gsconnect-12.tar.gz 1034122 BLAKE2B dc9e4003532bbb500c81d2bd0d2a715f60bb5c70b6bcf3286ebd8b2219d511f51e63c93ef30b0b71ced720531c811462f3b343d9a9eaa07ef4a56a498e5c497f SHA512 3b88aa7ff6e55556a6e438376c578a007d41d266dc91f6d56dfccde217bd0ede7ed40c10b05903582d9bde392f0a375f34b1fbdfd1aae0204f46b9d7e6c246ef
 DIST gnome-shell-extension-gsconnect-20.tar.gz 282464 BLAKE2B 1d0949a34f209f85ebe857494ef94ca429755c13d4988f5ef965f90194b7fad2d37ba0ebfb65ddb2df0db8aba17f27ca400e19755e528cf445dc1cd2b5a8b9d5 SHA512 7db21a580593f429eb7d89054d6ec5e867d33ddc36e29a7e08ba54be8941cc507f081539fdbb0b14bd9ef3c6461964f02e23c12136f475c683c90685e4ea1354
+DIST gnome-shell-extension-gsconnect-21.tar.gz 290699 BLAKE2B cfdaf5d3e02e7a73009ff6f355f9ba444a811fa0834f1d16ac191217a613b56ab39d0952fdd1119e2e6371ba3e5ac89473d1a10de922189c6b2a40e0518b97fc SHA512 3382b5043fcaa359cb12777098f4f89ccdca1a20c6e0b953a8f165563902e3b4d0d469f09a59d01bad708748969efd79651cdd5ab9129c29ff656c6a918e0821
 EBUILD gnome-shell-extension-gsconnect-12-r1.ebuild 1467 BLAKE2B f89f94c2a40773189c8c23e6e39bb26d3e56ad3870ffbf878fe751a9f4985fe67a237a7607615de3e5855ccc4748197c0c154cb6bd522fe91582115031022f89 SHA512 8f8aa26056806b879abee4ba26dec54c72809d8bb94fc7209dce72ce2e6eac8f3dccdc2095ea7eb4ecb809387d466aabbe15ffbb40a804275b99994371fa66fb
 EBUILD gnome-shell-extension-gsconnect-20.ebuild 1420 BLAKE2B 41c067d19a759ff3e67acf064a381e5ca7552fd919d5f49460e71a62f20a3f6e6357a5a30c816530936f2e41b0004551f4e50f5a26bdaeacccc5885a1865aa98 SHA512 96264f963d67ea1176865e80d5888c43c9b605f54df0dabbc26814119c6effaa4114c82167ee5b323c3aebcb3934d167a154a6810f8699788cc97a6fcf42e499
+EBUILD gnome-shell-extension-gsconnect-21.ebuild 1431 BLAKE2B e0d64db350bafb87088b2ec5de4eedec776c06edb2c18af52d55c9fe0acf3369f7f47337076d1b04c9659a69651a8e9f51d94daefdfe7e75b85066dfc684a7b6 SHA512 83ef50ae1653840849c543b6ed586ef4aa7ed02e8dc1daee7b054bb09f6fcab04fb642f55a8991ae1ed9dc910375ce442a8a3e1872c3e366fb1fd1d581607af9
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-21.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-21.ebuild
new file mode 100644
index 000000000000..59ad286871d4
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-21.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 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"
+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.28
+	gnome-base/gvfs
+	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
+	|| ( 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"
+
+src_configure() {
+	meson_src_configure \
+		$(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 52823ad32317..721ac740f8ca 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,10 +1,8 @@
 DIST gnome-shell-extensions-3.24.3.tar.xz 346420 BLAKE2B 3b6f6686656ca6f395bd69fea905c4f28264db81ac0f207bc2e0d6c82410328be2bc4c98faa659d9ac551cabb73e0576c4e28def9c14e5c7710a9785528909db SHA512 7948a9cb6f5cb8d760bc42ea2865823ee60bd164b491d944edb0413e362f38ed90d39ead44ac57872a83c43c4050f5448936e739626b89a2b486a22f41d61e20
 DIST gnome-shell-extensions-3.26.2-patchset.tar.xz 14284 BLAKE2B 36a81073e1983236835eccc5dc31fb9ce23c788b2e6e69661ea70d152ea951c4763572ee3f3fc052b72c3d0be7ceb4b3a397a46ed1d4b19acaee11a72203b399 SHA512 24b83766561b12a31cd83db361fc85cd86b4c80ad92244d2669d78b44433683402ea06446b003fa65137672b052699281eca089e38eb441b8805408369232121
 DIST gnome-shell-extensions-3.26.2.tar.xz 348720 BLAKE2B c276b95c7c80d732257396b3b04e273394adb5580709db3ba6ba5129ed9f6458cf2b2daee253fb2759169417364d4392e5734b5df3bdfd00266439c2bca2db9e SHA512 8eb417a947545832d180cf7e53e1c239aec3ba1c819375071f7f036617de4ccdea5f23e81349d53dbc3c5f12334b1f1f590def7b75130e1057c314db557166e6
-DIST gnome-shell-extensions-3.28.1.tar.xz 199180 BLAKE2B 3d32bef06e91627e93d554e39e7bdbbc43ffa351f5ae9cbfea3037332c1999b5bd143c8b01329f9f591ae8345c0a1a40c48c598a37d4d940e78c44bde432e2fa SHA512 acf5d261fa3405a34263dd188ec9a6501c4bd7cf07ab06627292e213a905cd59756b2337be57e195af262e3cfffd0945dcc78f9ca357636e1d7d220b43f6780e
 DIST gnome-shell-extensions-3.30.1.tar.xz 198652 BLAKE2B d65ae90f6acf607aa1fe2eacfdcd22800b2dfcfee71240b600dd8a2e9e0320ed972a434a68a7020eafcfa6a0eec84572dc9f80258dc96fc205978882fe0c85c8 SHA512 492d99bac6345cc0c9e1a8a067859d2ff6d7b1b620277cac43429573e2e952af1a2ad3d94cc2fb5db3978fd15226c7f2231eb4d11fbcf1da39fe07afd58ee7b3
 EBUILD gnome-shell-extensions-3.24.3.ebuild 2096 BLAKE2B b90c5d0b8d21df6b69bcfca17ac6a1615bde90c9f671bcd5ce6a9de9e126e26363b46acca47f3ed25fbcf278801658c2beccead6f689df9089f82f3722ffaaa6 SHA512 5f9bb3c388b643ef5f2d11cdff32d1a559fdac6274a31a860f933785c327bd9ffa1692eaf14a977b9daa6a9a5abacff1ea9f21b8159c924ffdfb37a40e4fdc09
 EBUILD gnome-shell-extensions-3.26.2-r1.ebuild 2371 BLAKE2B 768a8f860a7a74da7f03d5fcb12bebeebb8749296dcdd27f126b1260696df8b37c0bc064686dbb3cd177da82a65653d222dd87f279681109d0d3bd30826a1df2 SHA512 76ef9cdbb113887082fa963ac2d9d3ac157802070bbf01d8f20638e82d57c740249135dbf2b917748e1536b2e22bbd049c68bc9072830ab74b2b0959019e5d3b
-EBUILD gnome-shell-extensions-3.28.1.ebuild 2172 BLAKE2B 2c459bc5e6abbce62f75a2a8ed324642c5958ea1a7548b321c379a11772e224ab4c2f057f77fe5a4041282c65e7672ebc01359bab0453810ae82073665adaa53 SHA512 d54a909520835c191d53fd9db9125cdd222eb83c331918e7538a7dc8d9e69c1ba80d8f45912738749b7f329fd5fa89b15d2dd30eb9850ea6477ae903978deb1b
 EBUILD gnome-shell-extensions-3.30.1.ebuild 2126 BLAKE2B dbf150ef9552f8bd0e32d8cf6341afd3f88bdb7efffde948fc7d695b44d1e98dd82b8297087b97345caa9f436c997e6640a5fba8807c5844ff49a57dbed69bea SHA512 966ad94c1bc5b46f3113277c2de49fa9164e3ec8253d2f644cb85a466ac489430d36d9ea6e4d086c47cbe26cfb072061467bd19b1c9cb6f6b5f666fefd13f3cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.28.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.28.1.ebuild
deleted file mode 100644
index 65f76eabdacb..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.28.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 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="examples 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.14.2
-	<gnome-base/gnome-shell-3.29
-	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[introspection]
-	<x11-wm/mutter-3.29
-"
-DEPEND="${COMMON_DEPEND}
-	dev-lang/sassc
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( dev-lang/spidermonkey:52 )
-"
-
-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
-
-	local example="example@gnome-shell-extensions.gcampax.github.com"
-	if use examples; then
-		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
-			"${ED}usr/share/doc/${PF}/" || die
-	else
-		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
-	fi
-
-	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-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index e74b366654ea..e244ff7acdcd 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,9 +1,7 @@
 DIST gnome-shell-frippery-3.24.0.tgz 79322 BLAKE2B d5e6db3d165708836e0cec4c1c2f6ffd3227876a566759ac9db9c7ce1d71841002a991df0bd2bf2279e79dfb9a87af1e8b10abe850f972ff2c9f49397106b8b5 SHA512 7f12f3be7ec4d55cf9f96c81c5af649cbb410fe79e880b3b5469e1554ae8419e40d5a77ab9d3889758a2729dd31e59b08e507803b84886305b75fe27df5eebd5
 DIST gnome-shell-frippery-3.26.5.tgz 87012 BLAKE2B 23f073cfbbd87bc29cc90f052b841c5a5cca535b2a0e8ef3f220fc4bd9a1a2857fde817f0dca478673fa27a93a028ead28a880f67ec574d6011e3a63630540e1 SHA512 b5767af112e1744f7928c01810b16df565409da43cac1638467b1425b50cd0c48cfea3535be501b47144c8e1b5b9eeb6283c80464ec1b02d74f60e7d04478c85
-DIST gnome-shell-frippery-3.28.4.tgz 87337 BLAKE2B 3baccef54902953766ff2e78f8c291e34ff2b4a698f81cc4b21a5fa0c1c452b43509e7e9c840fedce398a50a5986e5992ff189d3f87954f24c2f39f46b651e08 SHA512 69648307f6783615c09d104f3e19e9f17046e5800df394335508cf41c4a7907e85b9d53b461e313f42f29c7637dbd4047833a2e56818d3cc7abe640d9936c855
 DIST gnome-shell-frippery-3.30.2.tgz 87885 BLAKE2B d79d27c1b9faa5c5f6351fee1f9ee7afe5c7eeaaaab5de94988aee0fdbe283d74eb4175606f70668b4297b295c325f569cb3bc02d26728985ca3d3075eb0c5cf SHA512 a33bc69ddc9ee16b944e456ca537b07b30cab3f010910b0b32a4a5b7ce64d0e766438587f2949a43bd9829ed36ebcdb3f236ea40ec3596a539e06d3fc1f9e6f5
 EBUILD gnome-shell-frippery-3.24.0.ebuild 914 BLAKE2B 116a6673c879e0a10db2af34f5e3c13c386f92bb73abd51a86ae884436a27af5b02c80fe9816c5f9e6fce89b2a95c550163c288f0fdbd5284af6871bb192a041 SHA512 b87203ae36ddd9a66427ecc57f57ccc4973f0e7ae97b008625f3456688b2005afbdbcf97ecd0d0a6b742f7851acbcc6132dc42fd0ab625b44ce8ff06258181b7
 EBUILD gnome-shell-frippery-3.26.5.ebuild 913 BLAKE2B ea43eb78b032413b765f6d680b4bd4eb044ed4e4fb3bcfcc128e6422f66dbe77146d01c36bbec269bbf4edf069849bd18834dc39cd07c646506b0ecafbb8ab66 SHA512 0292878182012cae0895118141f1b76996de29d7c3196a7f3f97c6fbb4ee0d765f9556db4b6e1d1baaae8cff0134c87b837961112241cb1048cf8839398a9eb4
-EBUILD gnome-shell-frippery-3.28.4.ebuild 943 BLAKE2B c8d50e24fae9b85c225f2f32b44df1af132a50b78a601b32efd887d3ff6373f97658f5864fc7994105c76ae2072a42bfe9ac323dbce35c1ee4daa3a9937c6fa2 SHA512 7cba0c8aeaa687ae5c27c3d530a9f612268ff7da6093fe7abb560fa8bc06017bc2f022c7828f18b76944784f6f85d18ea11fa1d19b4107900f57d75b5a48b47a
 EBUILD gnome-shell-frippery-3.30.2.ebuild 913 BLAKE2B bb4495c9192642164e0fa5549d2fd09ceae781516df515b65be8faf5f7dbe07638df4f44bcf70136a55b53db9236899ed6e523cd6eb10688f13a79b1a8fed778 SHA512 6423e28fec027409cde789ac9bef5822e326ba49633b15de51ecce64f7406f43ee7953ed0ba6f4b2ccc7bdaf8349b7be97c56204e01a9a38460e4a9d3494d33b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.28.4.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.28.4.ebuild
deleted file mode 100644
index 62085f4d0978..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.28.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.26
-	<gnome-base/gnome-shell-3.29
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index ebfde12976ab..520818640f3b 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-software-3.22.7.tar.xz 3865764 BLAKE2B c23e3b9e34a9b233a584a920fcd5969b3ebb5fa4227da147870e71c1531da6c3efda913149a903667ae1725c505c1c842aac0a76b439a2730bf6c837f39757fc SHA512 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825
-DIST gnome-software-3.28.2.tar.xz 5181868 BLAKE2B 4744ff13216ac1421700ef9c5ec9fb540ffb527ed8bff1bd2f7b90cb5c9b768180e3b30fc0b44724e27479f56f8867551b4b19a9496664418a6b6cbe0960623e SHA512 ca22ea589c19f3c5aae32fb2540646d3b3c8faf86f857dd414caf61b716bc50dea16281955c594a629f684da5ac87eeada6ac68247a9b0545600b739fa436dd7
+DIST gnome-software-3.30.6.tar.xz 5217384 BLAKE2B 6a9478aa7752ea62c391545b5f84191a22c839802bd1ac2118696b9dd954a19003477a688d9f36868a617dbf3dd186fc36a054ce0eac8ba8c7a5eee834732ce4 SHA512 dd98e9e61469fc5566ab569f09bdc06ccb5812a236e305185b911c70364e2983f257e939aed0bb61778163084fb5628d63ff6bd5f056d4a7626a2e771ad6426a
 EBUILD gnome-software-3.22.7.ebuild 1905 BLAKE2B 37a604c6a5f8d29c2cfc3f8e8a0ab83d10e97a8232dcbe8bc62068998cc251686f53122e27c04db4d309f51b466431dc8e29723b5c197c9b3da76f3c0238ca58 SHA512 39cd8f54b680ade58142114ba78bc56ee18655a24659c4cdb3f1e3f2c9df155bcad34bf1b6a333a29ac697b50ef067eb17f6296b91dd0483985e6a884e16718e
-EBUILD gnome-software-3.28.2.ebuild 2279 BLAKE2B 401a34339b7d8484265b50ba83ed3476143aecd5eda7f49b6d75c392cda1e0ce19b0b47533fbdb6dc4c3ceb8f15572e20418d58e6e311d823cd1ba1ad879f5a4 SHA512 626eda6b4a952247501413f487e6c0fadfeb89a8215778e87b4646762a709675ea160bc01bee42d62e9f4e7e09a341d672c36db23765349654c0dde810a4b9db
-MISC metadata.xml 364 BLAKE2B 55dee83c2b28ef3c3ecf738dc837455c9ab16351fcbdeee41726204d7d246ae42d7fd129e40bedd8563d3fd05cf4e82b6d22faabc06bff7996a1d87b7cdbc9df SHA512 a19e76913149b546abd9039dd4a51af6f74b59580c79f0370e7d95cf6e66b129f71d152c3dcc64fe237b1eab22c2bbf97d521b0a7bc1f46af6e7671770310e83
+EBUILD gnome-software-3.30.6.ebuild 2503 BLAKE2B fb342fd305937d2e6a9ee1e715683691648318576f77a76feecac8422af354971698bab42baf242b8947a533cdcb83c58d153928423bab5e0031b7a9a473b147 SHA512 3e4ac4ee1adbb7e8dc0ec7cb41c91c1825ccd3f2a5bf32f1cff6a956cbf6ab1c4e73f97c5f4474323c8461bbe28ef8ccdcea13911011efda7fabc88e869592a3
+MISC metadata.xml 443 BLAKE2B 5f060a298a752150f4b06545c328985c5e55a6e32afb45382b419e33beb27c7ac965d59465dc02e23e4214fd9b995b44894a666b2b4ff55bbca469d3992d12f8 SHA512 aff64504d9b2df32113844e86e05c393314ba247ae0742bbd140b2212771d8a3c76856c79426aca11908a8a8f5e881f6ad8a9a4d298d11fc4f9990bd1fe454f7
diff --git a/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild b/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild
deleted file mode 100644
index 3556c78411ba..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="firmware gnome gtk-doc spell test udev"
-
-RDEPEND="
-	>=dev-libs/appstream-glib-0.7.3:0
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/glib-2.46:2
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/json-glib-1.2.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.52.0:2.4
-	dev-db/sqlite:3
-	gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= )
-	spell? ( app-text/gspell )
-	sys-auth/polkit
-	>=app-admin/packagekit-base-1.1.0
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	udev? ( virtual/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-# test? ( dev-util/valgrind )
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# FIXME: investigate limba support
-	local emesonargs=(
-		$(meson_use test enable-tests)
-		$(meson_use spell enable-gspell)
-		$(meson_use gnome enable-gnome-desktop)
-		-Denable-man=true
-		-Denable-packagekit=true
-		-Denable-polkit=true
-		$(meson_use firmware enable-fwupd)
-		-Denable-flatpak=false
-		-Denable-limba=false
-		-Denable-rpm-ostree=false
-		-Denable-steam=false
-		$(meson_use gnome enable-shell-extensions)
-		-Denable-odrs=false
-		-Denable-ubuntuone=false
-		-Denable-ubuntu-reviews=false
-		-Denable-webapps=true
-		$(meson_use udev enable-gudev)
-		-Denable-snap=false
-		-Denable-external-appstream=false
-		-Denable-valgrind=false
-		$(meson_use gtk-doc enable-gtk-doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild b/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild
new file mode 100644
index 000000000000..c7aa1aa96ec7
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware gnome gtk-doc packagekit spell test udev"
+
+RDEPEND="
+	>=dev-libs/appstream-glib-0.7.14:0
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-3.22.4:3
+	>=dev-libs/json-glib-1.2.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.52.0:2.4
+	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
+	spell? ( app-text/gspell:= )
+	sys-auth/polkit
+	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
+	firmware? ( >=sys-apps/fwupd-1.0.3 )
+	udev? ( virtual/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+# test? ( dev-util/valgrind )
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
+	# TODO: Investigate; seems to work outside ebuild .. test/emerge
+	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_use spell gspell)
+		$(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?)
+		-Dman=true
+		$(meson_use packagekit)
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		$(meson_use firmware fwupd)
+		-Dflatpak=false
+		-Drpm_ostree=false
+		-Dsteam=false
+		$(meson_use gnome shell_extensions) # Maybe gnome-shell USE?
+		-Dodrs=false
+		-Dubuntuone=false
+		-Dubuntu_reviews=false
+		-Dwebapps=true
+		$(meson_use udev gudev)
+		-Dsnap=false
+		-Dexternal_appstream=false
+		-Dvalgrind=false
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson test -v -C ${BUILD_DIR}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
index 74322fe8c80e..92751ac281c6 100644
--- a/gnome-extra/gnome-software/metadata.xml
+++ b/gnome-extra/gnome-software/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="firmware">Enable firmware update support through <pkg>sys-apps/fwupd</pkg></flag>
+		<flag name="packagekit">Enable module for package manager integration</flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index d4536ddfce70..a984e9fe605f 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,9 +1,5 @@
 DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
-DIST gnome-system-monitor-3.26.0.tar.xz 941144 BLAKE2B bde11ed78b10140916121df49af36b04afc6d9cb35fc1fa4f240ab8c109b79bfce5175d0e91e7a80c6da5420e13ca2aa520e76db9b79ea08d5dab23fcd8a301a SHA512 c2593371d956a4c11ad9ac4afabc996c02d743f9ba443192b0d955ab42464a02ad3fe19398b9489d33d552fdfdc2fb615e85d4dcb9342b821cb0b590fd3c3043
-DIST gnome-system-monitor-3.28.2.tar.xz 1209156 BLAKE2B 6b23617ce1168eb1144affee0a7234fb7a86cc94cdf8220ce56c685604392db24359b4870238a7e96cd6a6e72b3130d77dd34c7cfa240c4c650b936d7ba42335 SHA512 8c55e97174c7334b19b8d9ef171d3dc97bdb2de4fb8442471e55ae6a0bbf0608e78eee3aafefda8a4a0375b804e5332dce692f3bd6676b4b623aa5be4c87b948
 DIST gnome-system-monitor-3.30.0.tar.xz 762004 BLAKE2B cf0ef6dde12a34f537e632dca6b45fc16ab49e92aaf49d2e945dded25b5cfbd855506368b82a0f840808760ce563f54fd8683f5a35652a5e10cdb4972ea61864 SHA512 c33dc510b15019de745a88d3eef12b5a2b19048bda22878988f22c4482f6a26ab20f5913f3104f2cb1b9566f7148a08b53d4e548f71345363273c51840fa2c8a
 EBUILD gnome-system-monitor-3.24.0.ebuild 993 BLAKE2B 2a65ab0a7c2e6d88ccd846c3d331f42183f0432959e90be92e7a1b6997fd759eac6c160ae4575cfe489c4844453b112a5c8c6276285d8c6994bfbac3cb3383b6 SHA512 18cf4da5a143b31a4af11469af74459d4f27b2a2121bdf95df505d0c04d6610c628721a258297b13edb0676c7a20bceef5cf7f27d568bf1831b5dc85817c970a
-EBUILD gnome-system-monitor-3.26.0.ebuild 992 BLAKE2B cac3b8e4152abd9a99f1eaf54d5b5b731f394c56bf6b3855b844c3b5ac5aa0032249bde7d66bcba93442f035cad056ebf5b102ddb89603be3252ee1f04f3aff5 SHA512 06d4345550daf88ea0e3cddee272f7d20730e839ac07e877d4a745b105dbea2b041bdfe195f970fe950015014525fac99052b04aab197df543d0d22a71972231
-EBUILD gnome-system-monitor-3.28.2.ebuild 1031 BLAKE2B 33132ed62c013a83b3f39d755ad2e031b9bb7d647905c54da904765e683842c610bca5eee3ffd20053450d9fef906b7079577034b0ed23e52deeb9eab51aaedd SHA512 910bf6a9ebaabc50f5bafbb0b5617c279571fcd6e66826b7037e8fb3146de24102700e5a4c2373a3d9ad8b1853d9c2e2ce7df2b860649aada9cdd22cb480da39
 EBUILD gnome-system-monitor-3.30.0.ebuild 1152 BLAKE2B 0eb28986d5331edb7cb85b24feffde7cb753034185ecae7cb87a0b383c41674670afcff641f72ce09b1ed3c56823196e5e2abccd68f3451b9aca2a4b5cd5772a SHA512 1134487182453631afdce57ffa319d581450224e53abafe4821092f7d6e6353629808198a4d658edb053167066e180ac7f05c6bab105ba739d65710a7ac70c30
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.26.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.26.0.ebuild
deleted file mode 100644
index a213595de60d..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.26.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=gnome-base/libgtop-2.37.2:2=
-	>=x11-libs/gtk+-3.22:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-	systemd? ( >=sys-apps/systemd-44:0= )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# XXX: appdata is deprecated by appstream-glib, upstream must upgrade
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X broken-wnck) \
-		APPDATA_VALIDATE="$(type -P true)"
-}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.28.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.28.2.ebuild
deleted file mode 100644
index 87e551af3204..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.28.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.55.0:2
-	>=gnome-base/libgtop-2.37.2:2=
-	>=x11-libs/gtk+-3.22:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-	systemd? ( >=sys-apps/systemd-44:0= )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}
-	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() {
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X broken-wnck) \
-		APPDATA_VALIDATE="$(type -P true)"
-}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index e16fdb8d7db5..5e99f1df7f9a 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,12 +1,7 @@
 AUX 3.10.1-gentoo-cursor-themes.patch 1029 BLAKE2B 8b97e43a73f9ebb05d9f771db16e3b96e21f377047847e2aed69015a99ad1126bab659c979979d91ec5af006040d1bfa44f85fd781333352d34008d9d48c2b84 SHA512 55bfacefeef6581dd42e1e3f8474196cd29d4eea8ad83c7b33bac5757854e0f946927ccf25cd09e0f93b971361c6ff3896772e0aa18f4dfec9c77c11a73cf147
-AUX 3.26.4-gentoo-cursor-themes.patch 1053 BLAKE2B 76d30c61ed588e00f27fb4019766501efad115c32a0a886278c7cceea1605ad1c4b8815becc4537d6b1dad95823b00f42297a56c49c04d7b478348d631b07179 SHA512 deac240ed8330199eee9ca44d1a5e5d46f293caa37ac41656820d7ecceeafbb6706eaf6af3f534e14c581b5a003b9004920c17615180e89519efc3c8bb077db8
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
-DIST gnome-tweak-tool-3.26.4.tar.xz 253036 BLAKE2B a63d6977e7b4fb9d7e26752a95e123794daa5412ccc2f4ac1572ee1bf06730b29e5a2bd0d547dc3f8bfc1ab2c4a2d9bd72c42f9c0ff10d9bc9a23d377883562d SHA512 42828720213cf366534eabf46fa4c3e4c3f15f2310adad96a5297300c781abe62e3f59ec305e077cdd6bb5538dae3ec3487e5accecd2ce6221c388c28092c2d0
-DIST gnome-tweaks-3.28.1.tar.xz 268476 BLAKE2B e4bcbc218519769ece4ea266f014a59b692c6cdef8f12122a3f1dddf1748e60cbe7fd9b0f7eb32320f111b15c0a2ac09780cac53635f816107b1ca983d8ddd1a SHA512 c3d1f65012b465b428809bcd734df4de37f1530611d1bce6363067683184acfbc736b432b12834882b10aa7d0f03d4242cc51319b6f49de95eea7b7c43db90dc
 DIST gnome-tweaks-3.30.2.tar.xz 281820 BLAKE2B cd980f77a05d74f556fe461f1dc35122efb23ab0885b84ddb71c873dd6cb424d4ae213d393b7555f8baed8eb5fb3df8afa7d9b4cb92d772ba9eed59892871bfe SHA512 183df35e8051aa1fba54ca45aca64d665f28d92c56879ff6fa60adf3809a05676db15d97d7023bf5ffb9bac33df259eb62742bee3cebeb87d8ffa39679b2c078
 EBUILD gnome-tweaks-3.24.1.ebuild 1640 BLAKE2B 300b9616862e3872254783d6474d2fac61339f34f1b9293370cc111b790d7c7348581abfa81e35b56fdc9a8148b379b66b3e12004e9e157751b53e864b902cde SHA512 5de55cd5fcb8edafe4f2c000e84412f75b8673f6f8b7eb439aa00a950e3fc82a4ea9dd7a0b34b5124f58ee5a461456f305c2c8d855f696fc4f99749610153f51
-EBUILD gnome-tweaks-3.26.4-r1.ebuild 1435 BLAKE2B 01c82a85ed716b7bbd22250a6a8b1221e8774e501636eddc6bd1613213bd6d593fb0784566f1ae0ec6ca6833a3c9f21ef8c3d7258eb7bcaef44321ca32dcb691 SHA512 e24c797dc3f905a76abecd559c733a09c128bad13eadda47fb02508f5304ea4588f1a5501399a30af93766cfd4351101eaf79d9f6e0ee1994c8d008b521b1414
-EBUILD gnome-tweaks-3.28.1.ebuild 1200 BLAKE2B 54f9094d46fb69450c31533505f318bc74379032a1f70a1d1635ef9758154781c2bbf671792be3eb9754744a2920a72f0a4b7cc9c8d2349a9c31505a73adc2db SHA512 8998d3e4aceda0e9b45383ec3af5096d13794f4c4f546198dff47ef9a3ac7a4fd464021ce6550c15afc7d6271c3f397a29b528f3bbf16e0a1fcf10b2b55c11bb
 EBUILD gnome-tweaks-3.30.2.ebuild 1186 BLAKE2B e401946c3dcfbd6e503b4ad0c0d0d8a12e7b7ff69b5c6e94a6f49509ff0dd6868e509fdd2b8cf5e6334a6f813f422a5da8767e5477539b5257340751c60a74c8 SHA512 413cd4eccedc406728f71ca418b08e107b8caa5f1e84102356fc45a1c0bc144a9aea10267f69d7f29e61d26cc322315693bbc3bf5db119be04cefa3f399d2e78
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch
deleted file mode 100644
index e7eafc8be8ab..000000000000
--- a/gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 52dc5f832bbb249896f114439d7d1562e26b5e47 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 16 Jan 2019 04:04:16 +0200
-Subject: [PATCH] appearance: Look for cursors in Gentoo location too
-
----
- gtweak/tweaks/tweak_group_appearance.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
-index 1a56287..83159c9 100644
---- a/gtweak/tweaks/tweak_group_appearance.py
-+++ b/gtweak/tweaks/tweak_group_appearance.py
-@@ -87,7 +87,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
-+        dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
-+                 os.path.join(gtweak.DATA_DIR, "icons"),
-                  os.path.join(GLib.get_user_data_dir(), "icons"),
-                  os.path.join(os.path.expanduser("~"), ".icons"))
-         valid = walk_directories(dirs, lambda d:
--- 
-2.17.0
-
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild
deleted file mode 100644
index b748b2f7a314..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-GNOME_ORG_MODULE="gnome-tweak-tool"
-
-inherit gnome.org meson gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gnome-settings-daemon-3
-
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.6.0.1:3[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.24
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-	>=gnome-base/nautilus-3
-	<gnome-base/nautilus-3.27
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-)
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild
deleted file mode 100644
index 9b0e786bdfda..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gnome-settings-daemon-3
-
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.6.0.1:3[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.27.90
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-)
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 68de15516f12..0a2694e539ab 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,9 +1,5 @@
 DIST gnome-user-docs-3.24.2.tar.xz 14167700 BLAKE2B deec09954a9c3bf915c86030d13df70efec81090c74744fb98192a1e9727cab2bd54ee608f1f3bddcf8707f6a3a6e1ddaeffdc5175e0d0f2ad4ab2e890036330 SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d
-DIST gnome-user-docs-3.26.2.1.tar.xz 14538856 BLAKE2B c51f8a70209255e93137411c7aab5f61f0cf2d9e00924b1a7728adaa38579702556540c01967e9fdda1157e7304d38ed6e765073e50fffc02cb2e719abbfb597 SHA512 eb1bb873e1b8871e07ebd6a4afc694561b5fa4ff30453d25bdaaa530cb4910e8bbaacd36fcdb7f141f9f52ee8cf34521a332856d60c18a9385bfbc2501d13d97
-DIST gnome-user-docs-3.28.2.tar.xz 15489560 BLAKE2B 937ba21e1629a5d83669d7d35c4a5274f8d40cb12d837b9e2077af40e219b4efb7ffadec212a29f7af50586be8deb97f8909cb54c687329475dfeb20ed5154b5 SHA512 3472454194e084e6482eee2d58037067832809cef3aff47188280c7397ed852d6d895dee33019df5e109db82ddef1f1b7f672c43c0977456bdf9a96db75255c1
 DIST gnome-user-docs-3.30.2.tar.xz 15707236 BLAKE2B 4a0f83078c8a0360719a89f8a2a0d79d564452fe65e7037479288730c5155be1b26901c10863e9b35727c23458b7015ade326db6a6f78fa95b8f541b3dc5b361 SHA512 43f2d12a1f5ca03e5af24f599f688f1ed849d8466cb12f4b67c36601a1b6e236bd98e505ebcde677ae80be8cca71b32996bcb87715fa50c30cc5729ffc957b33
 EBUILD gnome-user-docs-3.24.2.ebuild 936 BLAKE2B c73905e25c9a419e3c8999f7a09ae702becd42b1a526d90342bc3b3436e63af99631f00875526940f387a98ed39d42b5383f39a55990bacb313f15113385f5f4 SHA512 1b63ecd8d58c1110c79134c3679a715a3fcb09e075fe045ce512d5a83ad82051d691da674bc7880f5a6ed7a0183957e172ee69764a020d5313061b42ad0c66cb
-EBUILD gnome-user-docs-3.26.2.1.ebuild 935 BLAKE2B 9351366198049ce31e19303353ad07c3896452cc390102444e271dffaafd6967fe9d00910743ffbca368c3ddb8c531767d16d12b60b9f0f79cd4858201d97ab6 SHA512 da2b18ce40d0d5fed4729eba0a8f5a8d9ea514fc6d2314721b9e8eba715633f4a55230602a725401bffe9c3b42d5149f0a07fd4295264cd7521f37412a5cc443
-EBUILD gnome-user-docs-3.28.2.ebuild 935 BLAKE2B d11ca611a5421aa54d21a4d9289d224423a76e3d1d97e18f908f04496162f7c314817374cedee35d285a98c3bf251c7d8114ef6b36326d9bc8a7ca43f8ca1cc5 SHA512 2306d0c88cbf1f7fab01cfdb7b84e9cc30fc5992307050d6e7787017551f37945584253677e485dc3636d5e5dd945d99758fddb72cd0519d1f605d831d0ebac9
 EBUILD gnome-user-docs-3.30.2.ebuild 935 BLAKE2B d11ca611a5421aa54d21a4d9289d224423a76e3d1d97e18f908f04496162f7c314817374cedee35d285a98c3bf251c7d8114ef6b36326d9bc8a7ca43f8ca1cc5 SHA512 2306d0c88cbf1f7fab01cfdb7b84e9cc30fc5992307050d6e7787017551f37945584253677e485dc3636d5e5dd945d99758fddb72cd0519d1f605d831d0ebac9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.26.2.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.26.2.1.ebuild
deleted file mode 100644
index 0ec2de174a59..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.26.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-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"
-
-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-user-docs/gnome-user-docs-3.28.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.28.2.ebuild
deleted file mode 100644
index 5a4843ad273d..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.28.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-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"
-
-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-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index e43d06b3e01d..5018df4386de 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,6 +1,6 @@
 AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6bd0341d2c4ab42b2eb5ca331deac58f669a02bdf559fc29e01cd028bcfd3494733e76bf649d4ca77836307e219c7060554b251583 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b
 DIST gnome-user-share-3.18.3.tar.xz 347528 BLAKE2B 32c3a5aa84438e8bc276c6cf21fb35325b2b2c31f73bd301f73bdfbb91d90bcedf66c02b249dc047fb23eae2b7740097465c3a4164113d05e6811fec6f719d6c SHA512 3f8da3cc6f73aa612883252982fac0c53e35184ac0d31f210b525fd04dd8dbffb3f7be4c331309ea9df6a712000eb2d29f75224505c822cffc11b3d435e17991
 DIST gnome-user-share-3.28.0.tar.xz 393516 BLAKE2B f17efe9b763b14bb67837d65973f1125ac2bd9d49dabc359aca6fa040cb32d656d71236e306b4e97b39e49e07198aff4b3f456d62937baeff01b50d1a5ccfb67 SHA512 1b7ca604fec69402312f801d5b7117d99cb82bca674a4e4d279bda8ba9ca96c70dfd2c815d571094c1a95eb0e9084cd560445257dce194f6050d68c17ae4bb1d
-EBUILD gnome-user-share-3.18.3.ebuild 1338 BLAKE2B 41b790537dd9ee808d10f03cb98e95feadff2bb0c9d004e92d8445a760a0d5f41c4bba6dfe6a32dcbecc0ebcf4083b5ec9bd7750c806343dd45b4869718ca4e8 SHA512 0fc7927a387ad1a2f6f8d3ea0fed37d9ece10d76832905659bf6addf9047100f688bf38ee0cc409482fb4f73b3e3e28f53f91038834ef4af0cd07d742b5927a0
-EBUILD gnome-user-share-3.28.0.ebuild 1338 BLAKE2B 34f2b7d73577be9d96d61197ad3972284a745bd0184e82aa16846a0bb22b814c26df42492e1d8c70927d50a1328c620ca12854e0895ff541696e77f91a2ba66b SHA512 f6758a5b48eb820741bfcb1348f9d290d923a4acada240743e09d1346d8f031ac21710349c67d3d92495192d591968075b6a7a30c43156b1808775230e305d9b
+EBUILD gnome-user-share-3.18.3.ebuild 1353 BLAKE2B d614da2fc04b9667786b9a61de7e30127a45927081071d35c7b4e9f6f81da4c1c4d236789530f1c9d7a6878a2a461d88ad3e75ffcb7a8c84ccdf060a927d905a SHA512 a0941d9c348292dc42c06e17c91e9a92bfa322553ba8f0b06027ec875621409b28a2e67fbee82c01351fbe8c818d8f48f3ea2b47bd37c71fda5e1a397ca2dcbf
+EBUILD gnome-user-share-3.28.0.ebuild 1356 BLAKE2B a36ecdf66fb65324bec407683e4abd5d8104316d025424dba0bd1bc87ff199d18d88911b6705ac0d736969afff97f9c6d143321d0903b32c36b002ba238709f0 SHA512 eb06ae3bc683d01a28a9c46f2fbd32f2ed19f02c981c72c6c5d077f87e27a899ce9adb1657fc8fffdd1f2f35b00a9e8ac515a9c4b8b9880e6e886f8b1a960fcb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
index c102ec8b6bba..1004a4eb84ca 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	>=www-apache/mod_dnssd-0.6
 	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
 	>=x11-libs/libnotify-0.7:=
+	sys-apps/systemd
 "
 DEPEND="${RDEPEND}
 	!<gnome-base/gnome-control-center-3.9
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.28.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.28.0.ebuild
index cb7ff280a169..65fff3492b9f 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.28.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.28.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	>=www-apache/mod_dnssd-0.6
 	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
 	>=x11-libs/libnotify-0.7:=
+	sys-apps/systemd
 "
 DEPEND="${RDEPEND}
 	!<gnome-base/gnome-control-center-3.9
diff --git a/gnome-extra/nautilus-actions/Manifest b/gnome-extra/nautilus-actions/Manifest
index a700a8a5ad5f..8457f4b5723c 100644
--- a/gnome-extra/nautilus-actions/Manifest
+++ b/gnome-extra/nautilus-actions/Manifest
@@ -1,5 +1,3 @@
-DIST nautilus-actions-3.2.3.tar.xz 8238308 BLAKE2B b0a385e2d05794d9e50eebb88ab279a49228493302358f3cfc66a8b70f4defbe7b368190e11c52087097dbc2660a6e251a3930e3415e7e8d6657487484c03f3b SHA512 1b9e4e622ef66b1a05b0a9426fd0de929d8d890a836c4fe83cd127e94e07b33652d6087c9c556e0b56b7724c5f7e328a7e56df3aad517f4add940a96f460ff45
 DIST nautilus-actions-3.2.4.tar.xz 5148812 BLAKE2B e81edf846219b89f3585743d8a3601f21483dff86d601415a968d7f50f9fb4b889038593796d1b442f0395f0c649e7c5c3639b2fc0a42dc05bb7ba6588247709 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0
-EBUILD nautilus-actions-3.2.3.ebuild 1220 BLAKE2B 547c8cc69486b962f48533d0cc4726950cd3cf9b92366bb90a85afb3e03e12942f6d08a2ac411f8095a0113f6b6abcfc19640c6175618720f26a7485102c0488 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298
 EBUILD nautilus-actions-3.2.4.ebuild 1220 BLAKE2B 547c8cc69486b962f48533d0cc4726950cd3cf9b92366bb90a85afb3e03e12942f6d08a2ac411f8095a0113f6b6abcfc19640c6175618720f26a7485102c0488 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
deleted file mode 100644
index e26c5a7c91ab..000000000000
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
-HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
-
-LICENSE="GPL-2 FDL-1.3"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.30:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libunique:3
-	>=gnome-base/libgtop-2.23.1:2
-	>=gnome-base/nautilus-3
-	sys-apps/util-linux
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	>=x11-libs/libSM-1
-
-	!gnome-extra/nautilus-actions:2
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# install docs in /usr/share/doc/${PF}, not ${P}
-	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
-		Makefile.{am,in} \
-		docs/Makefile.{am,in} \
-		docs/nact/Makefile.{am,in} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-deprecated \
-		--disable-gconf \
-		--with-gtk=3
-}
-
-src_install() {
-	gnome2_src_install
-	# Do not install COPYING
-	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
-}
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index ac62b6db5092..c20b0046b689 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,9 +1,11 @@
+AUX 3.6.4-tracker-2.patch 779 BLAKE2B cd678e663a2579521cbd91af2bf194c436be8b7d2a1b749728a3fc3616d7fb1585922c4ca76c27e7079c1fefd1dc1bb7a595716576b23f097aed7ae6c8601983 SHA512 a3ee36493aef8ef0b5d32a4ca43d961420a263f970f4081888a8c7cbb52e94b9c7c3bfcb9b9ae50454c773305915f1e201b4d1c85520a91d9c0233c35195b178
 AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5dc2779332c8d5445a3f7dd40aebbfc0080acf812a766e18b7119b64f283f76552b44c025c9a1370c4 SHA512 0a07de349129f7a81e2e02ec99008d091544b0961efd3188a2309489c3c48385d485194615bbb4d7817c0e651ec6a6a197861cb5f2d5841c990d2d540f58672d
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
 DIST nemo-3.8.5.tar.gz 1424948 BLAKE2B fc773f7a1666d94beabfaab3b1e97c4a6f32cd61dbb2e5eefc57cb3fd577df780f5d220501d7dbc6c67955afb9a623d36d1631c8b3c5e201894529784ac1991c SHA512 8ae4eafdd056e7e33c722c96a82e8bb5b10617823397927a3247e27bde14a3083f4402cd7e7bfc6a4f7802fe8c7aed005fa912a9855b6accb36af3a7f63b3188
 DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
 DIST nemo-4.0.2.tar.gz 1446758 BLAKE2B 37141bf514b4a17a41876a643f89cb489a7991d2ef0792a23a9b5b08ff1462733e820cde3f23dc1943dec90eb57e9d68ff1e58e526026c738d3f3b71cc0b7957 SHA512 d2c60f379092dee79902877beb2d47d2cfcb4a22b1f86fd84fafb96367c74cc2cd060bdcf8c7fef28ef5ff6df488a4a15f0c8b9fb1680eda26a13208a4a5742c
 DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
+EBUILD nemo-3.6.4-r1.ebuild 2104 BLAKE2B 5085117349473e64789395d1d764aebd2e5722653de0ad40288b7b4aa317991bb4e122076580ff3e3b1d7e95d658a18dae6c69cc79fdde190bc1b14d3d659fe2 SHA512 f30a798f92fc42bc04ea17e41f3ae9ffec1ebbf7f924575967bf7bd63eae0a4bf2373109466f0b994c7a442c973a7a2f22d66e3606b009b9f5f1504c78af20ed
 EBUILD nemo-3.6.4.ebuild 2084 BLAKE2B bd1ced9533fa6c2f65e4c4cc09a2cd0b25a46beb1a30c1ffa96ed8fa4a199ba6d15176fa0ad99051b6c1c836c67ac9495df0564a8b7d1cc97fb89351d3f5fc09 SHA512 1108f55d96be0a639eac59a83acc89a14c26cce5bd02bff37df8747f96034db565177d01bc135a653b4bad0d32543b046a80250f1b2d25c383a608073b1d97ed
 EBUILD nemo-3.8.5-r1.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
 EBUILD nemo-3.8.6.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
diff --git a/gnome-extra/nemo/files/3.6.4-tracker-2.patch b/gnome-extra/nemo/files/3.6.4-tracker-2.patch
new file mode 100644
index 000000000000..3ce71c3b6c2b
--- /dev/null
+++ b/gnome-extra/nemo/files/3.6.4-tracker-2.patch
@@ -0,0 +1,17 @@
+--- a/configure.ac	2019-03-31 12:55:38.555837300 +0300
++++ b/configure.ac	2019-03-31 12:55:53.882694611 +0300
+@@ -190,11 +190,11 @@
+ 
+ build_tracker=no
+ if test "x$enable_tracker" != "xno"; then
+-  PKG_CHECK_MODULES(TRACKER, tracker-sparql-1.0, 
++  PKG_CHECK_MODULES(TRACKER, tracker-sparql-2.0, 
+                     [build_tracker=yes],
+-  [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.18,
++  [PKG_CHECK_MODULES(TRACKER, tracker-sparql-1.0,
+                     [build_tracker=yes],
+-                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16,
++                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.18,
+ 		                       [build_tracker=yes],
+                                        [build_tracker=no])])])
+   if test "x$build_tracker" = "xyes"; then
diff --git a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
new file mode 100644
index 000000000000..b28b79b73bb6
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/xapps-1.0.4
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.18:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+	sys-libs/libselinux
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+PATCHES=( "${FILESDIR}"/${PV}-tracker-2.patch )
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
+}
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
index ebd6c8fac46c..c3be1010772c 100644
--- a/gnome-extra/synapse/Manifest
+++ b/gnome-extra/synapse/Manifest
@@ -1,5 +1,3 @@
-DIST synapse-0.2.99.2.tar.xz 444156 BLAKE2B b1fccaecf6ea0d8623e305852e3ae21bb0f95b38a086152643bfb15f82c59a27fc499487ad9a3dba56378f260eea26a43a76bef11220b9e24b2027b1a1a8f8ca SHA512 e4b6e0399a83fc7880d786e8cff6360850d5ce1ac2eabccb5ce6d3989e4356c42adf1155905b39bb6b10887c02844dad01cdf8d556bc4bd6c7cd11956f8116c7
 DIST synapse-0.2.99.4.tar.xz 538476 BLAKE2B 27de41362ca53c06ba70d9b0df728aa64e72f19b726b5e5cb4797c85bf296c43969b58491430c585887e0a74339c49399bbe415c13827fa2b0243e8b1bdd8598 SHA512 d9668fb9dd18d97da89bf5f0a9864f843c629f91751b326b4e97de74c6db64a59dbcd221f1b6ed0fc199a683ed511d86f280756fe4c21195d6169d2977315325
-EBUILD synapse-0.2.99.2.ebuild 1282 BLAKE2B d0d0bfc974526192db4cfeb8a6c7a81a04039646e376e9389dc839a47baf958fc802e347b28dcd89e99f349ae772262ca96e5b02926ea86544491d462e894aa1 SHA512 17b301019a858ba552b442162e9e5d063a771958f83723118c8c2034c6ee7204e7f572d7f2d613e8cd88bc6f838666cb7bd467655fe49c5516c62ed144efa5a1
 EBUILD synapse-0.2.99.4.ebuild 1076 BLAKE2B 065572cd3696fc3448a70d7638ebdca23bd1985ec92f1b15ce1743eaf62b245a2dbf8949c57b038a05b6fa734e6d2b29c6ae086921c004cda279c5a3082eae43 SHA512 d83192c14dcd140ed15be88c85b683b2dd058751d18c8741be5510aad5b9944d49b26648d4bd32eaef86ec611c7d602d1d443d8aa6bf1a7c52d5f568da28ebff
 MISC metadata.xml 560 BLAKE2B ef850f79142061b442fcc219d035da011d7612bc2ce90deb91ebb03f36220a3c208cc2f10999dcf41736315e238e9e852df96d4afcfafb048f7db3fb35a3668a SHA512 acdddee273553a76c960f0774eb777b2ca0aa1fd165a36f1d1b8373bba1b773acbbd9dd28207d892e32e07abe276492d2ba1aa5b67ccee0e1273d938d5ae6be4
diff --git a/gnome-extra/synapse/synapse-0.2.99.2.ebuild b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
deleted file mode 100644
index 9c6818eff3ba..000000000000
--- a/gnome-extra/synapse/synapse-0.2.99.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no" # gnome2_src_configure is not being used
-AUTOTOOLS_AUTORECONF=true
-
-inherit gnome2 autotools-utils vala
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
-IUSE="plugins"
-
-RDEPEND="
-	dev-libs/libgee:0.8
-	>=dev-libs/glib-2.28.0:2
-	dev-libs/json-glib
-	dev-libs/keybinder:3
-	dev-libs/libunique:1
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtkhotkey
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/libnotify
-	x11-libs/pango
-	x11-themes/adwaita-icon-theme
-	plugins? ( >=net-libs/rest-0.7 )"
-
-	#ayatana? ( dev-libs/libappindicator )
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable plugins librest yes)
-		--disable-zeitgeist
-		--enable-indicator=no
-		)
-	autotools-utils_src_configure
-}