gentoo resync : 21.12.2017

17 files changed, 4 insertions, 306 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index ed31fd54aae9..c159705ad4d9 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index c6efda3a8972..54e930f3db03 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -3,7 +3,7 @@ DIST gnome-commander-1.6.3.tar.xz 6653164 BLAKE2B 04d39ad7e19939b1791de838a03a94
 DIST gnome-commander-1.6.4.tar.xz 6678752 BLAKE2B 987aa7ff2b34df163a82a9e1964d21860a90ba2ff6fb71190ebfec245090a9ffea1aa8a45c037cd848135dec7a56b7cd26e31d70be8c5ce3f24ad132cff3b19a SHA512 00fcf86025b69a38e68b2c69977ffe54e8b00028176163ce746824a73faed55eeff2fe37eea2e191fd0e7fc1901e2ed701938c3fdfabe9e9b8bdaaec152df0e0
 DIST gnome-commander-1.8.0.tar.xz 7433656 BLAKE2B 686581eb6775e336928f18f3c817d4d34b19da2c5c91660e453223833b24f6bd1400d8ecf2ca3698fc18f2d926343006058b00fefda889204f251b223d6a2d34 SHA512 0023528301812431bffde4c0d314d07d2399d450604bf88426078cfbeed5ee286f16ad0037f85c2b281e9037fd0c622aa92a4a5be055c198d9bdbd3d211c197d
 EBUILD gnome-commander-1.6.1.ebuild 1646 BLAKE2B eeda53ba1d8701c2b54b358dc6c8c602c90a229402aa50695a6cf2db8510138404ce5e021b25f2d5aac650557017696c453064d73e43bda7bc3e9120cb4c15de SHA512 d20e75f3636b5f38de32bdd91a59cf7c32990618540ac4cdb26dab691211eafd2cb4dc8a15321a03a08ce0bc1bd539ab45eeef9642192f5c5bef4f1cc7843535
-EBUILD gnome-commander-1.6.3.ebuild 1690 BLAKE2B c999288ba55e1425675d1ad9aae93d5d4a953ecef0cdde2c38e62adc97db72a17ba9298e9f0577651bbb602bca56da5a0c8c345654d85449ad400296c537ca45 SHA512 9909e42c97024ce740d512b71a2c613c64e16e0917439bc6190d1882cd13b17fc8db9293f7e64889c9477484121c009d750fb849bb6665b3d508b84bfe1a198a
+EBUILD gnome-commander-1.6.3.ebuild 1689 BLAKE2B 9e49a1c947fec74f9315728516d0844cb430caf4e11d22a8bbb1ba43556bec0478ed0a3fd6281686b4f6a28f9cbdd0f7c241e77035d69022176a017ee90b9ec3 SHA512 5c8e045fb2bc379231bfa57f57c2241abcebcfd9541c8e36b7c4716242f89a08bca26e48e97a52e1e2d271f24f10e3982e0c2db4d277c8d09f36990ea7771d48
 EBUILD gnome-commander-1.6.4.ebuild 1689 BLAKE2B d15a4b3994c54b101a25885b5da98db65391d363db11fd1559781306f6874c8a87c76db537add0f0cfec505ba409f5724bb5c7d7d4d8321fe88cc586b40649fb SHA512 f0e82260e869ad2058e29556fed7f3f98e057bb95831c9f869160e5a1ffe14255bad9379278781725ab772b2653ace2d8d1a4144b821abb9fed1ef621c61202f
 EBUILD gnome-commander-1.8.0.ebuild 1661 BLAKE2B 37d4213c719206cf8487ca6ec19b810eb00c341418418d72e7171b6547731b2f8a786d91d1cf7fc3cb40449c753458cd2e39487475abbeef028628830d7669d6 SHA512 f485244eeeec66c9c203dfa0070429e04f4a8627debe328ded6ccbbaa3df32aa777ade92cac15307aace0a33563cbfa88b154e39a2a0954cdc6a43ca369c029e
 MISC metadata.xml 1341 BLAKE2B 8ceb1a86be32727932b2fe9d182aa4fd270218917410a4b573f3a6b798b33bf5149986ec019712e274572f7918fcb54d53fb12775d66620dbb1bfe29234da764 SHA512 d3f4147f6cc33421f3a4fe4dc44db301daebe435c31e94523f8470733de5f5b5a4873fbf1a7e7a2be18a89012a6686d704bfb7a384999372932b4896f1f25a4d
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
index 93bec890f5fd..0c0da091a84d 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gcmd.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="chm exif gsf pdf python taglib samba test +unique"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index acd89f28de39..f33285beaf7f 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -2,5 +2,4 @@ AUX 3.22.1-fix-vala-0.35-part1.patch 884 BLAKE2B 2994fc2b28bbe8f3b547542b100324f
 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
 EBUILD gnome-contacts-3.22.1-r1.ebuild 1840 BLAKE2B 3678c0ff5796cb2bfed0d35954e0553bdb6b94c79fd9e4d120fac3a307351c948c4cf2d733878002907af6416548ef6c18063fce60a48b022e3f0faa9130e6d2 SHA512 81cfe1119ad2b63bb3041eecae2b4a5b0dc0e1b8e4901f6ad74cb1c52004abcd820dd131f3b2bac0e0d7b067c69c2a53a84187ab7f9019d991f81de79def191d
-EBUILD gnome-contacts-3.22.1.ebuild 1629 BLAKE2B 7e34fc6d5ce77a66daecd307f94c02d16cc47c526286174ef7bfc61a7e1211e741ad1f51e58ee70e14883ec6f97e77ca29d5e90e883ba9bfbcb52de0fa8a8de0 SHA512 17fa5224ea43f39ea97a2936e2cc1e8ac63a9cb90904db43da9c12368c611eaec0a27e9777604ba37fc4defdb92351d99faf8d526d22634cd50ae8d0359897ca
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
deleted file mode 100644
index d1c0351111fd..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.9.5:=[eds,telepathy]
-	>=dev-libs/glib-2.37.6: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.17.5
-	>=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
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	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-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
index fe6decdf9f3d..ef0fa706f51f 100644
--- a/gnome-extra/gnome-directory-thumbnailer/Manifest
+++ b/gnome-extra/gnome-directory-thumbnailer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-directory-thumbnailer-0.1.8.tar.xz 273896 BLAKE2B 570d65967ed1c8117664fb54ea25197a411ac8fb4f6f73225a5caed22c2c11ec309144d9b31bcfc9783c7771c6ee7530e2dc60cce998ff953cc61b019a46d49d SHA512 ef4ca209897a6eaff635c840a66d175b3b57896167199a51762e4089bb9b5518f8700c3534019dc14a2e6a6542fb131d4d01d5c459baff2f7d09f7775e20bbb5
 DIST gnome-directory-thumbnailer-0.1.9.tar.xz 275432 BLAKE2B e95d3374e89e8a9dbd457e04c03709603b8472745f71831bc7b41d8d28919a4ff76218a7a8f978727424af924fdfa29d637790f951c103dfdfb3395181de1d4e SHA512 c7299eb5127ec138aa5ac1ea0a5c5d3511a16b4d71ab6c5fc5e0baff04837e282d5313293623f312a448b2f3ef0a83f5e7d805f600998cb1a4a7b29b89d243e2
-EBUILD gnome-directory-thumbnailer-0.1.8.ebuild 493 BLAKE2B c5580b916cc3217875f29404bbf0b1452fa30d3770a7d1ecc96bc4f1a42a3c4ab493d6ebec61d27e77cfa99c3b1878a5e8a1eaa96bfb9bbc4499dfcc7d73fe15 SHA512 d23a02fe26441374764d02c54b88ccff52a97ad35852b002864f01c01800d9c54ac6acd1658720cdfba78a16f1dc8dea5b6bd6ddbf6d71186d88e6eff4cf7886
 EBUILD gnome-directory-thumbnailer-0.1.9.ebuild 496 BLAKE2B b900533b7125268fd4e17059d8de3a6d2b160ba0819a2618b35427a2e26ec00030977fe0a083dc1b383d6e90dffaf1c520341448ab6f3e70c25a68dd5f377c7e SHA512 0c4708d1cebbe2bdb798de6f1dc14c6603bc81196941817b1931c04d082558fbc261a8924627697143e94d4d9e2d7d25fb663066593db02508f564557cd2d82b
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild
deleted file mode 100644
index 117d97485ea3..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Thumbnail generator for directories"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=x11-libs/gdk-pixbuf-2.6:2
-	>=gnome-base/gnome-desktop-2.2:3=
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index ce2fc58d127c..c501316e5fd6 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,9 +1,5 @@
-DIST gnome-documents-3.22.3.tar.xz 2314508 BLAKE2B 77eb9aa3aa614ea998d5b0c77b0e8284efde926dae68a100d90986a96b52c893fd13d003286b85562127ae7960411db526fd7c3abd625761bd42c94221cf8111 SHA512 1984d83a8246a085a1fe716ba31da738a3976b7900c993f4ff57c290bdf86d1223b856bc9aabb071c6d9579c994f3468fbba2653e086f15725a43ff5eb534a02
-DIST gnome-documents-3.22.4.tar.xz 2311320 BLAKE2B d0ca4a8dcb04f6ee6be2948d76b6a2f9aa15d49c2d63946b53ea1fe72add344a2c992233535e9e087a6c2cda0a2b2b82a2500a5ae6f7f98527abe92f4053067e SHA512 a55ba63c930830dd769b0e15c9710a9de6bd065cdc3131fa735d205cab7ec8b5f0c3a7ef89e55965fc95ebf4ead653aa087166c6c251aa33d95e22529a343578
 DIST gnome-documents-3.22.5.tar.xz 2312164 BLAKE2B 09ccc89de43b81a2a9f5d0b85e616089896149559a34507463ac698362ffc72ea135fd660215d29fbc6d9e09df9745b38aff4b3d5ae9d62692de05262bdf3b60 SHA512 b074c5f5a5d7a698f3e571005a523f48928eca4081df7cfba6c97a0178b59ef3071920e5622e6200c8f59125fee934baaa2f07b8c011f8a4c2338c8488d0c516
 DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
-EBUILD gnome-documents-3.22.3.ebuild 1342 BLAKE2B c4a15be3f240291317606b46decee0c4358a97785d57a6231a2f9587abd6fe99ca19577470097b4e4010611375343db3dbaadb0b4c12eb4cfed01af46e2fdfbe SHA512 72538607fc381227a6e7a3262607a6c21f2dee5ab3825a4e135205fc59f10e438e33fcc4034991f726920ec0d9e0a8d4d4634db08ab6e461587b094c2b76b1c5
-EBUILD gnome-documents-3.22.4.ebuild 1246 BLAKE2B f653391b88335025f1d715ed97aba9d0c67a2f66162fe75603c869712c421e317f2755489ea3fe2c3763906840f049ea7764e4aed404627005c6d886b55d1008 SHA512 b88138e0ef03c53fe282df60b50a2ae5a8052130d81a0bbb78b9bb85b623e5d4573730d6b97caacdb4a184a62ea2998b078c983c067044da94d46bd690218f81
 EBUILD gnome-documents-3.22.5.ebuild 1244 BLAKE2B 41dd0a635aef79cc1e76f6509b615de814558f3dc9dc3b8b1da6ad90fcc3fc55cf05d0ff2ca1067e9efc92e677d1e73717c7f36806374366f5fd209e91e5f080 SHA512 6d8f0c736487f0e3811523229c69b649f9bb5f583458cd0da81182211de94c00f9c23c7e8fabcc55b53066d01058844d82c2eedabc078cbc7d72a137dc65a1f3
 EBUILD gnome-documents-3.24.3.ebuild 1247 BLAKE2B 1d5aea5354200fcf2658349b866493d1c8c79abc5db546ce83f4878a6f8b336411399dea728bcdaa76ceea93799e44474056117ca95838fe7f46c2912859cbb1 SHA512 dd0c45e70f8314845f504289bda7763383b95db04e859172cbdeabfde3049885017571538ac26b770a2dc9c7371c22c9d887da7eabc16ae010bc5167cdfd7579
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.3.ebuild
deleted file mode 100644
index 15ec6da700cd..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.22.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
-COMMON_DEPEND="
-	>=app-misc/tracker-1:=[miner-fs]
-	>=app-text/evince-3.13.3[introspection]
-	>=app-text/libgepub-0.4[introspection]
-	dev-libs/gjs
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6:=
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	gnome-base/gnome-desktop:3=[introspection]
-	>=media-libs/clutter-1.10:1.0
-	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	>=net-libs/libzapojit-0.0.2[introspection]
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
-	>=x11-libs/gtk+-3.19.1:3[introspection]
-	x11-libs/pango[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/clutter[introspection]
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.4.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.4.ebuild
deleted file mode 100644
index f71284f3fff5..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.22.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
-	>=app-text/evince-3.13.3[introspection]
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-	dev-libs/gjs
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6:=
-	>=x11-libs/gtk+-3.19.1:3[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	gnome-base/gnome-desktop:3=[introspection]
-	>=app-misc/tracker-1:=[miner-fs]
-	>=x11-libs/cairo-1.14
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	x11-libs/pango[introspection]
-	>=net-libs/libzapojit-0.0.2[introspection]
-	>=app-text/libgepub-0.4[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index aef53b4952d7..3e4f267208f7 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extensions-topicons-plus-20.tar.gz 6173720 BLAKE2B f43a14f932b4fb85560fb0b580b115187c5dba13053c2f1478275064579beb6d3010deb08d8165fd14384da22d1e2cbf4fedbfbe39097236531e8509a4c9bfba SHA512 89feaf4a42f1785c7667ba451efddce2322599c5441bfe66c8bcc72fa3c07bbc2535e34db5383ab9c5b38a61f83ec6ef245473f2c269708e4042684f2d7a07bc
 DIST gnome-shell-extensions-topicons-plus-21.tar.gz 2756641 BLAKE2B 39414711365a9c68fa2b0172859e9969a7f71eae5e7498abee9ff05e4c215df09419cdad99192c60892b1bd6e8b27724c81c5d3da9a3d8ca3072d984824cb950 SHA512 f85db46f20c24f0b11ce2c79c0548b88262faf059d674073e328917dc8497de0e07ccd6f3613f45aa9e49109468d78293f3a8f0f4fea5a24a7c5254666cda5df
-EBUILD gnome-shell-extensions-topicons-plus-20.ebuild 1165 BLAKE2B bbf5ab26a5f1542e5e95da742e5f17978abbf10c788f572105704a2a54d19fca3483397678974fb3d33d50d5bd14bbc14e6b010e92b9c2652c1f685e37bfb571 SHA512 075f4a6f42c2fa12c4e24baa6465c157e137bfb1fa19e89b1525cdd0ac61b1dbf49fced35f241cc023f2fd5d60e0c22610ce0f07fb8d13eb958e4a71e149c15d
-EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1328 BLAKE2B 1d081bf05dbc8681c8aca1a9bc3d0da67f6ada77c854ae3329dad4011bc85be654aea34898f7fb331e661bcfb7f21551e148f38d1d7335ff574e563f35eeea14 SHA512 9b2dba6a07a48ef07fdbc9462fdc9d7663b63538be900ad166af5bd02b5acabb5324aa9475a265bb81c0252134aa61fa4ac24f761a50b6993bf554091b6c2e47
+EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1327 BLAKE2B b8d030527a7364996f2258e5543344930ec64e2d4ff62d826f6e983c718521556f04789d9db36e121868e7227f983a473b9c53d700231470a71d9322c48b30ff SHA512 f18583531b6721b92fed2ac2b81c3ca3137331464196a05c4fad7ff02c21f33dbade7ecc657a1ed7274c5b231253f549f80b16013b8ece623773b06a3b14409e
 MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-20.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-20.ebuild
deleted file mode 100644
index ce20730a5df2..000000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vcs-snapshot
-
-DESCRIPTION="Moves legacy tray icons to top panel"
-HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
-SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.16
-"
-DEPEND="${COMMON_DEPEND}"
-
-#src_compile() {
-	# It redoes this with "make install" later due to a dumb Makefile, so don't bother
-	#make build
-#}
-
-src_install() {
-	# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
-	make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
-	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
-	dodoc README.md
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
index 2be0c5c02620..852ec51263a1 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index bc87694b543c..8cda69248766 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,5 +1,3 @@
-DIST nautilus-sendto-3.8.4.tar.xz 380180 BLAKE2B 9a3612a80fe7e72041befd7808b27b1ab3fb43365576c6d7ecf2d3711029ea83a0ac41b43bdfc643946ad29136e18a86f9b966a45ff3e45164cf1e7976b4c47c SHA512 e6ba8fbb4646dce710119e2720b3482ecdb7e99f1fd53528de97ed015519aaf8bfe2339091630813e7feaf2d2d9a9a8495568c294fc00472046370c4e097df86
 DIST nautilus-sendto-3.8.5.tar.xz 382440 BLAKE2B 30c842c04838c52eb41b1d808828ea7a00a9811a634f96e7bdfb559eb01569db6bedf0f4f6b504df8a5a13c1400ad9ca548298faceee9abc97377d034ab41dc1 SHA512 d9b504d5615e761f19b7b4610d394ac9b928023163b3e416aca114f168330d3b35617ee8e80338cce2248151096a6e2094576e7978b80076d5eedb9bb847bfa3
-EBUILD nautilus-sendto-3.8.4.ebuild 818 BLAKE2B b380737a48e26a9fbc5fdc1a889fbb8ec7b1e58ced683f657a7af1bbb06290da8ba1b92e49c6b8f45b9ac89c2d43ff8b7d188092c89a22c71f03d869c8588789 SHA512 bb9289bfa58116ec876ced8c02fbb57d09e74dac8bf11703cd0ab6aac62ad2d02de0327b2b6ce874c9178be5ca3d1b0d0e2eedd565d153b13ea415f74890109a
 EBUILD nautilus-sendto-3.8.5.ebuild 997 BLAKE2B 571fc12497f3238790e580b907793fac2a09f3b54f0c0b4ad900c76f2df54e6b8cc3e7388db9b105099c9aa64363f154ea767a7cb3afae8cf630651cecb71dbd SHA512 a1cec99ec57bbfa246e6baf6e513dc69ed2b15e27749f522474dbb5ff486d2fba7132c5ed12b78d51e6315cd043a31cf22038e2aae91d48e093d807a8df32b7e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild
deleted file mode 100644
index 859cac8f1e20..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A nautilus extension for sending files to locations"
-HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.90.3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Needed for eautoreconf
-#	>=gnome-base/gnome-common-0.12
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Does not require introspection at all, bug #561008
-	sed -i -e 's/\(^ \+enable_introspection\)=yes/\1=no/' configure || die
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ')
-}
diff --git a/gnome-extra/zeitgeist-explorer/Manifest b/gnome-extra/zeitgeist-explorer/Manifest
index 416b14813338..8a19e6ccf198 100644
--- a/gnome-extra/zeitgeist-explorer/Manifest
+++ b/gnome-extra/zeitgeist-explorer/Manifest
@@ -1,4 +1,3 @@
 DIST zeitgeist-explorer-0.2.tar.gz 25503 BLAKE2B 014aaafccfa97c39288454d8051efe564553f4b9df8edc71de51b55081e8c16ec60772ec41c78d9249010d15e4d672a93e8526e23a41c57d33ae22bef2231224 SHA512 05e16e4c6980ce0dd23fb3f74d0c45aad6e5a31d5b8982d04d20781c3527e4e1b768e75e67664fe5731202a3682c972fd759a71d58b420b31f72e3eb2dce7788
-EBUILD zeitgeist-explorer-0.2-r1.ebuild 681 BLAKE2B 5b01cfb1d59c774e6601d87fa142556814fd2b18706072c72fcf924459cc9ca75c7df171d26b15a901ed5199836505f98b78a00425e1319edc1af43c06340caf SHA512 9f5bc87a5283ae8283723847bd8f8078965af58e330b9ff28bb84dd531de5719c2081d0c7f40c6f7b6272709137daf6a395a06fc19a710acd715432188ed3383
 EBUILD zeitgeist-explorer-0.2-r2.ebuild 759 BLAKE2B f4603cc74d0a8f726d0f611e3b37ef2432243ae474e018c3f72722b450d9727970a893a2918ff2b5ff438c57b184fd482491aef9676d5ca71aa24312dd43c4e1 SHA512 e1170ec43945f69baa26060c312bbee8b0cf4215a6e2cbf07363f2c642c0d81d93e3f57a173255011e3ac540f826bdf9898177bc01a75d319f5f5ba62537f5a2
 MISC metadata.xml 652 BLAKE2B f02195a4832357d98c9143d4ed3cb8019969c6ad442e5b5f0705dbdb073bd8aab3446fcca7a39315ce72c629c33ee254f231a750e993af58eb1f9304fdda11d2 SHA512 41c21eb81de4f03343de4fee248428c4cf8088c3847c87c88064798aa2106c70570d2b8e72190968d69475ec6becc5a55d8c60693bffe9d3c4d0924d6e6125de
diff --git a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
deleted file mode 100644
index bd1ec759fa81..000000000000
--- a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Monitor and inspect Zeitgeist's log at a low level - developer tool"
-HOMEPAGE="https://launchpad.net/zeitgeist-explorer/"
-SRC_URI="https://launchpad.net/${PN}/0.x/${MY_PV}/+download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	gnome-extra/zeitgeist
-	x11-libs/gtk+:3[introspection]"
-DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"