gentoo resync 04.02.2018

36 files changed, 0 insertions, 1026 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8bca478abe03..24f7c58c2df9 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 5e3c10bfd0fb..b32dd7c69df4 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,9 +2,7 @@ AUX 3.24.7-DESTDIR-honoring.patch 1122 BLAKE2B 73d95683bd162f0e93de3b005787b2aa7
 AUX 3.24.7-libical3-compat.patch 5323 BLAKE2B 5a2392751b009d6726490cbd11227d1d4c5ed5e61c8d0b6acdf282182dffcdeb31a2ed6395626231dc729dd9ee7b1ca26a3ce9148b3cca1fbdc83376e58baca7 SHA512 0b29c1d86eedf778d489a4a4c78bfc292898ceba2d90ac4c81aae2a0c65ac132e71de767f7a74ef839977c2fbdcc38da50579735e1775cfb5b2414fa304d19b5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.22.7.tar.xz 5564924 BLAKE2B 8107a13ef46a4457e122c5d719c0d29ccbf5ec61424fb6b4810b1e165bb68cb8c1c87ec9ab34446458321c0c56ba5a5408f45ae9fc95bcee965c21caaad6a230 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44
-DIST evolution-data-server-3.24.6.tar.xz 4252940 BLAKE2B 42a0a39a8248628964cfd026e4b8bc3794e897f447aadb73e0e7870865314c47d6de11a1aa85d6e7fcb0a414a3552a74cb3012c8a6d4908b280ae7440e1154d7 SHA512 01eece83217e66ce7e08e333ceaf38bae226800dd8a015dda29583b0155b9f1fbef4f18d95a7127d08421cd27b3203d2b7cc6a3bc0b5adba1b06197c85be96e6
 DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
 EBUILD evolution-data-server-3.22.7.ebuild 3689 BLAKE2B 4b37c74e6b0d27d4cd1061049f27e5044cd0319367fae2d521cd0a861076de52a52c736e009ee55ea93fae46fb38a7d1e63b3988d5d188dd35f0e034c85174a1 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb
-EBUILD evolution-data-server-3.24.6.ebuild 4047 BLAKE2B efaa725a8ca0c725bbbf5a45d50380a3cc08b164d7683af8cb63e5f3ecd790906cd0af3457d2ed306fc3bcac82737c800cc9be452c8d0694a8c549f49a626db5 SHA512 961f124186d8ade010b8c77ad34f07b2aabb16ffbbaaa93db1ec564a9fce8ef8de171b6890fc2685030f64f06781208f283caba45c29ce56688b5b43b4e826d1
 EBUILD evolution-data-server-3.24.7.ebuild 4145 BLAKE2B 57e6f7f7908806fa50aa131648aaae3e6a2a835826bd0184f0cc89a631e876e8c2bbca68442fb134855f4b86513b13c8fbc2f5e573ace476ee3f8e82b739f5f7 SHA512 3091dac9ea3d6ccc827b84d68fb6e08d1a8dc0579f2aa7e08f320628d58e1641f65186e104b1e6f15759261813cd7857bba2334335f849c4f69dbece01b89e35
 MISC metadata.xml 894 BLAKE2B 2b37b8e2f6a027c64cf3fa2e93dda6270d6d73291213c956aabd91d3cdbeed7b7f40d7738f22566059304c13cb4471d6a344b564d28c4d11e86ac159dd789ebb SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild
deleted file mode 100644
index 082f7b928c0c..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.6.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-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/60" # subslot = libcamel-1.2 soname version
-
-IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# 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 calendar data, bug #519512
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/libical-0.43:=
-	>=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
-	)
-	google? (
-		>=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/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-	    -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_auth_enable
-	if use google || use gnome-online-accounts; then
-		google_auth_enable="ON"
-	else
-		google_auth_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DENABLE_GTK_DOC=$(usex api-doc-extras)
-		-DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
-		-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_GOOGLE_AUTH=${google_auth_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 google)
-		-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 dfc8639e2bae..cb0d6aac1b26 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,9 +1,5 @@
 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.22.6.tar.xz 715320 BLAKE2B abd68ffce9a2b723a72e26d5c0991060c377f930c3f34e2f9244dfb53c449bc92d8e0bca60b64993369fe00370fb60920e405355c3fbe63b846e279de785045c SHA512 6b93faa67a6f546142b023086bf54ac34d6c7c4320ee136f58cc0ea5a018811af2080d5945c4dc68c89555a35a4194b2f92bd839b2142ae63690e94ed895b40e
-DIST evolution-ews-3.24.5.tar.xz 488116 BLAKE2B 8144f1eae7440993c2bedd76e5cdfb3354b32bb1b1093bf24f23c12ca8a36e076950dc015f89966532d6c5ee491262a979cc9bff47cba5146c08989becd2fb95 SHA512 eaa5096c09686dade6f1efddea2b706a73c292b06b473b0f2ef1ba15eb5a3d685678416a0f1de40296beaa893d5dc91b944a440440dba489df67a944342f2f17
 DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
-EBUILD evolution-ews-3.22.6.ebuild 797 BLAKE2B 364b2955e3d909feb216050230cb1c4b5cfe86b5e6e7ee934959913f4cfbc29314be5a68ce6f30ee2200a1f2dfef1a34ee299ae736acab8673453343348efae0 SHA512 0baa303346cd26bfc417cf8ee7fd2bdcaeb62980d6cda234b131b55cf7d3fb7638a9b127684bb2762453b37e1938ace02dabfa5bdb82027e99a7d8c30ceead93
-EBUILD evolution-ews-3.24.5.ebuild 1076 BLAKE2B 5c71eb434a6c91b53a20450960d8c89d19297c5f0af7661a3465c0201303b4af1b456387e6e18338bc927e4350883adb5c2c4119f5282401aab24340f80ed971 SHA512 9343a952f6c3d9b58a8b9bf6522107311de6c01f16715cb548cfff63d316873db07f05d1e61d4719dea6bad034b4998a8d65ed71ac1cf46a2e076d2c810c0be8
 EBUILD evolution-ews-3.24.6.ebuild 1306 BLAKE2B f82629ba467605d6c359c1b2c0db19a912332e6c1c32126a70919131d15b639bac496004c344a9078932fe262c5c84ff669aa2a3e30cdc5fd76ae969e9bd0675 SHA512 b270f0ec8019b39bd49157c393be0ba1bf305fe4dba9bb7a0e18e89c6095b6c0b5af662b21b9f4cb87c9f4ea629ebe36e339125976977afbc31601f516df2a7d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild
deleted file mode 100644
index 27b947f59e1e..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.22.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit 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.40: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:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild
deleted file mode 100644
index 87e553e77c4e..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.24.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 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-${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/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"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 2e3d4c4f2f88..da67e59af4aa 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-boxes-3.22.4.tar.xz 1704964 BLAKE2B 92409820ec7f0fd414d894c7721abeaf9a3d5cb44dee25dcbf54a880155cfc7b0f8605b54d8bcb1bc776b3399d498cf3ab183564da5b3dbc09053f25a98bd3f5 SHA512 98e923c67d116ad5411734415b96ced5cd5f9f2a03335c8b00835a2eae47ea46dfe72f0aa5819d6ac9310cb80b5c6504a9ef7c8e4d8ef4c35495aa8fa74ee848
 DIST gnome-boxes-3.24.0.tar.xz 1710652 BLAKE2B 0b574fcb54c9a6ab2323f08caabd8aa3d201bcd0f83fcaf6b5dc15aef0da8fc6718128f28cfa0d50c02ad341d699c1cbadec89dbc50c1a4bea08865bd8e3f0d4 SHA512 979d5c0f2cef052e2713508fc2fd46d64a3a325edd38dd0aa99f2e9700efd3f84916847b35487f9d7eb5e5e1c5f3b4b712b649fecf1523821c3488fa6b250026
-EBUILD gnome-boxes-3.22.4.ebuild 2651 BLAKE2B 1309d3a5d73d3c44cdf4f06e8ca7dacf8672082a40d650280b8d849933d0bd209f03c5a70577f5390f490631f092584751ac24f2e3f2fe73794677fd405b6388 SHA512 81a9fa766fd43e1888a013164f25a7135a3c25bad562b97afbfd7e6f466a0c08aeec3696e979116b4850c5c3e2e660fda82802b56908a8a238c1c38b7c6bd00c
 EBUILD gnome-boxes-3.24.0.ebuild 2651 BLAKE2B 1e7e96893c782328e4c58473318b017086688eb130cac63ad9c79f5009416c6455b9f1dced682226a83edee865895f9dcb02a1e0fb1e06483952a48bdbc34c27 SHA512 5eb8b4850f4eec7a193a2b13578d9c80bda0880ba8fa469b3c0f882b2c105493e308abcd3a333831e0d7e10874e90b1c7bf86557234187004b7afe7ffea1ad99
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild
deleted file mode 100644
index feba37477a4b..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.22.4.ebuild
+++ /dev/null
@@ -1,106 +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.28"
-
-inherit gnome2 linux-info readme.gentoo-r1 vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="" #bindist
-
-KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-# FIXME: use vala.eclass but only because of libgd not being able
-#        to use its pre-generated files so do not copy all the
-#        vala deps like live ebuild has.
-# FIXME: qemu probably needs to depend on spice[smartcard]
-#        directly with USE=spice
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=dev-libs/libxml2-2.7.8:2
-	>=sys-libs/libosinfo-0.2.12
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.2.3
-	>=x11-libs/gtk+-3.19.4:3
-	>=net-libs/gtk-vnc-0.4.4[gtk3]
-	app-crypt/libsecret
-	app-emulation/spice[smartcard]
-	>=net-misc/spice-gtk-0.27[gtk3,smartcard,usbredir]
-	virtual/libusb:1
-
-	>=app-misc/tracker-0.16:0=[iso]
-
-	>=sys-apps/util-linux-2.20
-	>=net-libs/libsoup-2.38:2.4
-
-	sys-fs/mtools
-	>=virtual/libgudev-165:=
-"
-#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Do not change CFLAGS, wondering about VALA ones but appears to be
-	# needed as noted in configure comments below
-	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug needed for splitdebug proper behavior (cardoe), bug #????
-	gnome2_src_configure \
-		--enable-debug \
-		--disable-strict-cc \
-		--disable-ovirt
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 8ec9364e23c6..a5280d866dae 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calculator-3.22.3.tar.xz 1324432 BLAKE2B da308ea5b781a55e50df459b914d2bf508577a9a0175ec93bd8e63d37607b261f9d3d72abcf838d7c555303cb0a30b9750712c1336a9f071793df7b53cd50101 SHA512 e11731a3b0d16067e98d7f5d6657c879dde22563c4ac7cf8e4323c6d959f7b4e95e1d28cb2c937b1bbc72256fa1e6e2cf3a1bdc77f72f38766605e482b63ce78
 DIST gnome-calculator-3.24.0.tar.xz 1358368 BLAKE2B 81ad42598418b11f2436ebf482bbf93547460990cdb464efb3107e93010081f3d687bf99c80d35d9a6576b5d838218c7ea07e81256abfa358ce78031d80b346d SHA512 55968f3a307748050089652394a3652b8e199be9abf87d43e732874526dc2f08c4521e302a69afd2c09705ffa67a890fc2217503dd31ef51959df9189364c22f
-EBUILD gnome-calculator-3.22.3.ebuild 817 BLAKE2B 24ffd92b21eb54911aa9c5d49cda3aa20c7642fabc731527d68ae908bee82e88bc8e2c1d4fff23bfc8f4a68fe12b79b9d2e913551a13e3d1ae78fabfbc7ca8b7 SHA512 2219acb5b62e3b8eb2b263cde34a008053997da93cb02d40833555d3e635d4f3146c31961c301ed88ae88bcb3eab087c28ec5173f82430dc76f1c59b2f0a8959
 EBUILD gnome-calculator-3.24.0.ebuild 831 BLAKE2B fe40aff436455bc94177f54c7b55d5b96a262cde479c0c5cc7f9751756fbff16fa060aaf826ba671fd546e3f5228ca125ba67c9671eb549171e7ba377d57b42e SHA512 2aa97c1e4701f088c6489786141706914f0db3578cd66c14df96463490f9ecebbc8f8584854fc00755563d93f9eca0c4108b3ce1eb01e579cfbe72860131847b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild
deleted file mode 100644
index 08b9733fc622..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.22.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libxml2:2
-	dev-libs/mpfr:0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3.11.6:3
-	>=x11-libs/gtksourceview-3.15.1:3.0
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3
-	!gnome-extra/gcalctool
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		VALAC=$(type -P true)
-}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 3a3af8cc9dff..d9d55423a975 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,7 +1,5 @@
 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.22.5.tar.xz 2376792 BLAKE2B b36ba91a0c8202bf1419450656b8abd75913a83ecb7780ac73204e0e52dd938069c364fc106860d3ef7ae14bb3545ddab54db9889207d0568e0fb6bb055eeba7 SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
-EBUILD gnome-calendar-3.22.5.ebuild 748 BLAKE2B ef9d8db79696ae99c9cbe392fc0413f595f78debc7cbe1ab467b7d2777ad55539acd3a6b885b2f62e7d5a73f27336c97b86c3ffff05f4548433080db3b8eb0a4 SHA512 70cf17138a1f4d5f14076c9f330228a1f82007bfbaf121b4ccb2a6d36a3b83e257e7e9aa2f5c601e7fd11ddc05399babb5a0ee98d3bc632c08af8fd27e3db266
 EBUILD gnome-calendar-3.24.3.ebuild 1136 BLAKE2B e265e44c1601c312823afa579b13e2821d948b2cd3cf3982351eca7e9d3bf15c9e34f0aac46ecdd920b9d9c28d3366adb891806777644177fe7b5358470f6640 SHA512 de38681c39092192c46a5239f01af054b7d56d436d56747da1ee5829ff74f86b078488614a2c6d5a5efe1438610548c15000ca94efacf3efca1620dac300e0b6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild
deleted file mode 100644
index c6ae37760e46..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.22.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-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/gnome-online-accounts-3.2.0:=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 459aab22eb32..2ea63ff59958 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-characters-3.22.0.tar.xz 1481416 BLAKE2B 4a61951c427d5ca7f36a0d221ca9b39053998329d936e16e0cbf080fe3300450776280bd31be0ff4de2c18c638243d34c4a6813763ffb7f4bfabd618baa90748 SHA512 c04d79f9b31601e127ae6103b2f473e2e4733facebf504189a8d5721a78b430883a0f790b58537eb7772c5a4ce72013183d037909f30a237cd1482c31144905f
 DIST gnome-characters-3.24.0.tar.xz 1490304 BLAKE2B b7bea411ae623a29469fa82d8a9a220a718134776c0973431f4f16f6753bcedd34a8886f3cecc8af59b178f93c051310fa988aef198618b2c4d0be9001cb7ad8 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d
-EBUILD gnome-characters-3.22.0.ebuild 1087 BLAKE2B 3c1a5508a639dcc0b5a30c0a8b3637750d419dde6996f65995fd00d4485ac8d49f79cfa181d9ff9f168e0bfc75b52ec112a9b7d6e3e9852b3d07b46380f81975 SHA512 d5b33399bd0042e66f5ca0ee15d15693893ce20e7318d14f3ddff7f813232ebb697cc6dbd76fdbdb463ff2956b0ae970f75a53965c09db0620ba8d1cd17365d3
 EBUILD gnome-characters-3.24.0.ebuild 1168 BLAKE2B 17e378c2397c5f9c02242ce840ba6c5f9626086e62287d00ded178f09a9d3f7a6797155b3946a39742006c9a80b032bea78466757c093c1142657dda1415fe29 SHA512 5dd6ce8d5cdb738fa247a2e97ac7703cfcccd9bf4bf7a2493e4443422de620665a34303ffba1005ea886ea0685ffd833c35aa617facdd95d756ded751570263c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
deleted file mode 100644
index 2d624b5bdb32..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/pango-1.36[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index d6f1b133346b..1b011df00fda 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-3.22.1.tar.xz 954416 BLAKE2B 52a59c0514cb05a9216997d1ebb985952be2c81b8105db02e5e3d11c1f6a6a13ee15ae86c35c97d985bde3763c8eed51fbcca1b8809c701db4e8102ca7e28d69 SHA512 76c4b9c493d6897a3d5bab4679f834bc515861bf6030d7fac2b59f5584b2a5278385dd4f5747adbe04df92c3af822ded669490d680daf3b9bc46ce09786f602f
 DIST gnome-clocks-3.24.0.tar.xz 954576 BLAKE2B 848303243391bfbc5ae2fcd8bfb4f3320ccb8465098d95379aaecf856341f05171964eda1a0a8637e04b5330cee6343003ec25063157f6d8ba0abcc22aa3f6ef SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1
-EBUILD gnome-clocks-3.22.1.ebuild 700 BLAKE2B a39f9de9f253146017112d1b110c01263023698462c6deaa9acb19505d078812d2bd28a5a887665995d5caf6564c8eb843563f506f5d8bb725019cbd63d5bab4 SHA512 6c443dbcce5358c79cdee75f5b98251d058c23719e04ef9cc7d5f34013e0137d5b885be7ea9f04282b6a6d3f30534bcf14c4bcdc6b6dea8c364536bac5703c5d
 EBUILD gnome-clocks-3.24.0.ebuild 700 BLAKE2B 6eb7773cd6c818eed081337668cdd1a83cab80e946f8fc94635b895eff454f55d410297a113b58223ce8df2510418eeb188ac02fdcb4c38d6e049b8a6bf4aba7 SHA512 a108464748a745e78c230d635d1085fcbbc2b2a96b9a01a6fec6b63e7384b38377bd6e4fe40fd7a1784f0b970f6b772d36b08760e4812e160f9b7481d2bbb192
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
deleted file mode 100644
index ee81f0dec157..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgweather-3.13.91:2=
-	>=gnome-base/gnome-desktop-3.7.90:3=
-	>=media-libs/gsound-0.98
-	>=sci-geosciences/geocode-glib-0.99.4
-	>=x11-libs/gtk+-3.19.8:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index ac52fad44eae..97ee856ff8b5 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-color-manager-3.22.2.tar.xz 2671864 BLAKE2B 0560a234d66fd55f28d59b373e0f52a9b06610ff925e7cf8c959233883a039dfa61c0595bb97f1ad5e415d07a2baa24d8df5240ad5ca41dd5ad8a682639a8369 SHA512 dd50cff841fc8e70554c0c998494e363b709d1a8d4084dfc8daca6297d9491c1b797c4f3f106284e0f8ef133ac77704ad805b5519566c2f49e311f30a1e8397f
 DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003
-EBUILD gnome-color-manager-3.22.2.ebuild 1532 BLAKE2B 0a31c6c73129fa838121fe80b6c6a1b1afa1526085a557c153450bf5165832c0ebf543eaec3309f3df19475db9b56e883b1580116afca6c2b24f8cc7b14a8aaf SHA512 75aac8de5f1a1425948107ab943f73eaadf1d735f236ce586950e606bd6eaf8cd0d80a8957d8f6e74848e2d4bc46c36367655c1e27a360424f089864e9766896
 EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8
 MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
deleted file mode 100644
index 2933fb386a91..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-RDEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-1.3.1:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	# appstream does not want to be relax by default !
-	gnome2_src_configure \
-		--disable-static \
-		--enable-tests \
-		$(use_enable packagekit) \
-		$(use_enable raw exiv)
-#		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index c1ef7dbbaecf..c0d0556f6c32 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,5 +1,3 @@
-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.5.ebuild 1244 BLAKE2B 41dd0a635aef79cc1e76f6509b615de814558f3dc9dc3b8b1da6ad90fcc3fc55cf05d0ff2ca1067e9efc92e677d1e73717c7f36806374366f5fd209e91e5f080 SHA512 6d8f0c736487f0e3811523229c69b649f9bb5f583458cd0da81182211de94c00f9c23c7e8fabcc55b53066d01058844d82c2eedabc078cbc7d72a137dc65a1f3
 EBUILD gnome-documents-3.24.3.ebuild 1245 BLAKE2B 33bc45540e828e4045b47930b3e4627fd40aa0e15de115b3b8516c93ca8a76941bf62089a434b824da3788e3098660ca937e1c00dc1b68c790dd8796b2a6dd18 SHA512 acd279ff281474d3654f2f49f9783a84226971caacdeae4b21b5dadd6e47520dd69fffc383d3259d401c96542e2eb1f45b3e325c60174eff447c375ea1707dda
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.5.ebuild
deleted file mode 100644
index 97bf5c01a4ec..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.22.5.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-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 9b8c4ff12ab0..f729bad898d3 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-getting-started-docs-3.22.0.tar.xz 119100024 BLAKE2B 9d6daaa565b92b5b27d621c1e3450a576105297c221da33169a9de2d51823250267464855b31024ad84f05272a365347a6a10f5eb171b199331cac9dfa47d744 SHA512 8eeebe70054a5fe68bd19c81b0725d3f2084c92aa91c925653bb2e53d4cb66c592d78af1e5446bc8063e9f0bf19f684d8b22c01b8300886ff32dca228f45cb6f
 DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 BLAKE2B 628dab2c9a938f3b265855443e794c1575586d0579692e1a21bae77dd497989cd061cff4dd97090f11719916f24742eedfc81bacb4fdf31536eca78cdd221d6f SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d
-EBUILD gnome-getting-started-docs-3.22.0.ebuild 424 BLAKE2B abcb6723c0e89b6b166621bd6f7be96b37989692155742adb7d3b16c5895b3991b0c63de4d691eed8fa417209e4cd58e59742ca82b82e733a7af034c4792c3ac SHA512 4cec7d1bdd1f8a95a0e001bb6fa2e613c4fd8ccf937d17cf6b09a910dcc96553ae9a485b3bd5ea2e3459077342675b93cd62538a55c00f08871d5b2d812e7cf3
 EBUILD gnome-getting-started-docs-3.24.1.ebuild 424 BLAKE2B 64093399bab07a9e68c313ab3084eb774543e336106b9f46517fcd27ec476c5cae4cc36091a1234c386374953ef0cce20c046a4db7942112b850cacdb84aab26 SHA512 adfea1597f4471168fed28f8de0f9002c83b95c47f5cfc254044252deac204bff92e29ef4514c66d35e6c043935afe0f9e3c249df8388a3bc501e2bda1fe45ff
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
deleted file mode 100644
index 234c965d2348..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="app-text/yelp-tools"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index c6040c4b02b7..98520620014f 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-logs-3.22.1.tar.xz 968664 BLAKE2B 02376b0b4e47298f9921bdb2d306eb7a3678a98df16815c9b46135171edbfc69813e8d34bce18c33f1bb061c67d78119b7bc7b84f17779f93f1c9fe7cfbfa93f SHA512 0836f326407bcfa66b57f10218ccb557356baaed53867c96f4a8fa12eea547fe4bc8a4f5aea894852c4de31d19c4e2374ecfe78bcfcceda93d2884cefdef90be
 DIST gnome-logs-3.24.2.tar.xz 1000552 BLAKE2B da237fbce0b1ced77c52ffab1965f6e1209df8fa1f224274b3dddd30bea106fed6449e37e0ad654b579ce1128fb6b554ffd521faa5362db9ef8f8f2a54a1685f SHA512 6f7dabb0b0093b860198344373eb1feae244ed23c3a65494499c09a83c687ba68ff023ec5ce34846be51fd74293fdb4b575cf3a748a22fae183e89086eba1db9
-EBUILD gnome-logs-3.22.1.ebuild 995 BLAKE2B 9708932255d64ee1e92e56e78b043b67b28b93d85509dd9912ee6c70c03a80c4250ab410d806ce732ec99d2d3b68d437f567bcf88c354be3ee283b067c022a03 SHA512 7059edb371700bef17a64bcd021b8e82eae59d10d2bc7b78b7c146fa69c81cc5ab09f9877b6a4fbb63da26dff95b06f4b3ec861107e59e9d102e7c533f3e0ffe
 EBUILD gnome-logs-3.24.2.ebuild 995 BLAKE2B a84cd13c043754c4ef9e377ee4033cd8a018d9d5b46c6dbc1d2c97029d685c47ad00394fb129e710effe65030a765d9cb4d99088d54648a71493a6ccb937ffab SHA512 634cd794549eea11f7cf675f2e8404af952cc51f756fa8ea439776e8ab0f2b0fef4ec9045cde019fa9f78a88706df1ca79b31a30836f2476170924af8d98b47e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
deleted file mode 100644
index 57a1a38ee30e..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Log messages and event viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.43.90:2
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/systemd:=
-	>=x11-libs/gtk+-3.19.3:3
-"
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.3
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-man \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 9acbee4813e5..0981fafd4631 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-power-manager-3.22.2.tar.xz 453204 BLAKE2B 3b0213481bdba4fdbcc25987660cd358271355a1d259b848399e8dde4e093dd4d8020277e44eafe0cf448e6fccf0abdc68fd8e28d1a654ea45c1ea46f4f2ca41 SHA512 a8039404bf9850422d385281b6572485b39b5fd63c7eec1b41df14f4d551898a90c8d943683517744d0dc2d851a7fd1f7697655af91a0d17a3df476828a763aa
 DIST gnome-power-manager-3.24.0.tar.xz 554616 BLAKE2B f39ce93943426fe8e833b48b5e7e4a02645eb3ffd28aa9e3e8c515d159950409ae9904b2683419d0087b3ced8e30f1c42b4dd9c511100041952449aef0b18e0f SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0
-EBUILD gnome-power-manager-3.22.2.ebuild 1325 BLAKE2B 01a147f9b88eef2137bc3b3029babe37d18bb92dba14417ccd7de7f3277a08ab88bebf59ed241fd412a3076735ccaf2f2ff9eee3b8f683fb66581bc31d960132 SHA512 c5469e6c05c96901ba3993c948dc291981c281331779af3956a2337f87e1d74566ad738d231b8f1f6e3d9189c87150a9ca5cb68b7e2dd85e97879a97f4b1ad77
 EBUILD gnome-power-manager-3.24.0.ebuild 1308 BLAKE2B 078e603ad3abdefe5eacbe16d8651f1c9d28c571f204e6327af747b447e74d9afab91a77aeceb77eba66ac4c01e04601a55da88177d0c1e4b6264ee49f9cecd6 SHA512 b86ad47dad5536a8f307462a91852e11272463a312cd0ec69413cd4f53de6fcbbb9f93adf2ae2917f1263cfb91bca3cf2d40188321199e56287a8f3ddc36368d
 MISC metadata.xml 421 BLAKE2B db2e0d7210e04256add24c9bfa054291ffcd6cf8b52107c184b61b27859589ed17bc3ef2037cf3eaf1fe7a8ceb3ac381c67f6c3557f0d960ff0f1aaf67e9bb99 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
deleted file mode 100644
index a095427215ab..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="GNOME power management service"
-HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.45.8:2
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1
-	>=sys-power/upower-0.99:=
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	x11-proto/randrproto
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-src_prepare() {
-	# Drop debugger CFLAGS from configure
-	# Touch configure.ac only if running eautoreconf, otherwise
-	# maintainer mode gets triggered -- even if the order is correct
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure || die "debugger sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index fd75aeb4d028..ca6b5f2340b1 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extensions-3.22.2.tar.xz 339444 BLAKE2B 4d25481db952efb0433e8b55d2345b6a9fb8b6ee7fb0f84a53aec2e4ff0dfa560b0b8848095926ed707b5523a9dba6a14484035550e21dddaa657576dc181fdb SHA512 7cd045f2df885f50f5e7e41b818aad01c65bd503d656793d64bc9e283fe715f588215a894ac856da0c4c2759c549a1ce2dcb91af64081f40c664c9d28edc2d1c
 DIST gnome-shell-extensions-3.24.3.tar.xz 346420 BLAKE2B 3b6f6686656ca6f395bd69fea905c4f28264db81ac0f207bc2e0d6c82410328be2bc4c98faa659d9ac551cabb73e0576c4e28def9c14e5c7710a9785528909db SHA512 7948a9cb6f5cb8d760bc42ea2865823ee60bd164b491d944edb0413e362f38ed90d39ead44ac57872a83c43c4050f5448936e739626b89a2b486a22f41d61e20
-EBUILD gnome-shell-extensions-3.22.2.ebuild 2052 BLAKE2B ec08a847c5872d418c4af2441228204bb89c79a8301f74c410a49e92190a1566b96a53d4840f4e1681390722ac1bde204f00256caba3a068b65713d02ad1ba14 SHA512 b718a6171594590c37c6695ddde1cde5d62193faaf4a1122c7645ba9a3850e3434bc2996b08be02813330789e85e4e52972d07bf192b258ae0da404269d88d31
 EBUILD gnome-shell-extensions-3.24.3.ebuild 2052 BLAKE2B a1be0802d71c34de0baf77b088badb0ef0f492c30ce738e85fcc52f921f2156f11715dfa2f3a7309cb1e3fe804ef80bd3d3c37a95b8dc49aecb7ea801fcceec7 SHA512 2aa74c3f079d1fe228e12fed8f984f80be3f0bdbc904499555e80d2a0931bc9003f652ba5aacb49563eef5bc86495c6f8552c2b1136fe0179b078a1004e45cba
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
deleted file mode 100644
index a7f2f222872c..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples"
-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
-	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]
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-# eautoreconf needs gnome-base/gnome-common
-
-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-tweak-tool GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-src_configure() {
-	gnome2_src_configure --enable-extensions=all
-}
-
-src_install() {
-	gnome2_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() {
-	gnome2_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index d1821d6f8158..0a0dc8c611e4 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-system-monitor-3.22.2.tar.xz 907524 BLAKE2B 81a1efd150439b84f471f7836d79da13d848c234372f41f67cd09d17b4ae6dfe36e3f9f9b8b769f611715513bd5c2624a058c24bf511a8aa46f85b0a6487fccd SHA512 ff713efc63a8b5f247c27358f69fcb8b27d631fb242bddc6a819b453996f7c49ba8a883bd3dc38437dccd227cbf393e473226d597af0994f25f4ca3246707d13
 DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
-EBUILD gnome-system-monitor-3.22.2.ebuild 967 BLAKE2B 6c03bca17f8767aa89bad5e71c6cb5e5a0ccf7f34ecb91c4845045084b3bac7666daf3794eb23f0dfde0fcc48b4572fcd334746cc950171982e6e28a343e5812 SHA512 5faf503b26e4a3dbd0d8dd0de2570d75533e5b9b1c78a7c2c8bc92922c3c86e2a70b4c8a3f76c41b919dae224d9f4112d29f9bbeb03123b9b627917648b20da0
 EBUILD gnome-system-monitor-3.24.0.ebuild 974 BLAKE2B 2ff42e344500a9c746eb1d89dc9b8c9c742625d09d967806847f01001ce44a412c364a86be6b0c9106c83d7908ada98414c40de98ba177bba3a4cf9a696d93ae SHA512 faa193df18b0b1317500364a2d371c7bcbc56dc7d25bf3e82581f73f63a3cc0f68e1e9944949dc481c145132ee5df31a202ee2ac25676f021c09a702eeb403bb
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
deleted file mode 100644
index 62a944fda1f1..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.28.2:2=
-	>=x11-libs/gtk+-3.12:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.34: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}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# XXX: appdata is deprecated by appstream-glib, upstream must upgrade
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X wnck) \
-		APPDATA_VALIDATE="$(type -P true)"
-}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 005cbfc76961..0c79626008fe 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-user-docs-3.22.0.tar.xz 14148700 BLAKE2B 5a7d7b36b0854f937cc3389024eb5bf2f068d0d9874449d0589336aef6573fd3d21b1343025de5729483031b716482c485395c803bee352a966d59568e6a0d7c SHA512 d81768b1c2bb5e32fa6d81358dc8fce24d1a6af4a01553c30879a73afb86bde8ece513f5bd08df9fd1bd4e8cc545ee49f2f072391eed13703d804f73c71c696e
 DIST gnome-user-docs-3.24.2.tar.xz 14167700 BLAKE2B deec09954a9c3bf915c86030d13df70efec81090c74744fb98192a1e9727cab2bd54ee608f1f3bddcf8707f6a3a6e1ddaeffdc5175e0d0f2ad4ab2e890036330 SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d
-EBUILD gnome-user-docs-3.22.0.ebuild 936 BLAKE2B 8c38734bfdcd009f20a98bd69bb2b6cefb6345ec1383e47c14d6ce6d24058fd3635df576279877ded14bac4079a57638a72bc06a4ac3187fda2a7159d8eb7994 SHA512 c551a2e2598aad54bb3a6b99c1aceeae23013a432ea5e1d5c3fa0eda39eb53e9177056ba426263b45bd6cc9337cc160046bb74b7eb5b4fd9d4ad07a25bcb787a
 EBUILD gnome-user-docs-3.24.2.ebuild 936 BLAKE2B c73905e25c9a419e3c8999f7a09ae702becd42b1a526d90342bc3b3436e63af99631f00875526940f387a98ed39d42b5383f39a55990bacb313f15113385f5f4 SHA512 1b63ecd8d58c1110c79134c3679a715a3fcb09e075fe045ce512d5a83ad82051d691da674bc7880f5a6ed7a0183957e172ee69764a020d5313061b42ad0c66cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
deleted file mode 100644
index 64d032ba5168..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 5f82580fab13..c319c4b148bb 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-weather-3.20.2.tar.xz 5360264 BLAKE2B 3863f105ef2db4d367c9f431a7be447d59d32fd44621e89fe4c83682637da4aa00df7da85e9c28bcb58d20e3a9d3d614f569886ca50d3ed8ff647b42e7430714 SHA512 3c592726949251d4deae6412592975d6439dccf3415df1ac2bff75ee97ef9fb927167ceee0835ef4d1d3205038340c20d9e9b2261205412341baeb4098c9fdff
 DIST gnome-weather-3.24.0.tar.xz 5358924 BLAKE2B 89091c0dd2e69109621450621a03231da9fc6032cfdc44386e632ab3e8e478fc9a02efff86417277fbdbd2c39d730efd76df1a787e14112dd0447b53715b5aff SHA512 c286c97dc1cbb4991e56ed49e8c788c6a58f0f0dcd5534812ee3e06a0570fd1bb0b45f7e35bdc11443f62dc3a2cd262db4f3d2b1f238cfc24236de88de4a4bce
-EBUILD gnome-weather-3.20.2.ebuild 1081 BLAKE2B beb358e0b30eef8bf88d264e81d8d504db0e9b539fe0296beb627cf360efaf7e195cee4f960cfd02da09a4bb17077d43ff090fbfebf769ac61aaa564d145ca3b SHA512 69ef257d0b5329843e87cc09260f25b8b9453c3cff34d83be05aa4799be34f994cef75b7cf974365766d5e0acdaf8c7b0f125d758a0bf7f89da34cdf2a162f3f
 EBUILD gnome-weather-3.24.0.ebuild 1085 BLAKE2B 23e877012247c7bacf65e616bb5ba59ce5eaf1b460b79950f684ca083f0b6af164a39fdba803d3a22bdae898d455cc3618f0ba930e377dfd07633123cd5e6b58 SHA512 1c3bd5d93d8809c2f6322577ff950a4387806880fcc733b927c37deb174a1a45a9b2fb7ab0f68d568df222f077e61e46d0432b404b41c2da57804b1597868d30
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
deleted file mode 100644
index bcd6d19ffa36..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libgweather-3.17.2:=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.11.4:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 698a08e4142d..1fabd78322e8 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,3 @@
-DIST zenity-3.22.0.tar.xz 1082088 BLAKE2B ec9d7a82a5086c1eec6fbc278fce6de3fb02e56cab2cf2f75458fe978ef80b110d02872b32716421b69125f0bac3c8abf85ea8cadf68e033d404a0bdbced9702 SHA512 0131e854ffb8093e6c36787ffc831af8d1adbb663931b09b86a477c28c3b456ad2c9bb59cdc00a2d6505a1cf645df6fc9ebdd3c46c1a666c69d607e79b4364a3
 DIST zenity-3.24.0.tar.xz 1085124 BLAKE2B 2be50461c8575b5322319e3b35a9c833ae87f2e35abfdb27bed61dbead1b31dc31d551c8973634a7a0f0abc178ee6c7a4bb24377632df7d7fcaf77780f7fd4d6 SHA512 b24291166221cc2dabeabfeab7ca00ca63ff21c12a4eb327cd35ac43f485b8d4a858dd717df1b35b8bd3fd89d0bb235609855c6d349b76879b0f77b4fedd4dd9
-EBUILD zenity-3.22.0.ebuild 1101 BLAKE2B d2af9709a129354108822ad977eaecb7a282cc25680a91573873d235e389ff74cc8cad1adcf51c2ec94bc6d764228799ee7bcc2fa44dd3f85af73c570317c108 SHA512 6b050763a6e6d06e66000f0d0792735858ffc46739e3dffc534df8213eb03d095a71caf16e3b0c399709c8b6cc67fef1c425eda57081d11dde90bb0dc945ca33
 EBUILD zenity-3.24.0.ebuild 1108 BLAKE2B 32be4a94db30a9b9f4ed49607c096b9375041b360a10972a23b8441b4685082326375b3835cb8321367ddfde751fd2cc6fcebf8e6649618793da946603f35f3b SHA512 dafbd0107b9135b22a575d235dd6921928d2bdbde5dacd500798151255500343892978226b14a4c05359c52a55ed2b2ad67b3d8b948debfa49a06bebeaa3c47c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.22.0.ebuild b/gnome-extra/zenity/zenity-3.22.0.ebuild
deleted file mode 100644
index fc4fc7f301b8..000000000000
--- a/gnome-extra/zenity/zenity-3.22.0.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="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3[X]
-	x11-libs/libX11
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable libnotify) \
-		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}