gentoo resync : 15.01.2020

82 files changed, 167 insertions, 1490 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 63ee5c7ba93a..7d4891e8f65b 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index 8a8ec048579b..0609a5756f91 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,4 +1,4 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r1.ebuild 1404 BLAKE2B 3e2fa54182e9ec942bdf28eb9e7b7114d56395e972634a2a6a84bfd0f483b0670143d6e57136da2302209ff8978cc2ee3dab8c7c8bd324bbfadc6393797ed879 SHA512 c2c80683f84f4a5bfecef193d3ba7c75a750ce3039b8f6d61f208cbe7327f0e203d6e807b7b20573830ed6de587f2a9a6a53940bc1501e001356dbaeb71b9180
-EBUILD chrome-gnome-shell-10.ebuild 1036 BLAKE2B d65fb38160852887d20f5da9271a97245f48705d5591752f6f4cbd05b0bf50a086406dc748139e7a16c27188bfb4d60187f2f0e0a7b409785cbf83e25ae69bb3 SHA512 b1aef359f6fcc19729cdb4be162db62fe9eb8e16ea1eb0a19bedb295a64465de50b06c83f06041e831052c337fae6f7b053f21eb82cdca8948bd8a54f3fd0455
+EBUILD chrome-gnome-shell-10-r1.ebuild 1400 BLAKE2B 1eff2159294e582f96506fbbaaedf163d7ee6c6adb5cf8824971e5ea923f8338c9773890f77e0620a5eba7016c89e8603f0dd550dcdb54c07b5bf23470f1e414 SHA512 8a2561cae747ee489341f04fda2cde8b7dfc0eec5a74caf742797497dc3db221e0206fb24bbe43b77efaf72e7f8dd28fca63e0ab4fb022a4ba70cb5ef01f0fc5
+EBUILD chrome-gnome-shell-10-r2.ebuild 1410 BLAKE2B 1a0b6a89aa703cad9dcd490c19d65848425c282a0f688c00e3ff1215aeb6f47da2e2c1f208a75baa44adaab9b7be8c6cc74274de7912bcb92c6b06bb42dc9084 SHA512 a531ec080633a497d82c8fdcb231d78db58409c806983538b9082634d220260af3b467e0df0bd3fafa5d8c5b8977883c0a7e2ce223a987f96b45ef6711e6e172
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild
index 1fc9e6bfb169..d60ba0d0a1ec 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-utils python-single-r1
 
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r2.ebuild
index 7ea1fb9f0045..cc94f8f1db72 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -33,6 +33,17 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+
+	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
+		# Workaround www-client/firefox-bin manifests location
+		# Bug: https://bugs.gentoo.org/643522
+		insinto /usr/lib/mozilla/native-messaging-hosts
+		doins "${ED}"/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json
+	fi
+}
+
 pkg_postinst() {
 	elog "Please note that this package provides native messaging connector only."
 	elog "You can install browser extension using link provided at"
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 744405feb731..6b9a3652be99 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -2,7 +2,7 @@ AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f
 DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
 DIST cinnamon-desktop-3.8.1.tar.gz 489295 BLAKE2B cc2216040387ff573d4cfc740e7e400862c8fc1361f38b2771ac94c490a8710e487ae1d33ab1a7ed98423c94e77bba32db6cbc563e9152c67b011459f91ad123 SHA512 d4b5e6d848a4cb01e811410da8b07d2a400f6632abba9cc0ed74e5321ba3fafd1ec9ac90307eb56ba7047dbfabbad9526e1348533c6207c9a7756c24751da933
 DIST cinnamon-desktop-4.0.1.tar.gz 489598 BLAKE2B 3d223faf0d9381bc5bcd4be131f9dbe1bea0f6ec57cc5413e24fac8a1855737ba55f55faff36436c8b8d6266be264d96ce51ec1bd8c1406f5737c9b3ee41c0a9 SHA512 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
-EBUILD cinnamon-desktop-3.6.2.ebuild 1711 BLAKE2B 0e2584cbf4a4a8661446cbefee9d7f0c65d6f5a7118b2e207faa5421f810bf553f69168c4c032c07a0adde0a83dc4e44f30924b843caa7286a08b836934499e6 SHA512 2a20513bf51b0cc158dc252d34cdc2a103a5102f01a6ae5a3e95285c2183adf1f3041fa47aaced81c81249ad5b5efbb36fb5ac2727c0fc1d8ded28a515aec741
-EBUILD cinnamon-desktop-3.8.1.ebuild 1602 BLAKE2B 0c30b98911950e66264991076fd66085cbbffe5125fb1a988651ebe039d17fa6d1f79b090ac1f2f4107089910bbf6f3515aa99b8648dbc5fdfb992c801865661 SHA512 d760379aadfed2c1f4651764ef58b7e85a71c5abb1166d8d07a62e4f1571a68c76a7281f030343a2f97a7ddb9a2c180bbe64d60835241a9f2ac5602c6238ad30
-EBUILD cinnamon-desktop-4.0.1.ebuild 1600 BLAKE2B d35f5f9b5986bf637a248c996aa545c0b94743c50b2f77d15cdb91d755ae7ebbb83a7a0c75f1cc9e30e7c7f9fc631e0b5c9ff79bf848d0b3a7688781b508739c SHA512 528b852ca10fb89fbf68ac17e6b9e9a69701220b3e3c7a54f1c1bad956fa316f2fd516395617daddcaa03406a4038201184eb0581ae73b053e0f87d991051b6e
+EBUILD cinnamon-desktop-3.6.2.ebuild 1707 BLAKE2B a27d76ab355d0a08bff965af58ee2e1e0109103b1b1674ec30f56b0a3a2d1b3254465fc0a30fb3970851f03d22da3684cb3422bd8ef3de411989febec57da776 SHA512 6bdae0da4d55048bee8c75089b2dabf984b1b9fdaaabc9c7bd1175bef1ae8aad8f91824b8903e7d0b45660daa461b2270b46c910186b0b890b16e5af35f9a873
+EBUILD cinnamon-desktop-3.8.1.ebuild 1598 BLAKE2B cda2a5ce6c91a8015aa938459ef6accbc52a80af537675e2e9b04f9b0b69fc30dcb392d93fc10eaccacbdb4a5efc5942f8aca071ca9a7430593744e539f863c8 SHA512 ec8376b02023ce576c05803e9bc10bb0a1d66f6da9e46e83299b5a1912dd93312dd5ae50d017eccc210d15373e73073fc228f77be6d4411bec6f5cff910857df
+EBUILD cinnamon-desktop-4.0.1.ebuild 1596 BLAKE2B e9d6cdf9b1456819080c6d1f876a969c71a54e5ad0ec5dc981490b10a8d774bdfcb6be79f01b13a71c3a381b51717b380be0c25c23d69ae1a4b47f0409f1d30d SHA512 59146b09cc7e3731849234c589a8d10ca605baee4ce3c584da29d3871a14c7173f1522e1e4ceed543f10e782d801c9f631d7f2a844178182ca19472c6fee36b0
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
index 13f52b383f61..e992aeb0f027 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils gnome2 python-single-r1
 
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
index 8f712eb3961e..15d3acece1d1 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit meson eutils gnome2 python-single-r1
 
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
index eae3efe2a34b..11d093a363c7 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit meson eutils gnome2 python-single-r1
 
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 5c519ac27733..00333fc0196f 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,7 @@
 DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
 DIST cinnamon-screensaver-3.8.0.tar.gz 161238 BLAKE2B 1deb5439c30eed8f16240cdacb20beee3dfeef9529d9efb913f4922b7a53ebf3372f64f80c1afdc9899eb5350b97bccf9a1cb98d703d19afa05e6ce11377531e SHA512 9abed09abfdf193b66c70cd2220d7d7aa056a99b6ffe12e3d80ea8af39d4aef79f0851e83b525850cc56da5944d7b29ceb8c4e15e2bc1e847ce62c13c45d1bdb
 DIST cinnamon-screensaver-4.0.1.tar.gz 156640 BLAKE2B e82354ce36fc325f524e60680c51d46ba7924154e2ff64514687498a7ebbf13d626e5441177d0679c763a4bd3c10a2b7e08ed01470358bc4606be90d37867570 SHA512 c1262d6c1e9575da8007f41f637ab9f7ba33ad5a3a909a7b756cef1f4cb0f323ea4d89fd7498d9589975b9fa6e4715d631413eec7fbcb9c3b46d3a42e02ac7bf
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2052 BLAKE2B 5d17da70bf7b4cc9b74e25c1609c700f67e6368eaf58b1087f218640708f95a08f2e017bdae8442b36276adf4a8b4e20d58327f018c9fd5a620d6542ab47eb86 SHA512 2178583bfa43399b9ba35b1b68f528986015f13f23d1bbfc950859b94c489a48f7018226d113b314c126e620e44827bd901609514d31560c41c4e9167cfb9119
-EBUILD cinnamon-screensaver-3.8.0.ebuild 2054 BLAKE2B 344d69da66230e17cb27781ba86db316c0bd5a0c8bb350a76de919480c03420f312e10d22764321e356cbbad816e96a81d5483ad60dc02a1a852008680bc040f SHA512 3cad38ecb4cdd05a71c3a070a9e2f2bccf02b92e2ffcec186298c1b9fbc98854c2c7e1daba94bf185796c984ea80d066e5eca2fdff3820701e18d9d72a812788
-EBUILD cinnamon-screensaver-4.0.1.ebuild 2019 BLAKE2B 4c9110a091c408e9bcad9d8a7f9931650e81f404181de8d3921998e510891b7315ac1adb8305d6082e58da7365711755b407d9d8378836d59eb6d5fe612b8826 SHA512 9bead43d7628aa0976988561439866c55f48ab6d8981a1be2023d3350d01c388d26166ca0290335a6a0f667e533fba4f8b75e6b81596724ba80346c9f5934baf
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2048 BLAKE2B 728f9d272a513df250a21a46b145925ffca408e8ea2edb26d2b621301048856d9a2e9368d9c11a5a5d47e9bfd4c00518722331db1b6f1c7196d5d711f01ddec0 SHA512 d19c887fce833b393a3d08261f114807004a596ae304e3f27e54728ad15f5af4c58db53573e4e31e3d4ceba74253449d03bcfee60b31371e3f2d86f9f10a4a0e
+EBUILD cinnamon-screensaver-3.8.0.ebuild 2050 BLAKE2B 5bc23e21d25e85118664b76aad715f4b98f281a428f7f095029503be2322e32efca561868fc85bc25fa9787c84f6c2eb62dba8062507966c536b8b46b67c95c8 SHA512 0c5368eaf2f7c54664eec25cd6e03d0c08487363ef397f83ef1797d424078d72ef6ecd58affb425d30f13867fc7e63d79037e159b9506419f6707e0141c41611
+EBUILD cinnamon-screensaver-4.0.1.ebuild 2015 BLAKE2B 8e34b8d66019b7d26b12c55b2f706d64175c3f969ae75de3de429300de5074bb56ad77cb39e49d64954410b063b082976f62d497bd42b44626ff77f978905d2b SHA512 ab53233f1c32b84e251f2eb499cf73bc8651d6afe92f4481117f305e94e08372fd013924a7c602da6d490bd6b8e94e2dc294d4778f059c4eb37cdf18cbe1401c
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
index 97da7b3cecd9..109631bea787 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools gnome2 multilib python-single-r1
 
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
index 3d5f6e004c52..b4a515ce0514 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools gnome2 multilib python-single-r1
 
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
index e3a547bb7d9f..fe990bf96f21 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools gnome2 multilib python-single-r1
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 0f2e7793a965..32ea776f31a3 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -7,9 +7,9 @@ AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01
 DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
 DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53
 DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
-EBUILD cinnamon-3.6.6-r2.ebuild 7622 BLAKE2B 0ace3b5a4610ccbbe1473c8c7f8614a6f58489d23bfee3f19f5ded9e6d8d755ca519a05345d90db2221fcb56583f52c65f7dc6ba925e3f21cd3b03521a60b3c0 SHA512 0c38efee32b4fd8ace88a433df71956d8688c1ccb2ec12d095ba0ad1e08a97e9554ec9987b9b0a98e0065d7c23b1c2049904376fbcee6087893dda74249df25b
-EBUILD cinnamon-3.8.8.ebuild 6918 BLAKE2B d0d07475e8877447f22ac3828791d37121e98c4fbb8e32537e966fb1b33bbaf6c95034e55aeaf2ffc536010d498d9fe4a70e3e935256710bafe945aed17b0a5e SHA512 dab6b97d7ef9e8d8c21b1dcbd78e76b2a6cf11407b97f3638c77ebbdbd971bc5096945780cb4990e545140c435201d58487c3477212af1582145747e7c18a4c6
-EBUILD cinnamon-4.0.3-r1.ebuild 6878 BLAKE2B 48af48d98fb39f2519adaa69c534f00eeb34f1c7d8e8ae5cc715b4d3ec4b0fc4a31073f8f8d0f136a97004045ded2e37d1270c111bd1fdf86f0c98d733140184 SHA512 da89cf1b1041856cc737bac52ec2bec75d5c0950f52490f305c0f06e3d6b48cc77fdf617920b504e10198948d3370c99a7c6829eaa104f09c5713b077ab0d1d8
-EBUILD cinnamon-4.0.3-r2.ebuild 6939 BLAKE2B bdcffa38c7e4be2e50e2bb779d3066d25be9b7384941cb39ed549b5dbdcbc0cd1f260d2b0869cc7465d9c36a1a22f9c3f703eac4b695b1046de40638d4f4668e SHA512 259bc3b5cf7424403963d3ad457f0a615a6aface9a7d9de1d905c13ebfcd47738d3ba262da3adc5429b5306f2250fbd4d3ff8fe8b17c3db1c5627f25c8897b25
-EBUILD cinnamon-4.0.3.ebuild 7008 BLAKE2B 1529e7f397e813d67c3e449f0615fdc93e1017adf3a39f1e330829be0962e5aff91b6ed002d657846fc9bded4cadec8d23c97b90bee0c526a5fc148292d29f16 SHA512 ea9cadc0f8dd70c7729513db1e9575b9632990d1e6bc919052e9a069b1baf57fd023fd5b551f96a484d8e1a73f910a2d6a315f4342bebcd7edb02f194951b1b9
+EBUILD cinnamon-3.6.6-r2.ebuild 7618 BLAKE2B e3c51299fc745634266d58b90b60fa68cf07a41572320f6a441759d2a3899fe88b53ef4b944eaa5b5962ef0dff1d3a538f2b267142c65c31071c3862ec554544 SHA512 1e15c201c12ed52121e8b606700b3b3db3902eac85ae65643be86b1a1fa36901f4d7c21750de61d6afac7136a1a94e646e3729ae0591300eb5baa5d4716f6f87
+EBUILD cinnamon-3.8.8.ebuild 6914 BLAKE2B 7552ee6c200bcb68d0d44a617519437e70194164f697f8fb0ea896142cdbbe017472b143358f8e39a07dc22a92ccb52dfb591d5a3099f3e13babbc44b12359e5 SHA512 452ee5d1784f02e5a68c0023a4b0285074dc91ec45a991c1e8f22cc7ca68b4b6feb4c2469c70f0051fd87ae948388d92949bcb6219b04ff30c3922b52d4d0d22
+EBUILD cinnamon-4.0.3-r1.ebuild 6874 BLAKE2B 9a21a488211653360dc21fc1ad14e0b4628723917b2ba424a67336d4f80d54f6e6f773ff0bf9c4570651a9558506368e1ddfd5201d43a30eb058c8b35895097b SHA512 d8fbc9f48ee8518cf624ff5e7085c44f95545577aa8790abc45693513ed8c1436f2afc3317f1d8c23db1f790b80b0b896797200f34e91608097b59371eff4992
+EBUILD cinnamon-4.0.3-r2.ebuild 6935 BLAKE2B 41a1a5c262ce2484e95ada2fc8cbeb583547d5a3b384b11c20747b247c1c9804ca3b6510880aeca1a4d232308105cc0327ea9f70b6f5499844f0a5498c58a54c SHA512 4c47d0f3e807c279abfdc5e57413747d57016fb79cbf4383c1bf18a7a9c3806904ff929f043b87ac50fe4b248afb8a96aa14ef1f78ef4348097d0ce42982c660
+EBUILD cinnamon-4.0.3.ebuild 7004 BLAKE2B 84b639e0ba88c8c13d5fb049b8e80de3d719afe228a6c88fc5e4ae431efa9482ce7d4902980fb0d232fad84d2704cf26abdbac92afc624400f75d9e63a589928 SHA512 4faaf6fbb8d93287bdc288097f6eed06175f7470704fce2de2c3573664e3d6d81f0a62aee55c8914160f7ff0050f0a224e8bfa9d6481dcc050fc78ad02125b75
 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 22156a2c19fb..145d165bcfc8 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
index 394c580a0b3a..54ba7cc772c9 100644
--- a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
index bb933cf417d0..e22f4271642f 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
index 013fce419f1c..5362f3afea64 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
index b97490e84fcc..26eaee1c5c10 100644
--- a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 7320b651a3d2..c73c81907013 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,11 +1,6 @@
-AUX 3.30.5-collection-auth.patch 1519 BLAKE2B a0196ede2680939d8b1d945cb18c0446247bc9183d7c5f6d924601a95a8d296e4168693537c53945c12f88da02ae41f8b641d3a78f417d999dc0cc7dec435633 SHA512 7499b7ca85137da41232f597bfe25f022b05993aebb91d026016b5e23939880593ed11680be2a78eb9b7af78edc1bc3a50bde9275036ee72b532c3b5eb233a81
 AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d163fb0b1a814408f23a6aee24a644672d999912ec44065e331a1b2f1327f0607dbbc3ca99ae6a925b8dc90f2527d SHA512 230d6ab323ce1599f16f95b7297bbad4e46507398ffae72d785ed095d213026cd98ab9e485fbd8f5a59246352d08fe54213cca4131739e79b72081e1e2c5cdaa
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859
-DIST evolution-data-server-3.32.4.tar.xz 4585396 BLAKE2B d89b71beaf24deb89e510e318050a8a3146b8a6804c148c62d4cb2c0cfb3b50a3767cfc213db05b44c6b5b99e578a24d3c272daccadb4e950b2d103639ce9797 SHA512 fccbad5989e6366840c50dacf2e81510f65c8640c9309ca0446c1b236df99f43a310fcadd377e205d0a94f0e3f9b53b83c41c042c3244e05bfda0d6df090d0c7
 DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6
-EBUILD evolution-data-server-3.30.5-r1.ebuild 4375 BLAKE2B a8a00e60109901b1b840bca847433c6f21745819aed7f259ef3241fec7b7179f2c699afe1375656158b5807c5ebfe8c43a314f9c0dc724d11f901958309a92de SHA512 3328e7a55cccc41383a01531aa59b9649cab6712914aa40a18194936ff54ad7b6987041cf048c425cb5744ac20678cfdb869348769cbc2c91fffba1f8f6a7899
-EBUILD evolution-data-server-3.32.4.ebuild 4361 BLAKE2B 7fb8013c42191ec5dc88dad69804dfcc8e321765104643ca84f46d2f29c93d9020e48f8a317f3f6fe0e591b0db47c8a155a9bbf27297889e003cb6be66521d74 SHA512 388396dde9017402a9e30d7f7de63e188057ee9301004578d603cb532ffd7a50c15a141f36349ebe90bc8ad89b858c9bb5c8da3a759ada1db1d4849dab03cbd6
-EBUILD evolution-data-server-3.32.5.ebuild 4364 BLAKE2B ca0122517213ba37faf9cfc1d0582a2eaf1a255a065da54989b449d0eaf8d607dac78eabf3398248a5c63b1c95b47f1b7166fd683bf08cc6a15c4c2f7bcf3f48 SHA512 b566d1e38b9c529a9833996b146c75c8c03bd68a9e64a7beeba7c3d223f33820e46ae6a381213696eb2ffe3f4045c40a0d5ffa02049b8ccfe1ca27a6166a9bf5
+EBUILD evolution-data-server-3.32.5.ebuild 4353 BLAKE2B c30d4c9b1cd2387a9954dfdd75179cec253c6be31dc1deabe78dff538bd18a5ba47c3e510a1fc4cce97ab45813e6b6ee2c1de639c9467d0876b116452102dda7 SHA512 2eef76ac77415e939a870bd2d421e15b386f7833cc6b76a20c19d44e0944046d4892d53de6ad239b51960e2a90ef0545bc9adbd55ae3ecb23c2594e31d17d04f
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
deleted file mode 100644
index 387778376782..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
+++ /dev/null
@@ -1,153 +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_{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 ~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() {
-	eapply "${FILESDIR}"/${PV}-collection-auth.patch # Prerequisite for evolution-ews cert checking fix
-	use vala && vala_src_prepare
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DENABLE_UOA=OFF
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=${google_enable}
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
deleted file mode 100644
index 1a27333dba64..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
+++ /dev/null
@@ -1,153 +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_{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-24" # subslot = libcamel-1.2/libedataserver-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 ~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
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-# 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() {
-	eapply "${FILESDIR}"/${PV}-gtk-doc-fix{1,2}.patch
-	use vala && vala_src_prepare
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=${google_enable}
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
index 500e3bd8e884..3f15245d2c44 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 VALA_USE_DEPEND="vapigen"
 
 inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
@@ -17,7 +17,7 @@ SLOT="0/62-24" # subslot = libcamel-1.2/libedataserver-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 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch b/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch
deleted file mode 100644
index 5d1c2780162a..000000000000
--- a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6672b8236139bd6ef41ecb915f4c72e2a052dba5 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 4 Dec 2018 18:19:30 +0100
-Subject: [PATCH] Let child source with 'none' authentication method use
- collection source authentication
-
-That might be the same as having set NULL authentication method.
-
-Related to https://gitlab.gnome.org/GNOME/evolution-ews/issues/27
----
- src/libedataserver/e-data-server-util.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libedataserver/e-data-server-util.c b/src/libedataserver/e-data-server-util.c
-index 47fd4d2ec..bd209c980 100644
---- a/src/libedataserver/e-data-server-util.c
-+++ b/src/libedataserver/e-data-server-util.c
-@@ -3259,11 +3259,13 @@ e_util_can_use_collection_as_credential_source (ESource *collection_source,
- 			if (can_use_collection) {
- 				gchar *method_source, *method_collection;
- 
--				/* Also check the method; if different, then rather not use the collection */
-+				/* Also check the method; if different, then rather not use the collection.
-+				   Consider 'none' method on the child as the same as the collection method. */
- 				method_source = e_source_authentication_dup_method (auth_source);
- 				method_collection = e_source_authentication_dup_method (auth_collection);
- 
- 				can_use_collection = !method_source || !method_collection ||
-+					g_ascii_strcasecmp (method_source, "none") == 0 ||
- 					g_ascii_strcasecmp (method_source, method_collection) == 0;
- 
- 				g_free (method_source);
--- 
-2.17.0
-
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 7fb9bd890120..9a74699d3680 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,6 +1,3 @@
-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
 DIST evolution-ews-3.32.2.tar.xz 534056 BLAKE2B 2f935910cba44d69b2d8bcc3021709502c1a129ef29d18a847bccd14837d0c18c9700a97f978decb36f9c28242df81a9021dfc536e31f3d8f7793a0dc4c6b680 SHA512 5696ea660d0b52c0083664ad203eaed372fb9653399152ccbca0f6360a3e0c4503b5dacf4f9bf5650b1b64696c0fe06e2383bb408bed604ea0312660b4639388
-EBUILD evolution-ews-3.30.5-r1.ebuild 1499 BLAKE2B 5164332cda7bf860bb5abc8299c55dea3d1c8dc1d46d2ebd8d4f007f1aa068dcf2d42f46080062c599fa019078882094d8edad35e4ea83deb7eb0d77675dc9b7 SHA512 cc9331a17d6efaedea8a14e6f00c0438a27f45d40a3c42f5ff06eafd941ce70972ee94755134aa06c7beee9ff0efb3aacc350f8e5b0fceb536821fc7842227d1
 EBUILD evolution-ews-3.32.2.ebuild 1316 BLAKE2B e1837daf5fbfd3c1ba4f292501c98de34203a0556f01595dc5f762105da5bd67628b336e8fea0f03697ced436628fd9f2eb4c053175144c7fd73a93798747e83 SHA512 83f59bca21904024ff9c1032f8c5703ead325262ccfcd177453fedf9d9ed01fe246359df124f0dd0d0378f741f1bf2578f2889d64981db85ebf47de4f2967a1f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.30.5-r1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.30.5-r1.ebuild
deleted file mode 100644
index 59c849b00897..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.30.5-r1.ebuild
+++ /dev/null
@@ -1,66 +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"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-certificate-validation.patch.xz"
-
-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}-r1: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() {
-	eapply "${WORKDIR}"/${P}-certificate-validation.patch # requires patch added in eds 3.30.5-r1
-	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 d46f0e48f9eb..4bd466d07841 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calculator-3.30.1.tar.xz 1070308 BLAKE2B dca8e16f754d7ae7ac3371dbe65fcaacf51c251d377cc696c7c9a9ca6b4d9c0f6431acd06c3091e3d3e0f468cc599953452cbbe4de33473e365425ca3add602f SHA512 4c909f36d1e6ff594b9ab76419a6b50962cf4b5de606c4996d311e5ef6511a20d5c3b310919b271b1a0120ed6a0794644faf5a390d94b71ec6bb89883d498565
 DIST gnome-calculator-3.32.2.tar.xz 947096 BLAKE2B 7c511e4d22971b008587aaa9ee7a44bfa663b663ebaddd6b5d4426f673e0f8975506c3b6aaba2781e3ccbe9ab7b9eb9b9d876c1b8acae9e14b195bfbeb207c42 SHA512 ef30ddad8b68367f71c2b894f041affe2b88c8aa90ad40d6128d03e0dc4871fd57d632809a365b14bac0b53dad37a73df564d237b8f45d4c42c38e118cb26de1
-EBUILD gnome-calculator-3.30.1.ebuild 1110 BLAKE2B ec77940f70f395a0b28a588aec3d6554bb917753a24236e281e7b45e47b3764955d9e4957df25d101b506d85dbedfb2730aec07b21e0dff2613b21503903b1e3 SHA512 7bb1942065cc8553056efafb789fb469fc3a589b390e9a564111c1b6eb71bb1489c1a4a4ad5d0e3286941a3d1b2f7b32c7384107835f6af9791ae709c9ee7ca7
 EBUILD gnome-calculator-3.32.2.ebuild 1129 BLAKE2B 5d2a5e5682fb3242a7d63b30d0f32d412932e69feaca81872bc8e79f0d81efc060afe0252e46b436c4622b51a2547bc6e7ff0a1e2fd4e943e0bf3863e734d959 SHA512 a8dea111b7603c252ddf9e9c0b0b1d15bda57c532907e6adaae001099a3c4323d098e09d8ac97cbe10f7dedee5bf5a8446eb9970ab7118b21985e0d2bb8224ef
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.30.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.30.1.ebuild
deleted file mode 100644
index fb72866fc0d4..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.30.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MAX_API_VERSION="0.42"
-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 ~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
-	dev-util/itstool
-	>=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 cd61b538e033..a0a9c8f9d880 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calendar-3.30.1.tar.xz 2443936 BLAKE2B 1826488ee03742a9350e589954723264318450d50fa7175955deee8fb3b3bbf2a29fbc6106644bccc062dd45bd9a16e7f40e2928c488bc333ba35d00f2411f25 SHA512 acb428f123fe716b41c4e828213b1106296731b5aa99607838219b8e6c802b22d3481eaa91429cfb34bc3d098344f406ea86c5e2f794f26414ba05bf0189fe29
 DIST gnome-calendar-3.32.2.tar.xz 695416 BLAKE2B bf5b2b5bd8ea5934075d00614a3888208a06926b8587fc39724850c0fccb7e34920bb650f45a241074f5ea383acb80edf91884936c7b432e0a7f9e672e457b8a SHA512 6a1ee1b41080d7814e9a49b3a95689fb01325c9ac5eb1314b11e7097c3b8b120c7ca45b05c806c3dbac284a70474beaf419773ab185a7cdde96303fcc7cd3915
-EBUILD gnome-calendar-3.30.1.ebuild 1338 BLAKE2B 8fcff691e41e5aa16929ecc12cc18f2f1750009700df7c2441b7bea9c7698c90e531ae250f4e1f918f54db54d3ed4c5003ef13174d8a0c6ab6fc22b3075f4221 SHA512 900e2506a5c771c4071e2ad948513cd1157c2f90dc8695c9075feafdbd0bd5779afc4be7a8a3516739a26ac2f8fed50482e89e5ab3151e0b000e2bb4800c24cb
 EBUILD gnome-calendar-3.32.2.ebuild 1307 BLAKE2B dc319dd983394c939e6a70034960c2dd937f81a84be595ac3eba132b388b9e1354b87f3611e1233ead4c20529f7bbe61ad121287942da885120bd33a2ddee056 SHA512 eab7fe0d541b3b758f70e3ded47c81d2fa121c86cc61765e9fdacaf831ec5c2d1e215fbd57fd2c255950096882cebf56ac027f7d4ccb1f1911fb27483d813266
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.30.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.30.1.ebuild
deleted file mode 100644
index efeb112eac9e..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.30.1.ebuild
+++ /dev/null
@@ -1,60 +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 ~arm64 x86"
-IUSE="gtk-doc"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-RDEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.17.1:=[gtk]
-	<gnome-extra/evolution-data-server-3.31
-	net-libs/libsoup:2.4
-	>=dev-libs/libdazzle-3.26.1
-	>=dev-libs/glib-2.58.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=dev-libs/libgweather-3.27.2:=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23
-"
-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 documentation)
-}
-
-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-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 8d392373fe2d..04f235a3c7ef 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-characters-3.30.0.tar.xz 974068 BLAKE2B 294b401e410e4383120deaa4ef3adad485c27e59879ff412d9eb282678f07faba6fb5a93e01c0aebaac7dbac7abd5c19876a0b84403ad92ffc24211daec961bd SHA512 390536e0e5891497c5bd2374c70085beb5bc7c730f51d889e4147895f24999c5c3e9a0bc466a3d4c5652922f1cd7ce1f8f1a98e61007df59d682c230bc99acd2
 DIST gnome-characters-3.32.1.tar.xz 186516 BLAKE2B f6c6b95fbaab9f2e2e6454256bff87b243629927b1806161de2294a8b497cc1f601da747252f14dc8c232bbbaa581140b513a4db0c9993ee05295a82e294787b SHA512 d2c18b136da6ab35938de4adf74ee6c3841f5f8e46f3b1ed2bbb8f9d0e953bba1dc43e105ae2aafc880f3cba37b75a55d274e6776d2bc17a5e30364f5d625537
-EBUILD gnome-characters-3.30.0.ebuild 831 BLAKE2B 2c7a3d745e38006f95d350c549b29d1a78fdd043f06fecbba560ddf1897515f235b70bfc0dcdee35e29bb017effebbaf1b9d1293605ef82bc1a4b750f3b66c80 SHA512 4e9d12e5bfaa39bb8b58e82f43566f3ec582ed858ab1e46c65e966b4f35d5169032eeb9215e6e98665277a095535faf84d150243c7d4a2536b815d79f6975d5a
-EBUILD gnome-characters-3.32.1.ebuild 831 BLAKE2B 2c7a3d745e38006f95d350c549b29d1a78fdd043f06fecbba560ddf1897515f235b70bfc0dcdee35e29bb017effebbaf1b9d1293605ef82bc1a4b750f3b66c80 SHA512 4e9d12e5bfaa39bb8b58e82f43566f3ec582ed858ab1e46c65e966b4f35d5169032eeb9215e6e98665277a095535faf84d150243c7d4a2536b815d79f6975d5a
+EBUILD gnome-characters-3.32.1.ebuild 825 BLAKE2B 73d721a8275cb379b193488127e154617302a7b36ce42b3713ff090cad221334b8dce8b0c84131a4c55757177fc27474044df04f64882112eb85bdc265dd67c2 SHA512 a199cd5a561638a33cf2bb31576055c0b234d0e665c3359723ef990fb05df0231ed77335135783dae9dc335ebc2b89f2ff9e706b8771a4971a69eeee593451ae
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
deleted file mode 100644
index 8569891bf153..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/gjs-1.50
-	>=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/gdk-pixbuf:2
-	>=x11-libs/pango-1.36[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
index 8569891bf153..e637e2f5fe72 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome.org gnome2-utils meson xdg
 
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 6f07a1144608..cc277e66d0f8 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-3.30.1.tar.xz 798904 BLAKE2B 58ffb56191cfb07912c1575291f752aadb5549ae5e369cb4c8904756d1ab5e666591ead6756992090921741abbfcf751e2d3ff76ed82d688caf135c7c091c888 SHA512 62fc817a3ea3155b650865f6d5056ba3370da319389206d921e315be878159ff26d0b3063a2c31c85af7447ead10c5fb62bf1dfe4613e2bfac1d01b0ca7b8b3c
 DIST gnome-clocks-3.32.0.tar.xz 505368 BLAKE2B 54952a9c0340d30e042ac4b947e6a0a8dac9823d8df2c7cb5871a6dca1e259d18a9e212d37d46901b41f1f1e41ce09fa86fb02d9ea90f23bc23bc8d9f159e994 SHA512 061d867cffd3d8fcd09e125f8d053b847f2b197a4354f330e8b6c43d7aa5e0cf2bb51b342545c79c352f9dfbddd1667f3e64a40c1e117e6fc63f54289cf7cd2f
-EBUILD gnome-clocks-3.30.1.ebuild 829 BLAKE2B 57774fe99460ce92ad84ebc89b3f059ccc393cd2ab27890ca987e9dbd87136d38b2d11084f34520113738a3c7bfd084ded7e8797be1e12780f0881c851823a7b SHA512 947ec1a49c49d74b54e4765111bdafaf54c978069663a2a8538f12e5d6b5292a75236630562966699ca9ae90422a4ee04f964ec8cd9de4a21c095e0f9a6dcaec
 EBUILD gnome-clocks-3.32.0.ebuild 942 BLAKE2B e6776b51df2deb0833be9211eb5323998151796c8425751cf27ac94674faa7b6377206b2f49a1d336a59777921f8f118f2a947ffa1712ad06c60d295f399ff9b SHA512 0c4e73a50dbeb5d002dffe0c1dc689823e811ea81b4bdfce6971557859e509ea9827e96d8946315826ae1ec2eca420683b7b4aeff2bfca183c57f4d5bd24717d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.30.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.30.1.ebuild
deleted file mode 100644
index edb2742a4807..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.30.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.27.2: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-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 93b877751e73..9b33e0827ae5 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,7 +1,4 @@
 AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90
-AUX gnome-color-manager-3.24.0-exiv2-0.27.patch 1179 BLAKE2B 10c0163f9a3f904dd925e3ee56c8bffa12810b691d883fd7c722ab44d5c34f03325d10d511a7df79f014c12ab5a45265bd7d8091b99804530f57637e5caf55d2 SHA512 a499ac862c6ec5090e88733ddd560c0f4d351ffacfab14f96a5534c6889ed03e8e13e643519a86aaca0a95b25a08617b0a0ab73b8714989b65350c86a3b9003a
-DIST gnome-color-manager-3.30.0.tar.xz 2611088 BLAKE2B 2bbed2184d2c7afa9c4c4cd88470df3350f7deb2d776863dcd18ad6253538f1daee5f6397c598af8bdf1ce720980ede9280891139a9366edaffde3672d64b47a SHA512 ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc
 DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38
-EBUILD gnome-color-manager-3.30.0-r1.ebuild 1966 BLAKE2B de85be47080002284ce50c0ea7dbc88b1e52ed546a098d71c5176d6c6c3c75e8842afbfd57e6f94541effd9a70bde25840a3821a02aa2835c0390a6d8739c32b SHA512 d4a0162da5022473b75938aeec7f2f3c140cce07e6bddb3389111027320d19d1d97a3547eff36a1b3479bc8722fb3dab5df852ef77eea8b8f855cc4a0c93c858
 EBUILD gnome-color-manager-3.32.0.ebuild 1844 BLAKE2B 50be2919d7e59c1a8c8425e4fa25d13ef7261b63c71ec2822a5aa948f9d9d4350e88b8438c877a225afc067d8e1408db2b230d665f38909b95e8501b97d57649 SHA512 b77ceb55414a7172c80ba68e49cdb508c6c57765a8675dbbedc7aa3798884110e689bbe856841d7d8d81ce39030501ad84a47ae52181d7929fe4553f5851bb30
 MISC metadata.xml 546 BLAKE2B f85181a094ce55d8384761d521c8148f348723a18184a5043d534a329e27c98e0e9afc5064ea1abea0f9fd37b7f590c1006ad58e29d06a469f7a419695422a81 SHA512 1a3c426f2c39eab5f91d48200fe04f00d4a2148eee55c3605a46a5fb6991cec2d05de4a954ffd02f1f9cf2df3de134790ff229d1f3917008302cf19842dc3495
diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch
deleted file mode 100644
index 00878bc26a85..000000000000
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Patch kindly borrowed from Mageia.
-
-https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
-
-diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
---- a/src/gcm-helper-exiv.cpp	2018-09-04 13:50:05.000000000 +0200
-+++ b/src/gcm-helper-exiv.cpp	2018-12-31 15:39:52.288495398 +0100
-@@ -19,8 +19,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <iostream>
- #include <iomanip>
- 
-@@ -51,7 +50,11 @@
- 		if (argc == 2)
- 			filename = argv[1];
- 		if (filename.empty())
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified");
-+#else
- 			throw Exiv2::Error(1, "No filename specified");
-+#endif
- 		image = Exiv2::ImageFactory::open(filename);
- 		image->readMetadata();
- 
-@@ -60,7 +63,11 @@
- 		if (exifData.empty()) {
- 			std::string error(argv[1]);
- 			error += ": No Exif data found in the file";
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, error);
-+#else
- 			throw Exiv2::Error(1, error);
-+#endif
- 		}
- 
- 		/* try to find make, model and serial number */
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
deleted file mode 100644
index 67ba9af2b318..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson virtualx xdg
-
-DESCRIPTION="GNOME color profile tools"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw test"
-RESTRICT="!test? ( test )"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-# vte could be made optional
-RDEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-1.3.1:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2:0= )
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=796428
-	"${FILESDIR}"/3.28-remove-unwvanted-check.patch
-
-	# https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
-	"${FILESDIR}"/${PN}-3.24.0-exiv2-0.27.patch # bug 674086
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	# Fix hard-coded package name
-	# https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/3
-	sed 's:argyllcms:media-gfx/argyllcms:' -i src/gcm-utils.h || die
-}
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	local emesonargs=(
-		$(meson_use raw exiv)
-		$(meson_use packagekit)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
index 80d0627957c8..fb43791bb8bd 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.10.tar.xz 277524 BLAKE2B 3ecff07a7984b1edebf07d5e0199110bfb7e841a5da03d0d8aa55c0029c6e1fa6b6409bbb3294f02187d14ff55580159863f36cff5ce6157f23f1949a0e10661 SHA512 0e6a2874f633bfa32f0028f99c8535b3da0b44b3c89cf1e20a8dd23c8cf2e0e7bf7204af04587c4cf3a9614d9111814a8c6474bb43229178447cb3143672f0fc
 DIST gnome-directory-thumbnailer-0.1.11.tar.xz 278788 BLAKE2B 3e46f3daba581fc6e0e247521a3542207da61e6c8b7912b913ac3637427b8dde802876c1fdda79956b29036dbf08d7247c8452ac2edd7e0f13d6f35e9390692b SHA512 e66ec9855a2de58887425da1ab4f611471cb3f09418d43c24d1b47f4c05180688e37c6670c3c96b53478d7ed3c6a036b669fb129766870bad7fbca90cb726ff8
-EBUILD gnome-directory-thumbnailer-0.1.10.ebuild 496 BLAKE2B 183cac210a7897aafda4772c734dfd99d2a31b766b506264931f44e8aaccd85f80b49e54d06a0288e3d3bd2443d4c95fe50d0f4364729f53a9744c96f89d0acb SHA512 4501b8e8d2ac36bb2651104c502ba957c50a7626d6bdc80c842a8ab9d392ecbb8776f3451b8270ccc73d81dc725818b3ed8fa1d47301d6eafa62e67005e1501e
 EBUILD gnome-directory-thumbnailer-0.1.11.ebuild 493 BLAKE2B 5f27e89c10d2cee065e0506c1d6d00077c0f008f25f3fa8d3a56296b3daab70752dbc645c7eb5188e5889ca21eb315bdfa43750038e3cb3acd5bf5da137fe7b5 SHA512 8d6d4c46dcc1a30a687f8b400476ca95a65a7940b64c55323f570eee43a2fb32135c849ab22d93b3ebfa7dc1f9d06ca80a12ad4afaeb830bcf74258cdd99c420
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
deleted file mode 100644
index 3c9bd5ca9e13..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 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.36.5: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-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
index ffb75e315cb3..24bf35afea03 100644
--- a/gnome-extra/gnome-dvb-daemon/Manifest
+++ b/gnome-extra/gnome-dvb-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 BLAKE2B ff08784a7b7e995a0bddda724cd000a2f98da22d7e27897a837e345523c02c2bf016f96861341181b0d4f1ee9afc5104675f1ab2c77ab14815f08f34324693d5 SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40
-EBUILD gnome-dvb-daemon-0.2.90.ebuild 1676 BLAKE2B b6e578a0666161aad8a0a77ef4f94e673eebd1be060af0f6671f7042e47a98b92ad47583fda663aed97af2bbe765d8f038623457f5046b949993f73877b67590 SHA512 701844eb159f16f92faa65425aed4304521d66488f8d97170132eef93df44c2e0c86ea0adab53b479f1478af284ccbc8f73463a03f31aeff77e0d64918aa67bc
+EBUILD gnome-dvb-daemon-0.2.90.ebuild 1670 BLAKE2B 563debd3f8d7bfb0d84d53e19bd812a4ca77b1b32e85a53ff74c32aa306a653a3bac66198737c6eb4018c332fd560596634ffb7dbd88b0aa832a233f9644861f SHA512 35b461c857dc7ddaadf7e02ff48e92040c4b67e3eed2293643f5962139d137cd3128037b60b15bf74084f70235274ccac87d45a9bce4e2d042aa9e572b7ceeec
 MISC metadata.xml 587 BLAKE2B bd4ef7c759254cf493e4b55166deab4f94eea2226fbaa5630708b4217f2fda2f2b6537620b5a0fb94cf3cad8db87f29c7da05c42c85060475667df71cc8a88e8 SHA512 e3f3fcf4fefb21c6d5cdd394c3c663ba1f178e7f2f7432e3e03a0c2a546baaf328d25fed7dff1145833d8df17f955acd0e2d49db404385c4eb6155c961380243
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
index 9a58b212019e..b7703aef136b 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 VALA_MIN_API_VERSION="0.26"
 
 inherit eutils gnome2 multilib python-any-r1 vala
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 45d927c2b1ae..755ceaf4ea9b 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.30.0.tar.xz 110244480 BLAKE2B 91acfa8731a60bb98c88ffb23bf46ba5bc83feee51ed8a6ae7ffff5d5e7c7c5695db9fe715d54ffaa7b1cbe2fbc9c0dcae86b577f81deec6acb7bb57d92f788f SHA512 15d7db0aba5c4ce056700ff6f1d5c23ad5cad5c113ed9c83aa0e569262d6c489bb48eedc697d25e25d3cfae7df3b8da039b84c612b9eba9346b4b4c2b4494952
 DIST gnome-getting-started-docs-3.32.2.tar.xz 110300936 BLAKE2B 214e9896c0b3c3a4886cf24cbd5448d27a47cc14f0729e7c790eedd8a1edb3bd11dacae76b16f7b940bed81b74168927a0d708f6ab9e74ceab1c22dc22a7c651 SHA512 19b9c8fa9f03799287989c7cffb74bdb17b12d7045a61dd9d3d2921e8f06071f5f01b2d9ec956cede159208fd7ca4f367e11ef9820224e9a5f611100962c21fc
-EBUILD gnome-getting-started-docs-3.30.0.ebuild 418 BLAKE2B 1ea6ff77e0e9975a9da971bf844cbf67cd2d395ad1f0010966990b20570fffd94ea84446873390445e701163b6f25467e93895534f7708af6531989e43567924 SHA512 76e9dfb8cae83455ce77f4c62603d99543010c3e2bf91649de5a9fedab74f3b6536848869f7af30e2b01d922dc55fb7b80a3b9d39a277c405822def4d9562ecb
 EBUILD gnome-getting-started-docs-3.32.2.ebuild 418 BLAKE2B 1ea6ff77e0e9975a9da971bf844cbf67cd2d395ad1f0010966990b20570fffd94ea84446873390445e701163b6f25467e93895534f7708af6531989e43567924 SHA512 76e9dfb8cae83455ce77f4c62603d99543010c3e2bf91649de5a9fedab74f3b6536848869f7af30e2b01d922dc55fb7b80a3b9d39a277c405822def4d9562ecb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.30.0.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.30.0.ebuild
deleted file mode 100644
index 11df07c435b9..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.30.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 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-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
index 8bac4293744c..35cbde3621d2 100644
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874
-EBUILD gnome-integration-spotify-20140907-r1.ebuild 1081 BLAKE2B 2f30ed2a4f6cbbd72ebc3d3d33a95edc21d489ea04a3c2f4889bd7ec279a62f947b59aac5885200be80f21b2270fc0b31b8fded30c1b45b4985e6a305b75419d SHA512 51600ee06ad75c548ab67739ded6bb3eb98bef2ae438721522899986a4e0f0d04e3549532f3c220e022424dcea867c9b7af38c6aab3ff9f4b15a3161bc31c606
+EBUILD gnome-integration-spotify-20140907-r1.ebuild 1077 BLAKE2B cd83abb8c868a5c50cccdc8e045492ec5f0892f9755a640b6a848581760cf541882200f003bd60ec30fbe8268b0b95a06da3f9a3fd3cdb9c9e6ec9e302cda7ee SHA512 3c2eec0483bc668fba8612b3ac1580a4abcbb77ab265e5ef483fe296aec314f267d420f16485ad409e20e417a9a680624e17d66e3dfb05343bc999339e48b9e5
 MISC metadata.xml 354 BLAKE2B c924a3ff76f3b4722a0a97c8b74ee7d6dc22d45a7f968eae3c79917f3d44d2296f2747f8150ab2f320432e7428e88f369457da082873beac161369098593f00c SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
index 80f7d07320c8..d11085c1d918 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit gnome2-utils python-r1
 
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 7ae9746922a0..000601b53ca7 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,6 +1,4 @@
 AUX 3.32.1-leak-fix.patch 1262 BLAKE2B f50fa74524b820416135f9037046006aadb262edc3b13e3a1c48b1e3bbca385046a44e1a4449d85c8f9af6a7bf66e739f26c95391f8504cd6db703850bc9945e SHA512 ca04b666548233c879cfb992e45f62a97916a12a9959aa240b5c53415839ce1c972f0b56f528419891889049cb365e91311ae762241e333c3d3d78e2def57250
-DIST gnome-shell-extensions-3.30.1.tar.xz 198652 BLAKE2B d65ae90f6acf607aa1fe2eacfdcd22800b2dfcfee71240b600dd8a2e9e0320ed972a434a68a7020eafcfa6a0eec84572dc9f80258dc96fc205978882fe0c85c8 SHA512 492d99bac6345cc0c9e1a8a067859d2ff6d7b1b620277cac43429573e2e952af1a2ad3d94cc2fb5db3978fd15226c7f2231eb4d11fbcf1da39fe07afd58ee7b3
 DIST gnome-shell-extensions-3.32.1.tar.xz 198320 BLAKE2B 416f77ea37431f8b806b8373f9a18091374f4b40b734375edfff2f673af50c073c3e3091e2b9b4be4241ebfa647b7f44b0f0f6e69460876feb7f90901e499a29 SHA512 e587a17eace87e05211bd4a0b8101a731054c99ba708051f6549c5e19974ccfeff75b0802d190d327f5ee8b4595c20e747d492f82c86aa76e0fc1cf3d20f0e4e
-EBUILD gnome-shell-extensions-3.30.1.ebuild 2154 BLAKE2B d2bc2cd3cdac6db0d492fc47b6b6a26f351da43dd690f704ed46183fb91826c44c1b96da5f7e67f19d60631b4541163cde0caaa493f8ac8a9a10c2fde182b947 SHA512 3459288c9daf2e860f2cd3e129e1987d2fb77b052c68e965c117665877b2f7c45c9e6eabfd60e4485b60fefbeb20351c140ae3092b26948881e16d9a7c6bb59e
 EBUILD gnome-shell-extensions-3.32.1.ebuild 1960 BLAKE2B c189c89c27c37f439f7df7980c4ffeb87aa9d9ce21a8fa00d9752bfc8deca8e2ba91f1abc97eca9ae8b6af56b05618d00d61e6cf2cb50f2f5fc7ac739e967d5e SHA512 ced19c5f346bf6e75d81b2ce5441b6fd76e46b42addd5388b0430bfe39332ea3377778e17b346853b42893b15a6ac35a26c96acaa5a88eb192d32724ab10a0e6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild
deleted file mode 100644
index b920b4ed30be..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild
+++ /dev/null
@@ -1,82 +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.30
-	<gnome-base/gnome-shell-3.31
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/adwaita-icon-theme
-	>=x11-wm/mutter-3.30[introspection]
-"
-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 48788407d25a..998f0e0caa38 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-frippery-3.30.2.tgz 87885 BLAKE2B d79d27c1b9faa5c5f6351fee1f9ee7afe5c7eeaaaab5de94988aee0fdbe283d74eb4175606f70668b4297b295c325f569cb3bc02d26728985ca3d3075eb0c5cf SHA512 a33bc69ddc9ee16b944e456ca537b07b30cab3f010910b0b32a4a5b7ce64d0e766438587f2949a43bd9829ed36ebcdb3f236ea40ec3596a539e06d3fc1f9e6f5
 DIST gnome-shell-frippery-3.32.1.tgz 87307 BLAKE2B 06226a084be2587db1114d69d5f5c04a28682d3bb98e72c4d6d9ab34e8c4173c0e57c8cfc6a8b204b6d53a8ba3b5dccc9ff2db8681012176364eb20f2c6851fa SHA512 56604c7b47778454e61839e4c81445232357c5f6243974643cfc5f0524eecf8109dfba7af425ec0430aeb4c2845f58bcc9c0710087e6032b0b438e7db8be87aa
-EBUILD gnome-shell-frippery-3.30.2.ebuild 941 BLAKE2B a68eaeb55200fa34466e88edf3bcc5bedcd791eaa3e1b1a5bab912e38bf02518fbca47c9043e9d96f838a17989c8253537c7d1edb2848302edbf1ea2668a9142 SHA512 de23072cb8a342b98312859ed0bc3bb4c98e2ab8ee000d217a81af0c823ddfdab325748ed3937048e4d4210a691b1290f060714a98373590af266173f4d42116
 EBUILD gnome-shell-frippery-3.32.1.ebuild 911 BLAKE2B 518cdda9c7364f603a1df07142206664fca30d4d7cf0ba5d8427396c70acaf27ec61e689fb721cb88d37e35d73b85199af28330639cc3b1756b37526dd0edbf4 SHA512 77181aea64f07696764dc3216fbdbcfb6cbb31214b5a9acc801b994e63aa59feabf4a90dd12f2e6ba00a3d5359c283478141e6757db568de85b95ac9eca92897
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.ebuild
deleted file mode 100644
index 2bd0d45c7cf7..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.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.30
-	<gnome-base/gnome-shell-3.31
-	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-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index c58aed73d508..067eee0a7a56 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-system-monitor-3.30.0.tar.xz 762004 BLAKE2B cf0ef6dde12a34f537e632dca6b45fc16ab49e92aaf49d2e945dded25b5cfbd855506368b82a0f840808760ce563f54fd8683f5a35652a5e10cdb4972ea61864 SHA512 c33dc510b15019de745a88d3eef12b5a2b19048bda22878988f22c4482f6a26ab20f5913f3104f2cb1b9566f7148a08b53d4e548f71345363273c51840fa2c8a
 DIST gnome-system-monitor-3.32.1.tar.xz 676936 BLAKE2B 815c677f637919966868b454b47f9633f130155573f7895e0c70025a59978818051bf8d087761d15416ccb0470c7341365dd95fdeabcdd0711802f828eddfa37 SHA512 badfb98e4508096336bba4be79ce359cf4363649e97c1da534ed96a04de4bc57e12b84ed75bfa9086e00b61b6558ee4af25eee14f0d2636d3ee0b62956122cbd
-EBUILD gnome-system-monitor-3.30.0.ebuild 1147 BLAKE2B c94f55af67e7fe12ff64e4c9de07a9dadf28e28eafc87f8e8ea0257b5f58f033fa810dde76fe34ff18ef72d8a816c077cdd797824a6b477c965ffbea5c520ba7 SHA512 317dd102159c6bca3804bd9f9202e254ee531da4c67aaa4bc289b997c0d65f971b888d12ed0e7380c5bacef2622403d579f500fa6c7a3f985b2121419f1b02ad
 EBUILD gnome-system-monitor-3.32.1.ebuild 1158 BLAKE2B d734f3eb0a4447210fc213ae71f94fd5b796d1c31728e79591b6ee1d3d9f0774ff6f226f9030e26b4d7caa20ca2a4cf704d4ad20000e70aa87defef2c52d2d9e SHA512 62ec004d8732b0195258c7a2b3aaffa6b91fd954cf2292fa3c521e7bc01b3bfa02698b0599f81e1826d642a097c59afc7a47c417b620240a80bd1f66e8791246
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.30.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.30.0.ebuild
deleted file mode 100644
index 5da51d2e0e18..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.30.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.22:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=gnome-base/libgtop-2.37.2:2=
-	>=gnome-base/librsvg-2.35:2
-	>=dev-libs/libxml2-2.0:2
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-	systemd? ( >=sys-apps/systemd-44:0= )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=sys-auth/polkit-0.114
-" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use X wnck)
-		$(meson_use systemd)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index e9fee46cdc06..d3204dedc183 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,6 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
-DIST gnome-tweaks-3.30.2.tar.xz 281820 BLAKE2B cd980f77a05d74f556fe461f1dc35122efb23ab0885b84ddb71c873dd6cb424d4ae213d393b7555f8baed8eb5fb3df8afa7d9b4cb92d772ba9eed59892871bfe SHA512 183df35e8051aa1fba54ca45aca64d665f28d92c56879ff6fa60adf3809a05676db15d97d7023bf5ffb9bac33df259eb62742bee3cebeb87d8ffa39679b2c078
 DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
-EBUILD gnome-tweaks-3.30.2.ebuild 1189 BLAKE2B 359f73adc1a74e8739ab1c1c7abe35320dbb149a7dbd3120dc7683904f9f7604ad2715f872864609348b42829f829b4fc2e5e7faea8ce6c2c4ce06139249eff7 SHA512 87471cd3e49470556d089fb000f54bf7373de8183fa7ad7331296659da247aa1dbc0e1347c1e15617475fc561fdb1f83e267b66b7ecc72f83e12a122947c2269
-EBUILD gnome-tweaks-3.32.0.ebuild 1199 BLAKE2B 9ffe4240fe9bd5a27a9dd8b3ee78a78bb294f9bb08f616727f59e5b1b52b8c511304a44545d6b4779557b8281aab2bb68d4e550e3e78fa5c84bfd988fd28c859 SHA512 39214eab5c2aaad856c47eb245cbd5ddfe2f8f337088d7c2d8bdcf2e9c12a930b1616cf9106fe8dc3850c97e8f00872734e927227fe496585a5173a6e9f7a92e
+EBUILD gnome-tweaks-3.32.0.ebuild 1197 BLAKE2B 91c91da8ec72c7a5e04310e7062b6491353ee02bb9482f34d5052673b8000b475cd992ae55e3e4d10922bad30d7c9ad016d4f515edb783c0ee1750f50bc9e6aa SHA512 b3d6c6b0d6752f053ca36cecc0906591f86816bd17b76b3824e958cae07dc477af0faaf52932564d733fcff0ba655a329a62c14fe9224ef18a8e855a49837fcd
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.30.2.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.30.2.ebuild
deleted file mode 100644
index 7b1c7924d1f1..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.30.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{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 ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-"
-# See README.md for list of deps
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gnome-settings-daemon-3
-	x11-themes/sound-theme-freedesktop
-
-	>=dev-libs/glib-2.58:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.30:3[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.28
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.28.1-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-tweaks/gnome-tweaks-3.32.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
index 79e291ecf8d0..e01e362cbc48 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit gnome.org meson python-single-r1 xdg
 
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index b2877905b4ec..aefb81a18f28 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-user-docs-3.30.2.tar.xz 15707236 BLAKE2B 4a0f83078c8a0360719a89f8a2a0d79d564452fe65e7037479288730c5155be1b26901c10863e9b35727c23458b7015ade326db6a6f78fa95b8f541b3dc5b361 SHA512 43f2d12a1f5ca03e5af24f599f688f1ed849d8466cb12f4b67c36601a1b6e236bd98e505ebcde677ae80be8cca71b32996bcb87715fa50c30cc5729ffc957b33
 DIST gnome-user-docs-3.32.3.tar.xz 15861776 BLAKE2B cc4a73319ced02d7e087d2e9e1a70db22fbac3f9bebc34deb029c913573b34b58977007fe274841c6b61d05c3e169f959425c28846f1c741944f61c1c01b53a2 SHA512 4b62be1812ae67283281ec9d5dfd7e694dd01c04ede949cef76ab42dde72b74f90a67bc359e86700f515ddff920fb81a40e91acef56c85b40b49ce0505c1f7ed
-EBUILD gnome-user-docs-3.30.2.ebuild 947 BLAKE2B 8d88a8466d0e57c214d2606592fd5489c6fbf7a5afb00954ae6af8c6514a0a6c2f6c05e9ea154665390c330676051c283328a6ae56d71917c37ac542e6a99889 SHA512 b9367999d5ab3aca4a6084f99147ad0bbdb9c755de27e9ee22563bba83f0799c24dc233fb4972368f1d3ff0586f6a9034c8532f902335a8df5bcd73405854916
 EBUILD gnome-user-docs-3.32.3.ebuild 947 BLAKE2B 8d88a8466d0e57c214d2606592fd5489c6fbf7a5afb00954ae6af8c6514a0a6c2f6c05e9ea154665390c330676051c283328a6ae56d71917c37ac542e6a99889 SHA512 b9367999d5ab3aca4a6084f99147ad0bbdb9c755de27e9ee22563bba83f0799c24dc233fb4972368f1d3ff0586f6a9034c8532f902335a8df5bcd73405854916
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild
deleted file mode 100644
index 359d9f28abed..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild
+++ /dev/null
@@ -1,41 +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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	test? ( dev-libs/libxml2 )
-"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 2c86e9ee207f..d8f032614a46 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,6 +1,4 @@
 AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6bd0341d2c4ab42b2eb5ca331deac58f669a02bdf559fc29e01cd028bcfd3494733e76bf649d4ca77836307e219c7060554b251583 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b
-DIST gnome-user-share-3.28.0.tar.xz 393516 BLAKE2B f17efe9b763b14bb67837d65973f1125ac2bd9d49dabc359aca6fa040cb32d656d71236e306b4e97b39e49e07198aff4b3f456d62937baeff01b50d1a5ccfb67 SHA512 1b7ca604fec69402312f801d5b7117d99cb82bca674a4e4d279bda8ba9ca96c70dfd2c815d571094c1a95eb0e9084cd560445257dce194f6050d68c17ae4bb1d
 DIST gnome-user-share-3.32.0.1.tar.xz 439696 BLAKE2B 278e46adfdb2a24a2b9d8d76e38bb9a6cb1b5ee85c820fbc38aa1ebbed2481537dc8686dccef3d213c0c83bb236f1431a9706b3d6cceace78172d93798534d76 SHA512 d644aaf0c0b593188936505391b1927d883234ffa5acd6d04675575fc68409512b416d87ca6d0a7960187b433a874f2da6ec2d304eccbab8846446f89df8297e
-EBUILD gnome-user-share-3.28.0.ebuild 1361 BLAKE2B 750ea44f8f4b96625e1c30b0e11d968925f7adf668f8510084f00eda5dd0fa982d024060e1c7cbf0f634c19fc09a0982cb5bc9e71483d28a74b7474561fec9c2 SHA512 e2c577b6c2ee9a9386f3b4dd5574421fcf90aabb6d08c05b188c3558dc2e5ae9881e48738988acc42bf57442bf654f9e6c20b1716a8bfde88c95cfc3a6b67250
 EBUILD gnome-user-share-3.32.0.1.ebuild 1302 BLAKE2B 47f30955ce9feb450b618ebdd019283627d038dee881551d29fef3c8a62a5ec454d136747d3cf39e16aacdc1af959c9fd5a8e3c0329c6688b96c06d660307f63 SHA512 ffe2f8a27ed53c321d68ed04c17e1d47bff42cc51322429268bd557c4980c9714bca3c850495805dea27ab7ebe4a491be5f981af915dc949ea456f0fce8ff241
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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
deleted file mode 100644
index 261d8913584c..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.28.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib systemd
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-# FIXME: could libnotify be made optional ?
-# FIXME: selinux automagic support
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/nautilus-3.27.90
-	media-libs/libcanberra[gtk3]
-	>=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
-	app-text/yelp-tools
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Upstream forces to use prefork because of Fedora defaults, but
-	# that is problematic for us (bug #551012)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
-	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 5ca6a8a65c0c..1add67ac3ad1 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-weather-3.26.0.tar.xz 5362056 BLAKE2B 0a427f8be6f8b79346d106430f6673961d03ca6770940f92eb866859907c7dc2e11805091bd9715e922176acad5c971114c9df33e6551c8992051e6ef873a298 SHA512 adb5400ca2674142132e499880793f9c4fafaa9a4459b2718eb24180480f8e4e1edb81aad947283208c3fe32f1c662d380421efa1b6b57968268ca64318a33ff
 DIST gnome-weather-3.32.2.tar.xz 5952300 BLAKE2B 536cac87066eb714bba15db0e662d9e9a0260caf67f3b9d7f2c8677deb3dc514d50768754bab46db1df9dc11367d1cf07690888b93031804d7a37a3898a1a689 SHA512 22f2de0f6d4355a44fef332d47a49b995d647d3d8d10c06a77c182d0efd6ea33f62e055f047a665710024ba02c90912ffefe67c8b299da6bb47d899d1d7a3825
-EBUILD gnome-weather-3.26.0.ebuild 1177 BLAKE2B 20381e7294ecb91ca995ab31244fd46921d7c3ebddbf7a68c4fc963bf16f2acc470b321f59dd3ff45994dc5c3044f323e950de1489bdd5d7d4dae93e74741454 SHA512 a38bcb26cf7139329854b1ebd5880f3d2d3ffa2a6b230070840f96d3259401e22f4e9fc48b52fc6200358085c1eb2795849ac49763def919e82ae6e6e54f450a
 EBUILD gnome-weather-3.32.2.ebuild 1245 BLAKE2B b8568a1990fd9f366784171f02b555c75a51ec9127fb0571d5aa60a67d9242c0081fb9dc2de57857daa3c415e24fe2ec59d795c86669dd5f3d9d1c7b768d8b56 SHA512 5fa1e70740f4d33d27db6e063df07b2c8fb691e5acc98247ad91e6e748271fe3ae48b554b4548512eb0c1a5a1ad531cbde99c1582ed8c9fc072b40a0f4c1369c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
deleted file mode 100644
index 1505a4345824..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-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 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libgweather-3.25.91:=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.11.4:3
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=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/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 0f8be59cce4a..dc4ea46ce80f 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,7 +1,5 @@
-DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7c3310e40984e482bc5120eae45a7e3ed4cfd878890037f31ee540c700dea3120119b9a533fa79cab317a0c83a8 SHA512 bb487de9358c057fc73f3414c9515726315be9b6d78456253daaca1cbd58281de8766e0b72914532d63fab04d3ae2cf90f711f436c7b4f70620d77e8a7802ac9
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
-EBUILD libgsf-1.14.43.ebuild 990 BLAKE2B 6e3ee69f2a1fafd74d478f3c0e1d57306d8d43ca09374378334fa23ab581adfbebf1d7c0913f029bb751c4b29fd4764118e562bf3f3f841229c666dc60a34d25 SHA512 37cb2f2bf5560b7125cee0a7cc2749101580a1e5b96d7bd7d92dfa32ca587a240d3243a679643eea23a96930d3e0a2452b05a14eb14b9fcdbe78a3791dfcd695
-EBUILD libgsf-1.14.45.ebuild 991 BLAKE2B 7dd006712af212e06cbe10a897483b81e6ebc894abb95d931d70658d81bbe9e1a88aefd1c7804e8a69ce9a4152ff030de8a516bb8e83f2ee5e7515375e8376d5 SHA512 e42718bab319b74dab00e31ef96bdb1498ddcfb717db5b183d4bf887398db71e6d87c886a01032422ac5631a0446b7c5c65efdb801c788feb2188cb757cbcb97
+EBUILD libgsf-1.14.45.ebuild 990 BLAKE2B 09419741750747586c483df2b4d7b25d76b80acb4f01e7122c7c9fe0f382def8fdf1f17d66016f7f488f39136001de3de1794457582ad36c3aa898d484b80621 SHA512 da3738e2e5c68672d50cfd521a32442dac72f7261c1414060bd9b08d78a73f96f03ba1b728cec613c2455d976c05d3a5490fb86ec0cab547eeb0d951eb8ace29
 EBUILD libgsf-1.14.46.ebuild 1000 BLAKE2B 050b8e91952c3da2690ba442a109b88d8c3ddd430208c5c3526fa546868998a5db6ae46bfacd623c99214dd2579416220f589a0d47e3f0f7a312ef0f6cc2a4bc SHA512 2e293446446d8f556d05cb764960bcaf0bcd5fc4e8c5264393e55dca5e16f6eb995a00a9fe82abfae80febaa4dd6233105e1f042ea35997c9eac08f5054a5426
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
deleted file mode 100644
index b2245def51a6..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.43.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
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35.0
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index 4d2e27fffa0f..13881ea7558f 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest
index 427020c86727..f35df61d105a 100644
--- a/gnome-extra/mousetweaks/Manifest
+++ b/gnome-extra/mousetweaks/Manifest
@@ -1,5 +1,3 @@
-DIST mousetweaks-3.12.0.tar.xz 287236 BLAKE2B e0036131b3f6066b0fdb8dfb92531d1e1c1c1366c14f6016a8c41333892d85b6c7f11a754d82d0f3227b57b80d7bb72f3e0f0264c422fcda5451205ee3fc75a8 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0
 DIST mousetweaks-3.32.0.tar.xz 372088 BLAKE2B 59e6dbafe9d8ec2cd0578cd1a01ff9e7d575fdac2381998653f1a91ab4493e02a0cf99a187a47b39bd277726df912e32d5572a39df27858de0929fa3999a699e SHA512 3711c2aa1bc40f80a75857bf8a35dbe24443f8040cf8131e32818c797da44f2bb54d58f804ec8df7a95f66ff2e5db8c48067fca97c16ffa59239ecdf101c4a52
-EBUILD mousetweaks-3.12.0.ebuild 642 BLAKE2B eda36c466c7598a60345c427381b3401562d07351b2fb93601428fd5eed18a188bb2b3ca112815535e4efec393a1018f2fe273ef0d8909be0615fc6738dc1bb4 SHA512 d8dfddc9ae5e4a73a542d4f02b50887437cf45e2618359cb746eef082fadc2d8d830dbac47d09ecfb787b0dc7845c3759f507efece54c8434e3956daedaf496b
 EBUILD mousetweaks-3.32.0.ebuild 625 BLAKE2B 9c8d34cd2642564f9b7a0a9e652cef0df1bbff89bcd2675f239f79bbc05dbf8cdb085b1da1d030ffe039c8fd19e196502b9ac1e33925635fc73fbdaf2f28b977 SHA512 bf6b3af2fa71f97df6fa2605b9e26c2e24dd118f3bcefc92a46ff06cc37a264fc3a0bfbfdd7e9574237578bbce3551650d8294db0c87a55ebe6e324dfb728194
 MISC metadata.xml 992 BLAKE2B 4949c671cddff34432cb834515eb2a320e229b92d7d7978195497a027984e8d26545f12b2287a3655dcadd2fcf6f7d0a77a5b1d037af58a5d242b031203f27a0 SHA512 81582de18c045117b2b854561e628cc80ee942179a187787dbaefe835d0498139b05fe5486cbabdb1fbfe0c399be230c5c3cc2a7c18c5de8cf465642873b8f27
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
deleted file mode 100644
index b875f76ccf2e..000000000000
--- a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Mousetweaks"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-3:3[X]
-	>=gnome-base/gsettings-desktop-schemas-0.1
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXfixes
-	x11-libs/libXcursor
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 04aaa191785a..943adb5c94f8 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -3,7 +3,7 @@ AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5d
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
 DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
 DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
-EBUILD nemo-3.6.4-r1.ebuild 2132 BLAKE2B a7b15a4ec18b81c65e68ac6b88f88ecd7e42cf6965d1398e7f65d8bcf72109d760e8e88741444325619a5be6278099b52fb6a0b6be11effbb6844b0e86c0bf6a SHA512 a0bc57ff5150ad30dbfbde7f73af2561a59de7651d37a0c39738d62d9176258ebe9fdddcde8e0e4c8dc9baa1bc113b0498157bdf5cf60e55a208219ae94366c3
-EBUILD nemo-3.8.6-r1.ebuild 2027 BLAKE2B 120f6f91393a3c60d0d7edfe9d21e4eaf57c86513b35c02f41c748ad486fe2fc90fac61ba33a0dffab215c9bc2fa6e9c8461991d3c80ee9461e40809f70af925 SHA512 22e405c96bdf037279c951591f4b88b352a5ab3833faaa5bc3dcae18c36a2980ba6472e5011d267bad37427643cb70a2c8a024b4a043695588ca75c6c4c308eb
-EBUILD nemo-4.0.6.ebuild 2025 BLAKE2B 53eaea0d9487f8b64c37cd45176938f89b260d12d09e547ac5e49cf66cad92b83250cdc5c811fd3e27929719f868f5ae1fa46500d5f4e7af4ef3de5b6d003cfd SHA512 0a2bffcc1acbd217efb550b400487f173ff64118a0c67fa4686398c0ab2a972531a0e98968d4cb8afbab6c3ff74a2cd51667c31322489777b13d0b5eba051a0a
+EBUILD nemo-3.6.4-r1.ebuild 2128 BLAKE2B ba681f1fa35f5025c2d1718ed566d530450c1b3ee875575124134e5173d7e2fe561ac002ff12abce1934707edb5b279351a5af6d1b17df1cfe8255cb8c008ae7 SHA512 2f102a1c41655a867b3adb978664994165d278205a59c47774b7f2c7a69ac22cee652a2b46f037ca6177d1ee736d80a006ad16d45abc5ea917721c56f75d13ac
+EBUILD nemo-3.8.6-r1.ebuild 2023 BLAKE2B 89e83b14ffba749ef8cc326b5b2e86653017b90a63ff4a0ce99bb25dcf2c878b8f92c852d6f1e7113dab0956f3de571291622068c90f72df65bd3e55b8a9d513 SHA512 377c2b4a9405e523511cd437a6151398e2e281881408ba42eb906e9467656a69afacabc4bfaa6d86ff8456d6adb22fdc4a05507ff3e539e5f818d7ca85c47757
+EBUILD nemo-4.0.6.ebuild 2021 BLAKE2B b7a9026c2515f7b91eb747249a15b86f6f59102273ec8871463ff99ae1939ae13db957872d9aceabd963deb1033e76433f4ab8618c308e00c319874ee8cb1835 SHA512 eacd7f0ce6a3f4974262bfa35c2acdf9e63165817ee7d94412c486a7c47741975f23e94c8f6ed3094cc260929ca734e54e787a2000e64a5fd39846a26df1ecce
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
index 7b653aed9ab7..277e124fd0b6 100644
--- a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
+++ b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils gnome2 python-any-r1 virtualx
 
diff --git a/gnome-extra/nemo/nemo-3.8.6-r1.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
index b1c30effa3f7..4cb8a272e230 100644
--- a/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
+++ b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild
index f94d9908016d..662f989624c1 100644
--- a/gnome-extra/nemo/nemo-4.0.6.ebuild
+++ b/gnome-extra/nemo/nemo-4.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
diff --git a/gnome-extra/seahorse-nautilus/Manifest b/gnome-extra/seahorse-nautilus/Manifest
index c37c68c7d9d4..d50b0f48e13b 100644
--- a/gnome-extra/seahorse-nautilus/Manifest
+++ b/gnome-extra/seahorse-nautilus/Manifest
@@ -1,3 +1,4 @@
+AUX seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch 837 BLAKE2B fa8d92171af088031804beab1356d4e43249da21d977fd33a524150cce8d3d0fd9180e9d8bcd5d96954b5821e40bc211a53d1be690836018a850ebcdda4e52ad SHA512 eabcde1d066c3e3d1ce95a437043b84ce387e2f81eb1137c6b6e4db96b89e7a30c61e792b0221625277106f8d5f1d19f22527c61a70026d3230f11aebda29eb8
 DIST seahorse-nautilus-3.11.92.tar.xz 395304 BLAKE2B f7c741a2d0ae06636ed380c3b8f0006e183bd2eacae87f0c1bfa0d4f1fa0834401a86b7a2b2b21df268ec18b57fbeb6805f30dc20ae43e5456eb05635fda150b SHA512 d3815bfaaf2a5e96beb94abe01fb3f7733e867a04681d4bed540fce58f6556c62534d3217ec0bf1452e848551a42ec703ec241029486d3dcd966c16ff27b87f2
-EBUILD seahorse-nautilus-3.11.92.ebuild 1237 BLAKE2B a5f2583478772c57fd3d87a8c4b6702f96da40db1b02b45f9ed32ce7e06c228314bc47c4150eb2ab5698b1860460d093cb0f150e94c1de9a991830c50267ba21 SHA512 5dcfa5af58c3de8164df46705c17bfbd3a3a42a47256a522e8846086c544efecc761040f11dc392dd6114c51c6dafe024550b056f3c331b038bc2c77f11feedf
+EBUILD seahorse-nautilus-3.11.92.ebuild 1399 BLAKE2B 3f7397c8bba76d955f9910b0e0150b5a98dc71115d4c63864525ef8f8a721bfdf1bc1240ec1795484894c715ced8762f4dd4db9b98d04821f9841e3677bd5d4b SHA512 bde90ab73427ad5429ee32169912cfb589bd82e77fd9df866fdbf386fcaaf1646a925d9fef7c4b67f818df407f20f836db0998f2c6407ea5fe14b4864b8b7716
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch b/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
new file mode 100644
index 000000000000..5044cd7f26b2
--- /dev/null
+++ b/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
@@ -0,0 +1,31 @@
+From 8193f85dc3caeae23e5931c10f52ac9c5324d9d9 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@redhat.com>
+Date: Fri, 8 Jun 2018 12:40:09 +0200
+Subject: [PATCH] Remove libgnome-keyring dependency
+
+It's not needed by seahorse-nautilus
+---
+ configure.ac | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 471b34d..8d1f39f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,13 +146,6 @@ else
+ fi
+ AC_SUBST(NAUTILUS_EXTENSION_DIR)
+ 
+-# -----------------------------------------------------------------------------
+-# Keyring
+-
+-PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
+-SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
+-SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
+-
+ # -----------------------------------------------------------------------------
+ # DBus
+ 
+-- 
+2.14.4
+
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
index 0dc09ebdd133..446b85c14372 100644
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
+++ b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI="6"
 GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
 
 inherit gnome2
 
@@ -45,6 +45,10 @@ src_prepare() {
 	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
 		tool/seahorse-notification.c || die
 
+	# Doesn't really need libgnome-keyring (from Fedora, fixed in
+	# 'master')
+	eapply "${FILESDIR}"/${P}-remove-libgnome-keyring.patch # needs eautoreconf
+
 	gnome2_src_prepare
 }
 
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 46f2f9aa6a1a..d8df2f520f61 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,5 +1,3 @@
-DIST sushi-3.30.0.tar.xz 296940 BLAKE2B ff8617aabab16d41c9b072f8cf9774e4f5ce59e0dada05dcad23ba6929005c963d86a1beb5c2a3adc5e8cbaf8a6ce769b48ff53f4979db9f1853bbed0f80fb2d SHA512 48d2b960c2ebe86cdfbd0043968acdd6864162368941b921f25e137e6aeb2a2513738ad4d8c6ef5d5c6d2863e6ace5d2819e0a5dfc487efd20a1914a7cbcc40e
 DIST sushi-3.32.1.tar.xz 65172 BLAKE2B ad6d085e3c67527c988695195408e2dd8f82effeb0dacccb63eec9d3896c82fb1abf8d0fb92aeb6934146e67e8e203e438a900d4164d673b19cbe6af9d9a27b7 SHA512 db38b690591f7c7a5e55b7ad7a37022cd0624f48af6fe1c56ae05aa74598d767b61a1636d01ba207c399739c0cee6d266a52207a74f65f3e27216c5dfdd17909
-EBUILD sushi-3.30.0.ebuild 1422 BLAKE2B 2da3acda8e006e0128e2ffb7c4c0c34dd808bc96f079d6f184e80aa4904ea31b28726e13ce4ff41c6a1e4ea42f7e8a03bd07680008d5833b1bb419fd22d4d2b7 SHA512 3150b6e904569b47803a8a7ce26060948e494c8e9ebea06558483b7be0e7d094ecadd6f90340c7b71d09e432ac91770049ec2002564fc4ab6ba342dc8c644c89
 EBUILD sushi-3.32.1.ebuild 1349 BLAKE2B 318a284fe3895586ddb9ff4a2069704f2b8d5060926cb288b5065a7bd192cf3a26965dd943a493beeda75c02b23f46cf6c42db7616979ee6d13c6467518815d6 SHA512 69c401e1fad00f18d7d5396e0d217b7be7f35db0e303944e7ac4545c68d0422c7be5d4bc78744f9a9bcf18ac82a506e6a069c9b13dff9a5d7a993215c39e87db
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.30.0.ebuild b/gnome-extra/sushi/sushi-3.30.0.ebuild
deleted file mode 100644
index e5e99513d771..000000000000
--- a/gnome-extra/sushi/sushi-3.30.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://git.gnome.org/browse/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="office"
-
-# Optional app-office/unoconv support (OOo to pdf)
-# freetype needed for font loader
-# gtk+[X] optionally needed for sushi_create_foreign_window(); when wayland is more widespread, might want to not force it
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.23[introspection]
-	>=dev-libs/gjs-1.40
-	>=dev-libs/glib-2.29.14:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=media-libs/clutter-1.11.4:1.0[introspection]
-	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.13.2:3[X,introspection]
-
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	>=media-libs/harfbuzz-0.9.9:=
-	media-libs/clutter-gst:3.0[introspection]
-	media-libs/musicbrainz:5=
-	net-libs/webkit-gtk:4[introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-
-	office? ( app-office/unoconv )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/nautilus-3.1.90
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index cbd88361a564..87c133b1ad07 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,7 +1,3 @@
-DIST yelp-xsl-3.20.1.tar.xz 568400 BLAKE2B f61151777eee346d08ecee2903fcf34759581b782662658a6af68f6623e62f9773ef842fa430655871033f39f10aa50481543c4d88f94c6484709fcd3d3776a7 SHA512 7ea22c3180261917d1a277a9b5023f9b2b22346bc3f55cdb1c61c4ae8f78411da93058b55f99c25c9a1bedad21ffa6c3dc460e1ee98614a84a4efa2c2449baac
-DIST yelp-xsl-3.30.1.tar.xz 518444 BLAKE2B 013dc16b04129c714c1938a0cb02f9f833a5a234dc1414387350c01c6f7659e87b0aa6b40e063605b0e5858e2bbf5201410b892ad728086cbca117e4bb942d74 SHA512 34d3a7a95af72a6676db1da2e6bf0fe1dbb3a69b1a82cab2998e305a76dd140012af129c204531c9bb03c5e0593286a4d8833e68b401903e967005f422c6a54e
 DIST yelp-xsl-3.32.1.tar.xz 528412 BLAKE2B 0e35757b8bd4139ebf436f69c6254cb26ba92f13d6ce345093b023151d3127f70a866572e6d42c9c93d2faf85abd6dc0ef2720955f5defab3c3415605eaf9152 SHA512 05a03e045c8278faaf39604d6cbccb449130d2c85e3231c8c9737e344fc249cd2949011fb1a0e4fb6085dc21374e7804fc7fa4161f51607d93b301cbcf5453be
-EBUILD yelp-xsl-3.20.1.ebuild 579 BLAKE2B 9f4b14a79c2a09f5edddb932f601bf4c8aa52397d2881811d92e35be3444c407732aa84c10ae6318e39e298f4ec7dadf02c3cf8f839a4711e38d8bc0027bb4d9 SHA512 a3bddbca44c628c86be56f0e4dc7c8013d04c279e46639419e4baa4dddbf443286c9fab01d6fe6138ecfb746f8c315e900eee788b5dd72fece8cbfaba2758a07
-EBUILD yelp-xsl-3.30.1.ebuild 577 BLAKE2B f5177955301184a67d402f2b3cd0eb0f8c78fbee539b0b2489ddfe82bf9eb5c6ba5b47b16390198be77c4fd36a6e18bf0a904f59d0ee83fb56627a8af1945c12 SHA512 fb6326a45bf8c3e470e7484f0ec681d6a386a57de47753e29fa001871da45a28e4076942fbc89ee1f1f1b14fb7906c44f97b23ba6d83ef256bb302cae4ffcc5e
-EBUILD yelp-xsl-3.32.1.ebuild 579 BLAKE2B 106e176fbe4cb06b9cbada66fffe3a402451865ff7a6486b1c34c5094476b8c576e87dba1da9bdf9518512633a74a6f4d72651347c40232c1a7c39996c76c16d SHA512 4fc7dd00f6e60e8c68ddff1d6b70e1a0b6e0f72000a7e55774d0119e30081f609a8588b1780b05bdd457846c37b8bceb148145fda907d3e97768e375a36e1f55
+EBUILD yelp-xsl-3.32.1.ebuild 576 BLAKE2B 1e0d3bc5e1179ab40ed6dd29366393928c118c2de13098929e451e0e3fb4368619ba41bf087b111ebd226a8a102258b0d6d273ccfc19d360c52a5fd27ae74006 SHA512 0a59595612e21aaf5906dea3989521cad309d68bbddee0a597fe20bae48f59f4939e2e4dc96013da016e692617d12f8e910aba8b071b1a24c9f3e16ecb1ea523
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
deleted file mode 100644
index 54310318e743..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/itstool-1.2.0
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild
deleted file mode 100644
index faec425772f7..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/itstool-1.2.0
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
index 2090fca6b649..333bf1c28a94 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index db363487bbf9..b7f6022d6d5e 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,4 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-3.30.0.tar.xz 1393176 BLAKE2B a00277f7a2498d2a6c51c8375fc52293a40f111ab441bf00e25fbfa054914e4752a65b8fcb5eace74393c61431a0e5c9bcebe8b35dc8b00f96d3a3c362079f77 SHA512 fd6da1731e55bd796593f0ed4d566b380996d21ca0264033a5b6afaf0ba8d445a2b04a9fcbe0a1091f2244a6ee2c92814bbb86db8de59b2c230b746dbd0df564
 DIST yelp-3.32.2.tar.xz 1538964 BLAKE2B f4d7947f29b40bc033e2d3e010c39f8ff43de765bc4a2c446f02beab4888ded287681db2c140951f19aa9075aceff6f08658d0f434b5cd9d39e7e53e6cc00c31 SHA512 be0e2a7919ba8aef8eeb13e4d195e745afcd113350b32bad5ccf204f544107bebcadee364508402ad7906dd5484b9f21288ae13edcaab47a02b54e31f3379cfd
-EBUILD yelp-3.30.0.ebuild 1267 BLAKE2B 313237ba752c3a7b3037a435e3971ccfb6818342cfb9634ddd594b82fa290c1132ef4add7c357d94a9dcbe015ffde3bd6f6db13f5c0fa0fa1ab8826ef02e58a9 SHA512 aa1c5a067f186a37b97f02f43bdd4e0509cdc9c4722bde4117a19dbe477b7a186d2155dddd01b7d1748770316b4c078ac16563e93ebbd23947c674f5c1d4e9ab
 EBUILD yelp-3.32.2.ebuild 1241 BLAKE2B dc6aababbafbf7451396d75235317cb82578e015c7c40d4da7ddd265f6e1ea94bf5b2e459c855b433c2231673aa0cd8758d6ea23fc20e6ca3fa17a4a24305816 SHA512 052135b016b3ad439c9b653b50a42123383ef7183c7200cb77540c4c02fd4bfdffeea4f79ed13da2bc00afdac4cb1ea980592fae84ff839f199e7e27f414f492
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.30.0.ebuild b/gnome-extra/yelp/yelp-3.30.0.ebuild
deleted file mode 100644
index 45a024bdff19..000000000000
--- a/gnome-extra/yelp/yelp-3.30.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.27.1
-	>=net-libs/webkit-gtk-2.19.2:4
-	>=x11-libs/gtk+-3.13.3:3
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-bz2 \
-		--enable-lzma \
-		APPSTREAM_UTIL=""
-}
-
-src_install() {
-	gnome2_src_install
-	exeinto /usr/libexec/
-	doexe "${S}"/libyelp/yelp-groff
-}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index a0e4919fa804..7f9720d0d0dd 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,3 +1,5 @@
 DIST zenity-3.30.0.tar.xz 4485332 BLAKE2B b7dba31693849222f1a01a037a271e20d4ca58d51247635559f66e2afa848f9861b3c6e435d18a882d81263dac02d96e6673774131bb6ccf6d1f8c32dbb2aa40 SHA512 f80aa6c4fb0726bd4db1010dc3b6ca89476272cd4b852c04225bc9e2dc365ec34f6a55f0cfca474abcfba4d28dc47b72f81e8b3c447c0f99e843251c84807432
+DIST zenity-3.32.0.tar.xz 4753752 BLAKE2B 220fbd374f2564b345f4668c0583f2678a296bbb0d344af55b849b4e7e718f29856bd43f7ae2b0fa492e3d1d8180ca160236fcc806cd483716f680d03aa019d0 SHA512 d057df25dbb2d780c6be184ec167b0f569eadf0ac1c460d63509843157f14dfdcebe46bb6f93b17c6069ef0208902ce9ecbb4025933f7dc7572323032ec34fda
 EBUILD zenity-3.30.0.ebuild 1092 BLAKE2B 7cc2aa83e8d384183df0748f2461bf7ef709ff01d80b54d8521ed28b554029b584468f78c545263ca9edd90852d5726e920533561712765619d5c2cdbde3235b SHA512 f82eb129d3b84ff98cbbf22cdc53412c24e5d8273585c6665c61ffafa0c56d2fa00ea5827cbbf2406ef3b4eeec0b8c8cf2a1db74aae5e8ded4028d3ff94f76e1
+EBUILD zenity-3.32.0.ebuild 1069 BLAKE2B 391a7b1398e3b1b19ab81eeb6ba19d1ced5ff67bfd85655e43159a1e9abd3a02e20cb1c02f7c3cbb2bb770b897dbd500b4d030b78d3d5f4a0698a5597c4a6ecd SHA512 663a1919bc4fcd074c6fe1a00935377542f8723b13290634ca59c856bab87166c50fdf842abab0c0b26416faf1ac31228666b927f1780f31d1935ab8e60393a1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
new file mode 100644
index 000000000000..a22518e62371
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.32.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~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}
+	dev-util/itstool
+	>=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!"
+}