gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /gnome-extra
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
75 files changed, 725 insertions, 720 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 96badb132b6b..cd5fb37e41ee 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 e12a98a4b511..56e4620505c3 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,3 +1,4 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10.ebuild 1038 BLAKE2B 00dc41dc18f0d750f82656d0f48c039974ed7484a2d518f4eb5d523400a28de45f26d71fbd92a303e141b308e66e3ea1a3ee3b46230ec14506b97be11fe79162 SHA512 5087fe9300593d578d1c32f3af8558875bd08d3f07132827da0527b51ae1fcc624e46b925952c68973eac6d37408618457d78471a829a1e3741fca50bafcc323
+EBUILD chrome-gnome-shell-10-r1.ebuild 1399 BLAKE2B 052f9863288de6f60e2395161fbc91d2c3cf94e268411acd17b2050235d458df623b3e92bb6b23fae0762a71dfc3b2797c098e3ca8d607571776b62d7d7aa5db SHA512 79b5c2a483cbce7e450ecefd7d2b60b3b6fd7b987c94a35d59b667b308c8030243c56c7c1ee3da52255f545d444937aff0420ae0151860bfc7fc06fe9ba2c3b1
+EBUILD chrome-gnome-shell-10.ebuild 1036 BLAKE2B d65fb38160852887d20f5da9271a97245f48705d5591752f6f4cbd05b0bf50a086406dc748139e7a16c27188bfb4d60187f2f0e0a7b409785cbf83e25ae69bb3 SHA512 b1aef359f6fcc19729cdb4be162db62fe9eb8e16ea1eb0a19bedb295a64465de50b06c83f06041e831052c337fae6f7b053f21eb82cdca8948bd8a54f3fd0455
 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
new file mode 100644
index 000000000000..5e66e29d6797
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild
@@ -0,0 +1,51 @@
+# 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} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
+SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-misc/jq
+	sys-apps/coreutils
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	gnome-base/gnome-shell
+"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
+	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"
+	elog "https://extensions.gnome.org website."
+}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
index 2389b912cc20..7ea1fb9f0045 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 0ccdc53fd1a1..4ba13f71df15 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 1684 BLAKE2B a663d72bb18781e3e6ee22212d29bef6a49bde9fe434a78d5ceadc723cb975f48b04c1021f1390e6d676833ca9880091de4059ceb306778d3917e4dbe4d3d62f SHA512 1254cfe83cd36533bd8a398ea47b9bdeb95822768ada0e477fb1b810dc0b1ec73eef6fa0ff6b6aeb0b31f2c22f35ac82b8b4a7f8edcba6b56bd158c894b82e62
-EBUILD cinnamon-desktop-3.8.1.ebuild 1575 BLAKE2B 6e0d44dfbd5f3ba48cb9000e52af2dc57d02bb90a7dcdaa47be688a2798e56f30ffdd415d8ffb0ba1382be8197e384122ba0a19d15656db3deec786210e67560 SHA512 1830124b212ce6da7e8610412e83a39bead49d6773a41a52e2c4c412602aa3fca0d091fc2cae0133555780534120de09772aba620485eea1a7579688885d0539
-EBUILD cinnamon-desktop-4.0.1.ebuild 1572 BLAKE2B a668696170590a3d5cc057c81fee40884ce02db7089be6442d3bb63f750c730d27c54bece4394e1a36dc55ca17598c7e7e873a5e14443717f9abd5e8528cc021 SHA512 9e96c90723df0d72e7ac9f6d03d5e37bd49a4850a17fc3f6c1b0da880e00367492f3754c78e5e7d78a2909da68835c3e8438004ca91b25470fc8ba37ebf3093c
+EBUILD cinnamon-desktop-3.6.2.ebuild 1679 BLAKE2B bda865a56a16a6e50980bf5ba3c810da69ef60de3f5db934a23d1fd8e37ace326387e5b9badb5518c9e6a4c29b026a985befd3f07620c73da4c1824ad4ec4954 SHA512 cc8a714dcc655dd86382ab06af14346cd75b26d9cceaa34d6ba23abdaa155ad3f33d31e1543f6771d80b268e7f65c12e90202fc13e18703487994e3b60c9bbba
+EBUILD cinnamon-desktop-3.8.1.ebuild 1570 BLAKE2B 0a583861ace5431ed2aae8a6712ed7b5190b7170a3c223a52fa8094702ca301531bb3af3a0c3b898c8f0e7786bc86a39c45e2bd3839fffe5cee316e11067ad4a SHA512 4c94fb92f13de37a17cf5fca9ebb31d292025b5228933020ec951bbf3da7d058ea52aa354295beab7fc39e422ea4caebd2cce13cdc547ed02304128090d83d4e
+EBUILD cinnamon-desktop-4.0.1.ebuild 1570 BLAKE2B 0a583861ace5431ed2aae8a6712ed7b5190b7170a3c223a52fa8094702ca301531bb3af3a0c3b898c8f0e7786bc86a39c45e2bd3839fffe5cee316e11067ad4a SHA512 4c94fb92f13de37a17cf5fca9ebb31d292025b5228933020ec951bbf3da7d058ea52aa354295beab7fc39e422ea4caebd2cce13cdc547ed02304128090d83d4e
 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 a509d28ded90..a03807fd59a9 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,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 2124acb464a6..40fb0e307acb 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,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 259596fc67c4..40fb0e307acb 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-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit meson eutils gnome2 python-single-r1
 
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 7636399c0582..9a7a35b59cb4 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 2024 BLAKE2B 80141dcc65f1817703fc4339ed02599d40af68f62f729564ccd64dc41fe498781e3427c9ed7c73b6ad1af8b37661361f00bf01558b6c6a870bb53c310d79a224 SHA512 e5d43f38ab31e210746706197b69d176e522f567ef49df24e6ecc1b9ac74ebbf5fa4a07d5ed72000a2488aa2b25668eec1930e5e14f8c9b6d8185264c89e3abf
-EBUILD cinnamon-screensaver-3.8.0.ebuild 2026 BLAKE2B 585e7a3617ec977a43e0736a7847f23fe825bf03d80d5973236b274c79bcdf3c9993af477b4cfe804566e0901c70cc47689ec5999133211ec60619ee6b523d42 SHA512 1386edb28d75600d99bd6a35d762d6f9eab94a8a3959b22fdaa0b67b283baab4b6666da9cabbde807c3d6fdb42fd6f4add3b4de6ca8b7da3ac5df2b8b65f2daa
-EBUILD cinnamon-screensaver-4.0.1.ebuild 1990 BLAKE2B f5f6c69cb525d3e616345c571a305681302e9d60651c4f8f37b9b6c96ca764518eed2762f168339ac7cfbb67a9d2241a5e9dbc8fce56b3a025ef82968fa81cda SHA512 400573de270b1ea21c0cc5132b35e4cb2d4fcb057d1de7128bf902ec043ac8416481b9b49c9df53448eee4a40646c719dbb079a81458c3e480bb2d6d6ae05308
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2019 BLAKE2B c00235893861bd3c104e603d935b08dda9f3a98c4fb86d03b09e736f983c77c8298dfe6a9cb1a3b064d433794b189c0c1fa9f72320729bf9eac3a72bc68086b9 SHA512 074770c42460d122b1185a6cd7c5eb1ccc763ea668751a2789fd7b73f806ab37eec793d1a3ddb2d135073bf4e74764b3d8ad5e7fc96a79165f64f67757939925
+EBUILD cinnamon-screensaver-3.8.0.ebuild 2021 BLAKE2B c15f3852945c7bcc73e7bf3b2d42ffc44510af2b01569681fb77c7156311456cf6cff733f8c9da27965e28d8e00593d2c3d49540b3377840a917bc7b24297148 SHA512 414f9128bb7fd8e68974da5dcad7fcf9d2133b7c477d2ce02294e5ecf3c8c0258c6848dc14624d409d6a3b5d6aee9f51655caf927dcafdb925f814bfd6d5deb1
+EBUILD cinnamon-screensaver-4.0.1.ebuild 1988 BLAKE2B 14039b3a35233bb2953a80535f1a282f704cce9b98054f77aa8027b7ae98d187411dab24148afceef4b574e763ab7fd008ab7680b70415b807b0771af1d73158 SHA512 4bae45220879f644f98a430d1cbfcee590a6cd3f399964302de05daacea34eb1c395d21cb7999fb5b7cb1dae8ba31370c10a6de0f372f2838d3546cc5ace6512
 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 0c336581cdca..9c0b09f7ef17 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,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 75c70f63c228..d00d3dba0f63 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,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 12ab502a50f9..0f9f555a9164 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-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit autotools gnome2 multilib python-single-r1
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 232c3d47d418..0ac5ba2b8958 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -6,7 +6,8 @@ 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 7596 BLAKE2B 998559af3842688b6749e323410078d43e09de935efe8e029f3289b843edaf59a1f96a5acfcabfad19266bd54b27cf79a1000b84fad0b5e163d4b46603d8b4d6 SHA512 370e74d24a6a4be927845befbd1f038728dc38f8de52f1c1e362a3b1420e09c937d10518d149548a3a37af6f64c17e6fe0b52a3f4cd037fedf03d19a15ddf086
-EBUILD cinnamon-3.8.8.ebuild 6891 BLAKE2B d5f90ddb1f3f447f5dbe7d790af2b2a6b3c6450eb4ec43034cc256e76accb07ca333e9a93ca50da4cda15ce4ab6b7dcebff6d5093acd546cea30b2300ffb6ba1 SHA512 5aba804f4a78cad774e9fabab6b33ab60e484c7f5b4d10af60d5722b07c454480716df8b2b32368be52ba74dfb9ca1cea2c11a644cbf02e2d37fe6877ace1b0f
-EBUILD cinnamon-4.0.3.ebuild 6981 BLAKE2B 9eb1ea4fa72ee8ec818fa3ecb0f30ffd21eb3d08f6cb3a0d69de62c882c6d863781153b3b6a4ad96e4e4e8b7c38a3aec5c27ee72defb1af7a07933ed6dd5878f SHA512 af3e1ed72f43705b7ef9ecdef53f5f72cfeb1dfad8ff171647d822c02e3021e78dbce379bc1e8a18d1dca91aed9d5d504e5dfe5a328229c9feac5bcad610a93d
+EBUILD cinnamon-3.6.6-r2.ebuild 7592 BLAKE2B ad37cf9da4574f2202f5e98feb393f6e91dd5c8318dc93745e0d163c8097f310b384804c6f6be6df51b8374776a96c350e231c155cad56b5969517ed137a788e SHA512 0dc653bad186ec29296683f95386fad15cc5d1e79dd090cc35bf1e652a0c04b6363c23af8cc6e84fcdf6dc0cae538705c120e0ac43b9e685660ddb9a6dc04dec
+EBUILD cinnamon-3.8.8.ebuild 6887 BLAKE2B 361d67af525736eb3fa0d20f42c5f8426a019f9bc501b450b1245d8457cb238bef77deb79010f5a795e4fe183c8f34b1bd2997bba6c8f643a74902d0e976d5de SHA512 9417677f50f690f835855bd0ce8757b06714b614235433ff65c3ac3a8f14175924c20d510a95f60ef6c7a2b8293b1b52302924112eed8b257ce2e6661c09516d
+EBUILD cinnamon-4.0.3-r1.ebuild 6847 BLAKE2B eadc559c90991d6c87777bbca311e8e3bd2bff9cc96f679dba80daba382c7851e92b79bf4885b0324bf3fa82df472ac2750cbd8a13d26daf37724d67a9138087 SHA512 81ccb461d637654e3f813111ec194236448775b20a1af6937513afdd5da7801e3fb1091fb1c6d5ca4105fe7fed56dde250ecea4abaf9ebdd8fb3865b8c92f92e
+EBUILD cinnamon-4.0.3.ebuild 6977 BLAKE2B 7c1ec29aa0b65d576cf902b00067887125b0b4f350c3abbc220ee9ea782feb1e893111142d722b34ced666becab01d3d399f9b5946c7d906185e3b813e919619 SHA512 91ab56be829ed0ae2fcdc7e659bb3a9055801450cc3e0037b04c3d06971ec42cf43dd8a4bc05226390cc231ca654e95cdcd3e5002d4321fea3ce5ee0ffcd1dcd
 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 17cda9870556..86faa2d785d8 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-2018 Gentoo Authors
+# Copyright 1999-2019 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_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,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 5be067893687..0e3a5d99489d 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-2018 Gentoo Authors
+# Copyright 1999-2019 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_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,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
new file mode 100644
index 000000000000..d35a2bceb260
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2019 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_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="+nls"
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
+	>=gnome-extra/cinnamon-menus-4.0[introspection]
+	>=gnome-extra/cjs-4.0.0[cairo]
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.0[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-extra/cinnamon-session-4.0
+	>=gnome-extra/cinnamon-settings-daemon-4.0
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-4.0
+	>=gnome-extra/cinnamon-control-center-4.0
+	>=gnome-extra/cinnamon-screensaver-4.0
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
index 817f2262cd36..b3a59766aac2 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-2018 Gentoo Authors
+# Copyright 1999-2019 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_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,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 e8827cff42d0..50da460a91ad 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -6,7 +6,7 @@ AUX icu61-compat.patch 1218 BLAKE2B 931b8894d8a6bd29e7dae1dc88b00ce50e59c745c44d
 DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
 DIST evolution-data-server-3.26.6.tar.xz 4406676 BLAKE2B d12fcc412736b505a30254a55763ffec68c1d8cd810fe62c82d7dd5947047caf7c296ccf8103b4a06496dbae38aa55ba9d071dc02442872274e2955d662be4cf SHA512 17522a19d9b4d19f89ccb67c76a89d599377eba36cf6dbe9fbc88fb162947b0208eaf1b4b6b5c4e9850dadf7e6ffea5161ba149b308415e94afc745bc1a448a7
 DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859
-EBUILD evolution-data-server-3.24.7.ebuild 4179 BLAKE2B 735021316c8e2e9eb46a4033e9789e33edd470d227c14b7971db0dc4aba89e90bb0632f9ca4fdd519221e8c9542df879df04b227109b2c21e313381130121a46 SHA512 007b8e12ff9ab7659862f047be1d1e455983e75ecd8eabea2c3ff8897fcfdcf814d9c0239c7c64e16e58a60b3a2225061a731a260afeea4072ac37b50d59b151
-EBUILD evolution-data-server-3.26.6.ebuild 4225 BLAKE2B 31cec53985d6c542a5be2c4e45cfced3ed1e1291e7b25692fe0193f4a3099b54377b1062b80be07d835c48738d3c94b61aad740d9c36f5a30565f7bab1409797 SHA512 759b523a6f3538c96e8979e2f54eb314c92ea16dc635ae4d469008c7a7c0b66da4585c810a8b447bd0cbc19231fb092d50eac8b4d23da0d3a7c33b58546c3632
-EBUILD evolution-data-server-3.30.5-r1.ebuild 4389 BLAKE2B 800a884455c9c8b73a971e66a330e51579266cfbb4bfb7df5cd841d9222a1c47101f0273efa70804490da43e70f5b17556428ec0c322a4d96865f8ae1406be2f SHA512 e1b5d4ca83788fe531ae6d22645835e9328956f35f39293725e598cb33389073190f1d428b22427086a1bb3b32ae4ea03abb188c8ac72ca8ce443807b416f9ac
+EBUILD evolution-data-server-3.24.7.ebuild 4177 BLAKE2B bfbf35a4746cd74ad7b473da253dd2970aa240ce6baa6667ad38e9e9f80d2bcd6220222a7eda1247324757932f9fc16e508e0744f43dd17292ed6f407ad37efc SHA512 08f14788b86e1319139cccbb29e3f099925816873361c4157a8302d4fdfcced40935ced2370bddd9da9635b8052597037813ab520b5e63252c195a2b62e3117d
+EBUILD evolution-data-server-3.26.6.ebuild 4223 BLAKE2B c5caed5888987581c5d7c58567bf03b9dc5745bf6c2b6f18f4fc36996a38289109f6acaf4fc243650452281f0978d90a8838e81aef9c565fe906f61b4f3186af SHA512 8d815f157764a09987230011e75bd9a3973e6372827cf7a7d63eec8cb57ad82716683ba7faf60eb53b8270c041dd98ea127db3f2f324ac96a789115f8ee16973
+EBUILD evolution-data-server-3.30.5-r1.ebuild 4387 BLAKE2B 335fb8fc9c3ddfd3f2369f2d568df4d82aa7ed0658bfe163e4ab0f48ac435645ba972bbfa94f50f27dbef17ceb8dd60327341879aa9341766320307d9da3a52d SHA512 1e9bdec02388edd80dad9ac40503c698dfbe057dae47a8f819fcc1f2e79d1ef9b6b3815eba1527d55431fbaaefa2c474704609b4e76f22425f9491df87ad236d
 MISC metadata.xml 1146 BLAKE2B e40a9c9473a90caad62d2e2e0855e3365828a991171bbc56ed5aeba2c7c467af49a975048d7ef7f0665c1825a2f46708a85889b018e544f10a994bfca7c4eb8e SHA512 c152f4577ccbb14e3ea87fa05328303ef6bd4d5b4e4de554a6a77308a0687fe2ae13658b4e62efd1ec133b8a92e79f64a1babc2d9f9932c0bbc9c511855e9643
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
index 6047dfa5c700..bfb034cf6c52 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+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
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
index e38990e8c245..9ddece888ac1 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+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
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
index df09ff1a91b4..f4f1f6bc3bcf 100644
--- 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
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+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
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 8030fce70b41..5d54bf989afb 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-boxes-3.24.1.tar.xz 1710348 BLAKE2B ce90cc1a6baefa45c1a553b059f4fa7ac5c9a6fbd7a2d71377a9c6f38fddb7ac5a110f38d0a65b45cf2ba948ebee6026cc22b5f93a2ba521c9db6cb20bd3dc37 SHA512 a687dd65af91d717862bba0a81d715b64de1092cbb5ffd8a756fe80988c84110127f186007e8cf4011bf23cc0ec0adb346ead72ef47c655f85a7fcb9ed3ec393
 DIST gnome-boxes-3.26.4.tar.xz 1893760 BLAKE2B 91d01f33b2fb03150c0abd75cb58a9a9ecd8deeb14d32502f5766e06c93b4d236f971417e0a26c44e1250afa069966b607912f2dde92fc5058e598eb029ff03b SHA512 f92f09ea6f61d418253b3b4388bc7aac321cbbba853908b3a8e4faca0e04287cc7c3387eefdd2e150bc9dace8ef5ebbbab3dc3b38b26e0e2d010272703fbf6a3
 DIST gnome-boxes-3.30.3.tar.xz 1198224 BLAKE2B 1c65d3f051d32dc85284da4d392e3ec418edf028b61f1166173ac6ced3e6cba687b297ea135a4e54058c561eb5fe69d767e9ee698fb6b16f6bd4cd09b00d5c3a SHA512 fc8a06bb8c71356d50002468f7722aee14abe8432ccce319ada3032746b53eb2f679a93f991c04ae34832a315fc95d561ffc169c4560a23573c046705b5446b4
-EBUILD gnome-boxes-3.24.1-r1.ebuild 2647 BLAKE2B 9190558020d64cec5c8e2cb568d081c4f975b50ac0f20ae31263bf113067573597c117f816d1dfaea5042451849e04ad4fbdc628761d267dc4a1b0ec6d22d82e SHA512 12a9920bf3e5f2cd1b6fb4809dea9649d193cd6e2dbcbcf94bfa35f0d325ae6e163ab1a53298d80d37e4eb0f62f6ae6ca5363ca548dc6e962215746063142008
-EBUILD gnome-boxes-3.26.4.ebuild 2698 BLAKE2B ebb6e0248247e5f7e49b22facb3298d321d1b0c8142001209f8692a9c69506fa6352a60ad8dceb0d21234ccf938f3a2ab4a7015bccb65b4f00220702370a2027 SHA512 ca797c1ced8a55227a7b69e542037f6cbad38be5e6140a0ccd3160e1a857f60a5935056b7a24e667239f0dbfe050919f89fc1c5c07bfb9e137529b6d34f817de
+EBUILD gnome-boxes-3.26.4.ebuild 2697 BLAKE2B dbdfac183648543bf49d024fb840585c48406ffa6fdc726af5858f1e06e477aadace46f71fa6a033fcb8ba591c2ca55c2e7a499ecc2176b14e15edac64901260 SHA512 61356a6f305e6bcc3a2b8bb1bf9ee0c7c7ee48164d8ddf7e61469c340578665043003f83f11bb1e0bb3ecb12642321115e7607e05a15897fc664e663a4ca678b
 EBUILD gnome-boxes-3.30.3.ebuild 3589 BLAKE2B 411f8ecb2effd9f20c754da9bdf4c9d7b6d9abe98c35513bc166573248e605366307186efc170493f7e10a09349d664e4bf7e6d35b3d60926021fb8d6bb9cec0 SHA512 ff96ff0f0c31d7bcafc4652d9c28471fb05bd6d32fa65859eee608ef95aa05b21a1a6e47b3c3e3becb92b658813ef26007a7986d10b3064bc7691820e0d0af15
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
deleted file mode 100644
index fb81803cc4a4..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 linux-info readme.gentoo-r1 vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="" #bindist
-
-KEYWORDS="amd64"
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-# FIXME: use vala.eclass but only because of libgd not being able
-#        to use its pre-generated files so do not copy all the
-#        vala deps like live ebuild has.
-# FIXME: qemu probably needs to depend on spice[smartcard]
-#        directly with USE=spice
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=dev-libs/libxml2-2.7.8:2
-	>=sys-libs/libosinfo-0.2.12
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.2.3
-	>=x11-libs/gtk+-3.19.8:3
-	>=net-libs/gtk-vnc-0.4.4[gtk3(+)]
-	app-crypt/libsecret
-	app-emulation/spice[smartcard]
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	virtual/libusb:1
-
-	app-misc/tracker:0/100[iso]
-
-	>=sys-apps/util-linux-2.20
-	>=net-libs/libsoup-2.38:2.4
-
-	sys-fs/mtools
-	>=virtual/libgudev-165:=
-"
-#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-# eautoreconf needs yelp-tools
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Do not change CFLAGS, wondering about VALA ones but appears to be
-	# needed as noted in configure comments below
-	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug needed for splitdebug proper behavior (cardoe), bug #????
-	gnome2_src_configure \
-		--enable-debug \
-		--disable-strict-cc \
-		--disable-ovirt
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
index 1ec866f6c6ef..2f59f01a4b0b 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 # We force 'bindist' due to licenses from gnome-boxes-nonfree
 IUSE="" #bindist
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # NOTE: sys-fs/* stuff is called via exec()
 # FIXME: ovirt is not available in tree
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 9ac9c23b3d32..0b5e6eb163d4 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-characters-3.26.2.tar.xz 1547868 BLAKE2B 8fda44bcb3f9033dba0717a698d9db100d260624b92843ed6cf1fa45a0de2d0c326fdce5eead1868b4841da7a10a1ae25fd0298051cafd4e60d0e26ec428ad02 SHA512 a9bce1810f4ba4de59275421e201838ede4781d636231307906ab10fd588ca4ba945aee6f6f8bb847c9b76a7a0db86613189542649cb8561542bec3c774645b0
 DIST gnome-characters-3.30.0.tar.xz 974068 BLAKE2B 294b401e410e4383120deaa4ef3adad485c27e59879ff412d9eb282678f07faba6fb5a93e01c0aebaac7dbac7abd5c19876a0b84403ad92ffc24211daec961bd SHA512 390536e0e5891497c5bd2374c70085beb5bc7c730f51d889e4147895f24999c5c3e9a0bc466a3d4c5652922f1cd7ce1f8f1a98e61007df59d682c230bc99acd2
-EBUILD gnome-characters-3.26.2.ebuild 765 BLAKE2B fe33d2032b4eb2c26fcc6a34f20f165aee3baf2613ed6c3f15856771e6dde399be18a3026bf8ddd2dfa1a28c452e47d0ac6223321f51ad696031e10921b2a00e SHA512 8301ccebbbd871d650cbcfead0c99befebf235890452647c3d85a44a73e9a85dc6655b7d176307d11a1027e3760cbe68bb64fd38a734a0bc8ce7e0308f94c0ee
-EBUILD gnome-characters-3.30.0.ebuild 830 BLAKE2B 3b3ff8a9139253469309d2f1b2663d9f1f7b4be816e77c34e531eee99aeeffd5d335e0c9fcee7898d23a73393841fe95b1f19484fa222b0aa9bbd27d20e9cdc0 SHA512 25da2fac1599d577d81b12d0cdd6e564c69576c5c893d54fd3ef1b0bacd3b95d397facbb2f288a600a9accbf367df32264f43fb520e32ed37730ed978f1d593e
+EBUILD gnome-characters-3.26.2.ebuild 761 BLAKE2B 28126029144f6fa0a1d8ed5ff5a6f67eb38cd9d746b85adf1caace307fd558dcb38df2cc2fa275fd0a3dd9ce9f781a22d4d7e03ce94df4282078bd7d36d9692b SHA512 c051305836429654f6f109128a3b27f12d40035bf04e4050706d1b42225c27676617d0600b5901f657a8492208c1d316d095f8e6ff7dedd416b48f7186aed9df
+EBUILD gnome-characters-3.30.0.ebuild 826 BLAKE2B 9b46708cfd1274f32c58eb490a774f4894765c52d499cf9d41e721df07b7c577661a729b0ba03dc7888bc7d453e619ab861faf0d888c820cb5a1d07281507033 SHA512 9d45fca951afda8940950b0e15aedc785d0fd320e357873552d82a47fdd53a9dfe05e36ffaae46439d0dcacfe57fc7539f3d8f6131b3b09909c8911c402e257c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
index 92489a93a964..ae3367c9a50d 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome2
 
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
index e00ec79c99fd..dc5338861ead 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome.org gnome2-utils meson xdg
 
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 774b6f75b30d..98a0c7b42eab 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,9 +1,5 @@
-DIST gnome-commander-1.6.3.tar.xz 6653164 BLAKE2B 04d39ad7e19939b1791de838a03a9406abb11599e8c43d86cf491aef087e9c78574d28bc076ceefab81a18f09fb1ac49b7cb893b0381a7890744a77438c53453 SHA512 92f138c3cff1b88b967340f945bfa58c5840fb3db806943b4d4eb87211fea10de01a8a365de6ca2b18cb0503bd850e758c3a37fe604b5402481c03e953e94dd3
-DIST gnome-commander-1.6.4.tar.xz 6678752 BLAKE2B 987aa7ff2b34df163a82a9e1964d21860a90ba2ff6fb71190ebfec245090a9ffea1aa8a45c037cd848135dec7a56b7cd26e31d70be8c5ce3f24ad132cff3b19a SHA512 00fcf86025b69a38e68b2c69977ffe54e8b00028176163ce746824a73faed55eeff2fe37eea2e191fd0e7fc1901e2ed701938c3fdfabe9e9b8bdaaec152df0e0
-DIST gnome-commander-1.8.0.tar.xz 7433656 BLAKE2B 686581eb6775e336928f18f3c817d4d34b19da2c5c91660e453223833b24f6bd1400d8ecf2ca3698fc18f2d926343006058b00fefda889204f251b223d6a2d34 SHA512 0023528301812431bffde4c0d314d07d2399d450604bf88426078cfbeed5ee286f16ad0037f85c2b281e9037fd0c622aa92a4a5be055c198d9bdbd3d211c197d
+DIST gnome-commander-1.10.0.tar.xz 7421328 BLAKE2B 4cfb6a5d445217de10007d4371cd5cce95319dd68a6e7f071def2258cd965cfbeab671c6016e624ef474501608214f309c56360216cc53c83a1660b38dbe77d9 SHA512 76e2cca3af7e11ae7f327fa25bb175ad28d36d8b71c4908ce8b91533ed53a444a30d861a24cf94ee34dd7954d1f9dd0a14d26c2214854424b80f8e7c107db60d
 DIST gnome-commander-1.8.1.tar.xz 7298888 BLAKE2B 57def43a8d8794ea813e6520c436d86f3fb9218e64f0b1e7280e03370870a29887737006e056ee0e2af78e12e225a8f5789c4f86f68eac13e27420cbef0fd2d7 SHA512 76efb88e1ee8843fcb9cf17c421dda1769d39b1bfd9d5c97e3ff570117bcac44dfd17a2efbda5079155115611b10b75644ec12df541bd6f7f8d0f65e471f6b32
-EBUILD gnome-commander-1.6.3.ebuild 1690 BLAKE2B 75d8fe6a6c140dc66cd44dd7a280763367e431ddec9acb8ff6a8ed8f48b3c9ded16a0a6a38ae0dd4b6349f0e421323f8da4b3639cbf040379e6a9414342c3ff2 SHA512 dc55901ec53ee864e99280e97f6d1af621c9f567c46bfe120328d4268e7108561aa8f30a960e2c642c141c8ebec4f5a3a5225c4170c37f9c73fac5e2a9c736a0
-EBUILD gnome-commander-1.6.4.ebuild 1690 BLAKE2B 8e7cd9242ec65947a4cd2b0ec68fe7c1d5956afb9016b1c86e687f2892095384aef0267173044c0f587918390529548b42bb34a51d97bee1396e5000f8d99763 SHA512 f8071c83815e1c58fcc11027695b7ee92d46cb80958ed0d11add1bbd0a04ca0b46a002dfd65573d786a589d4c3d0d58b9573d188c83d876b5cf24092a7510aa8
-EBUILD gnome-commander-1.8.0.ebuild 1662 BLAKE2B 19fdd9b09b7d8082d3b9bdc6305bd85ba31b3ed1f5138c249e9a77aa3683fab08e130ab7c717d2415eb71809ef8e2b8dec059406c5f5fa068af07908faa6a40b SHA512 9c016b72422439dbedf6c93901e7bc5413de12cd8924a87b07cb84fc9c86cbb5c45b1a031ef2a96c43c9dd3065e85415a9279b4a9e145e1cc70741a447429217
+EBUILD gnome-commander-1.10.0.ebuild 1417 BLAKE2B dc919b0724dd57ef2dc524a760baa4aafdd1016af74dca9cbf620601ff73c25247e08a6a5595ff990b6800eb77c5cc8a9a7d9a7eecfd8455a5c02170e9417726 SHA512 fdbcb403ade6e0439d54baa0adb24cc5c609fde93273a762f773eed79f80e9c4abed987bf2c82cf1cc782bd7dcd7306669c294f8c222106fbbb317b358bb4457
 EBUILD gnome-commander-1.8.1.ebuild 1392 BLAKE2B d1c67d019e1a24dc28f3122012cd10aa208b9785f3e902124177c0c847ed12142b531b1c4ee7e53181837f3d33dc359a5b69e100c5819d79692a607edc2d29d4 SHA512 adc3f88d893737c1b9d2a4cb8f56260f40733d2e39a7e6a53bc813d8225b57b4321c88751935e916cb7329925ca016cf45de226dd0ba4dabb3646354431d5b1e
-MISC metadata.xml 1264 BLAKE2B 6d074ff4bff45193ab344048e2668574a21b5a0b741c9b8ddca11be05e2da0b4cffe9ed37da36f724abd1f21e2428cfde54fdd0b1baa153f849d685640c1e26f SHA512 11bb2495b3a61317277c31d7d6dc12bffd65a157d92fae6086c0a0d9ab9768f5d421fa94cb026ff482bd036851c6c31e971dc15849bc9c293c9ef1ec289b59bb
+MISC metadata.xml 1204 BLAKE2B 5a53c4f7ba14099a6875bca04d8a91d79c910265f89af7e2227f03b892406fd3be0137a10d096d41d18fe10fb7d4790d649d7c6c4b42f58014d3c30dff884200 SHA512 48f0f626f08698e731b0359ba63ef2a5a25e41a6cf9a1d848f0784d14a8214747e750d30ab5d2759d8fb92278a38690da25c20d5c751fcea72af04e224c41028
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
index 9ce12ae4eeeb..a5e742b15f16 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 python-single-r1
+inherit gnome2
 
 DESCRIPTION="A graphical, full featured, twin-panel file manager"
 HOMEPAGE="https://gcmd.github.io/"
@@ -14,8 +13,7 @@ HOMEPAGE="https://gcmd.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="chm exif gsf pdf taglib samba test +unique"
 
 RDEPEND="
 	app-text/yelp-tools
@@ -31,28 +29,20 @@ RDEPEND="
 	gsf? ( >=gnome-extra/libgsf-1.12.0 )
 	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
 	pdf? ( >=app-text/poppler-0.18 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/gnome-vfs-python-2.0.0
-	)
 	taglib? ( >=media-libs/taglib-1.4 )
 "
 DEPEND="
 	${RDEPEND}
 	dev-util/gtk-doc-am
 	sys-devel/gettext
+	>=sys-devel/gcc-8.2.0
 	virtual/pkgconfig
 	test? ( >=dev-cpp/gtest-1.7.0 )
 "
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
-		$(use_enable python) \
 		$(use_with chm libchm) \
 		$(use_with exif exiv2) \
 		$(use_with gsf libgsf) \
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
deleted file mode 100644
index 8855b6edb1ce..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=dev-libs/glib-2.44.0:2
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.8.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	pdf? ( >=app-text/poppler-0.18 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/gnome-vfs-python-2.0.0
-	)
-	taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-util/cppunit-1.13.2 )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable python) \
-		$(use_with chm libchm) \
-		$(use_with exif exiv2) \
-		$(use_with gsf libgsf) \
-		$(use_with pdf poppler) \
-		$(use_with samba) \
-		$(use_with taglib) \
-		$(use_with unique)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
deleted file mode 100644
index 83995841e950..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=dev-libs/glib-2.44.0:2
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.8.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	pdf? ( >=app-text/poppler-0.18 )
-	python? (
-			${PYTHON_DEPS}
-			>=dev-python/gnome-vfs-python-2.0.0
-	)
-	taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable python) \
-		$(use_with chm libchm) \
-		$(use_with exif exiv2) \
-		$(use_with gsf libgsf) \
-		$(use_with pdf poppler) \
-		$(use_with samba) \
-		$(use_with taglib) \
-		$(use_with unique)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index 46f6535426f0..57d7ba357950 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -23,7 +23,6 @@
   <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
   <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
   <flag name="pdf">Add metadata support for PDF</flag>
-  <flag name="python">Add support for python plugins</flag>
   <flag name="samba">Add support for SAMBA (Windows File and Printer sharing)</flag>
   <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
 </use>
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index b3c3ad7f9cd8..89d608a85e60 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
 DIST gnome-documents-3.26.3.tar.xz 2453132 BLAKE2B e430c5f4dc68578d5fa14a87b0544f20ed6a3f90351abe3fc1505addd65b41affe46981d5035b70fb750a16193eddbfbf205040d3a96e633e8e78ff98e340156 SHA512 d37f763817f617163d1cb85fa8b4d06048a099494e129effdd8e4db7b62178925c6b238150d145565017ce9cf0e2af9acc47623493d4e2df353bab669b076fb6
 DIST gnome-documents-3.30.1.tar.xz 4777500 BLAKE2B 889a089e4968e233185a6018559487e0cede40bbe789bee3e1eaab3283bf66f797dbcf7281361432d0b3a41b68b1914efbfb5be4875fa1986cbe3241a40cbcb5 SHA512 89966d49ececa11ab49eb0e192c6a1d398ef13f2f809a02cca2d13f7ffa4cef45a29801971edec22d2f471ab4291a058c702842e323cb2a1ddd7fcc37d51b6cb
-EBUILD gnome-documents-3.24.3.ebuild 1276 BLAKE2B c502460599d7aa2419f58683a0480cab2d6a575ae969af3ccfc27fa41d4bef25e2d02733838094178ff75956961ad8ccf196cd579004b7c4d2329a0ec93ddd24 SHA512 571ca8d98e15b0ea19add5052c88ee693e463ed38fac286f97ca177773f1e41511e42a0ce6b6835b7973b8098dcf9167244c592aaaa9ed9162b8b7ecd6fe9fb9
-EBUILD gnome-documents-3.26.3.ebuild 1337 BLAKE2B 291628dcff70cd22eef12f254dc3a0217a5f1a278067001dccf1b6f58e1d15edf0ed4c5fa5a9a8b514b2d08f149e95eeaa53d65f2e8c1bd08f971739ccfce72f SHA512 d0fcb9efc3972c8003a0e7245c89ec73a05561a1411d6b119f3d55f617982dd182930a4a1ff22d46993653477e46aaab200902584cd9e31d4ee5779d9a85cbc4
+EBUILD gnome-documents-3.26.3.ebuild 1335 BLAKE2B 6cfe3e4c5de98cab11caa6c832077a4cd3a0875dc07772f0859e74c1407ea6dcb1ba8e5c8ce4ae404a5f5bbfa1d6af3bd0cba66ebdb45fca4fddad6bdcf7fc00 SHA512 bc22f2b86ae592a05446517d27377f736bd710ccf07b17c6d033112c1307cbb03a58e26de4db639a294014c2522f20d9421b11dbd5df2589c40ca9d07a5d2e88
 EBUILD gnome-documents-3.30.1.ebuild 1673 BLAKE2B a9aa3fe92b7ea6fbf7df5eaddbbe624fc0cf00c3e235b26b1ac98391c7de78e951dd4f7f8ef469e2c93aa20ed9dce40e2913c4afe15410b68007ab0ad77fd93b SHA512 07d000f2e4b8415c7a49321b0a352a0ebaf084cddc20f87406665586ce7fb86a7024c6bd360f66418f7683caa94ea01a3be88e392d1a478b34dca958f287f872
 MISC metadata.xml 545 BLAKE2B 8439ff865c4f511b16c015eb14f037331dd31cb8430bbd2fe3dc3ddaddc8eafef6f25b9284288e9bd7606ae02170466bc5635629f7bba13dd06a35ca8b121f86 SHA512 ce74bded73ae951c37b8bf2d4d703dcf0e546b786da7e1874a9bc3078d9bb455e17abb2380fabca0b9cb00425117db7782dbc18c9f16d056cc489b2bd1ad53e7
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
deleted file mode 100644
index fa54ce00c127..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.24.3.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 gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
-	>=app-text/evince-3.13.3[introspection]
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-	<dev-libs/gjs-1.53
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6:=
-	>=x11-libs/gtk+-3.22.10:3[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	gnome-base/gnome-desktop:3=[introspection]
-	>=app-misc/tracker-1:0/100[miner-fs]
-	>=x11-libs/cairo-1.14
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	x11-libs/pango[introspection]
-	>=net-libs/libzapojit-0.0.2[introspection]
-	>=app-text/libgepub-0.4[introspection]
-	<app-text/libgepub-0.5
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild
index 21b069891bec..b8c511a77976 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # cairo-1.14 for cairo_surface_set_device_scale check and usage
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
index e440ec2d0eb0..f0ca11783ac6 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 1679 BLAKE2B 96c4b0f51ed205c83431c9eacfbc5501beb186903ebac1f4e2ba23477a18a9ba15cd7495ed4731ddf61121817196e40ead7b90348381d43c8c23427cf3e07876 SHA512 3aa7c7e3d26672d7ecb872e02a072a8f87e645ba9d3949fa05b212b1a63f52569d3137f005520fff9a940d69ec951761ea565db641caebdca931e649e77d063e
+EBUILD gnome-dvb-daemon-0.2.90.ebuild 1675 BLAKE2B 0e615e75882825613a067848c134b4b189a3c99ee9084590b987429ba54650bc3c795ded29f9315bc706268b32ca290877bbb70f1b33a97854fb4819881b55c9 SHA512 f57f38229640d3211b44c9392f4b3c02ccf8d45fc2d69ef75a8012615bb140a77aedd798cd900ce54e2ae0142630da19396509575f123c55382b8506b6ff5728
 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 0f963d6b1914..b6eefda7997e 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
@@ -3,7 +3,7 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 VALA_MIN_API_VERSION="0.26"
 
 inherit eutils gnome2 multilib python-any-r1 vala
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
index 59ccedf3760f..8bac4293744c 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 1088 BLAKE2B eee6fc450013734e5afd2ccde4d31d2f2aff6d9337c1b7d078dc5792ff8681ac1851d21314ce79f1e98b418225822f34695532bae9928f19bcd883d80bf9e6ab SHA512 d5426537c55a588054638d30403e6a705da7ed399f78e55c3c00f9ce134c58e33daf438b9a4d95f6b90e24c5a777ebe8736c1d20fb41eb08db68990215d644da
+EBUILD gnome-integration-spotify-20140907-r1.ebuild 1081 BLAKE2B 2f30ed2a4f6cbbd72ebc3d3d33a95edc21d489ea04a3c2f4889bd7ec279a62f947b59aac5885200be80f21b2270fc0b31b8fded30c1b45b4985e6a305b75419d SHA512 51600ee06ad75c548ab67739ded6bb3eb98bef2ae438721522899986a4e0f0d04e3549532f3c220e022424dcea867c9b7af38c6aab3ff9f4b15a3161bc31c606
 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 6b304d8fd213..80f7d07320c8 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-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit gnome2-utils python-r1
 
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
new file mode 100644
index 000000000000..45051bd56d88
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -0,0 +1,5 @@
+AUX gnome-shell-extension-applications-overview-tooltip-4-js-warning.patch 852 BLAKE2B ee7382dd62c085eafda8013af3cb8f57518ed689b613ef187886b2d22621c036d3b4c3c6582a4edc79bf9b8820fe08b02413618685060bc70216394cef7ef9d9 SHA512 88f58868e3d474088ddbe83cf4b564ebedd2a72f9d4232f2a8df1b244eecbe43af5a0def33078772012ff08ff95ae875f28e62c25e1fb0f80c61b3a0e1c87a7f
+AUX gnome-shell-extension-applications-overview-tooltip-4-old-animation.patch 1139 BLAKE2B f569f41c0bdac260d099b5cf1703787650412ad9c6e68a88c37a194f1b77959afc351bfd325b85439b88df71afc9154b5b071cb4e895b12b13d4095857881f90 SHA512 b13fcc1d56accf985c50c98ddc4a10f87af5a3240566e2dcd51ec9f6aa65a8a88ce3514ca8e77c9d9975582955ad809ca440ece4d777f9c9d4ca3338a4d5659a
+DIST gnome-shell-extension-applications-overview-tooltip-4.tar.gz 79384 BLAKE2B 9e428b66351cb26615050a1c2e8e7ee1e325079b46ae7fc40eb836aef652ca33e04af9b39c07098364b6844c057867e9e5ddee291748afe63084caa108289037 SHA512 befb6f11f7836010077aba10d8664ba462c7153b498e25b5ad0fa12e065dc0b84302b7cc97d1f0685108ea92c20b61491c85a25a4511ad7237b1c0122a587868
+EBUILD gnome-shell-extension-applications-overview-tooltip-4.ebuild 1330 BLAKE2B 900e81b2bc5ea706b8345af6077ebe65a651b75d8a60f51ee826cea0c79c395ee11a4cafa6745ca0ed2cbc0458052f822f4ffb5666a44ff04d5182a62f303502 SHA512 59f4f9e99c31fc7b9d9ae7eafcda0115883e56e62f7025a6ca4b50f802e4b4c7539c1e4873d58f049962b88d323b1545660f4339adbc177555639576c4203811
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-4-js-warning.patch b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-4-js-warning.patch
new file mode 100644
index 000000000000..0ed36b288f0e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-4-js-warning.patch
@@ -0,0 +1,24 @@
+From 27af671cca3fc6b9dd5c8687c1b3d0d530ccc516 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Rochet?= <raphael@rri.fr>
+Date: Sun, 23 Sep 2018 16:39:36 +0200
+Subject: [PATCH] Fix JS warning
+
+---
+ extension.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extension.js b/extension.js
+index 346a89a..1eda926 100644
+--- a/extension.js
++++ b/extension.js
+@@ -250,8 +250,8 @@ function _showTooltip(actor) {
+ 
+ 		if (!detailtext) { _ttdetail.hide() } else { _ttdetail.show() };
+ 
+-		[stageX, stageY] = actor.get_transformed_position();
+-		[iconWidth, iconHeight] = actor.get_transformed_size();
++		let [stageX, stageY] = actor.get_transformed_position();
++		let [iconWidth, iconHeight] = actor.get_transformed_size();
+ 		let y = stageY + iconHeight + 5;
+ 		let x = stageX - Math.round((_ttbox.get_width() - iconWidth)/2);
+ 
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-4-old-animation.patch b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-4-old-animation.patch
new file mode 100644
index 000000000000..333d1c7c22b3
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-4-old-animation.patch
@@ -0,0 +1,45 @@
+From ff442818fb5c4fd9521c532200ff825061fa35e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Rochet?= <raphael@rri.fr>
+Date: Mon, 11 Feb 2019 21:26:24 +0100
+Subject: [PATCH] Fix #6 by removing old swipe animation
+
+---
+ extension.js | 16 ++--------------
+ 1 file changed, 2 insertions(+), 14 deletions(-)
+
+diff --git a/extension.js b/extension.js
+index 1eda926..deffc58 100644
+--- a/extension.js
++++ b/extension.js
+@@ -175,16 +175,10 @@ function _onLeave() {
+ 		_labelTimeoutId = 0;
+ 	}
+ 
+-	// but give a chance to skip hover delay if the cursor hovers another icon
+ 	if (_labelShowing) {
+-		_resetHoverTimeoutId = Mainloop.timeout_add(HIDEDELAY,  function() {
+-				_hideTooltip();
+-				_labelShowing = false;
+-				_resetHoverTimeoutId = 0;
+-				return false;
+-			} );
++		_hideTooltip();
++		_labelShowing = false;
+ 	}
+-
+ }
+ 
+ 
+@@ -277,12 +271,6 @@ function _showTooltip(actor) {
+ 
+ 		}
+ 
+-		// do not hide tooltip while cursor is on icon
+-		if (_resetHoverTimeoutId > 0) {
+-			Mainloop.source_remove(_resetHoverTimeoutId);
+-			_resetHoverTimeoutId = 0;
+-		}
+-
+ 	} else {
+ 
+ 		// No tooltip to show : act like we're leaving an icon
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-4.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-4.ebuild
new file mode 100644
index 000000000000..73ae2aaec43e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+# Workaround until https://bugzilla.gnome.org/show_bug.cgi?id=663725 is fixed
+DESCRIPTION="Show tooltip with full name and description"
+HOMEPAGE="https://github.com/RaphaelRochet/applications-overview-tooltip"
+SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.20
+"
+DEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	# From 'master'
+	"${FILESDIR}"/${P}-old-animation.patch
+	"${FILESDIR}"/${P}-js-warning.patch
+)
+
+src_install() {
+	einstalldocs
+	rm -f README.md || die
+	insinto /usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet
+	doins -r *
+	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet/schemas || die
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/metadata.xml b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index baae3ac74a8e..ea2d903724bf 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-shell-extension-dash-to-panel-19.tar.gz 21031128 BLAKE2B f2df2fa7f4967b03cb99e86740f0738ec805427ef13d7dd1e86296b4ffd1dd2a154ffb7eb8c6a36a8d589b16635fe8f608182ebc11f2708eb1436bdf72097b01 SHA512 f5ab8d5aa397dbf4a7fc5d9e4584016fc5382c026cef6f58649923edf28f0c1f46cb1ec6ff32466ee4cb84b6b0ed30eac1b1924608ad02f34b1c24ec7bb91635
-EBUILD gnome-shell-extension-dash-to-panel-19.ebuild 987 BLAKE2B 106a3e349a01d78e42ddc60434d8326714387974b18230b596877f12bac2a8fc50d9f89e5336c003b93a06f016d7c062eb707e4ddbddd8af98fb6d62c04ed930 SHA512 86932b7e09a96d5dcc09e718831985ca6055199f6d10b5e04b2b168bdf9f46f320d70d913198b4e0e4d24018e061ca57605f56c510788e8e728ae43e16691359
+EBUILD gnome-shell-extension-dash-to-panel-19.ebuild 1108 BLAKE2B bc85fc91f2df994f869bbe49c14495d94dec8a8f504488683974f4b1c4ec7d939386ba3f4669b07d97c13879cb0fb646266d09236f469c1f24d401ae952b4b57 SHA512 769eac439990aaffdfa614b5a5b545f991c5b5bd47b54fbb9ec712ec8293043a49c26c48424b20f05f2387797fd27df72e0489cbb3af23b64205b7c181041033
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-19.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-19.ebuild
index 0fa5259a3e20..8ae669dfd772 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-19.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
@@ -30,8 +30,12 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
+
 	# Set correct version
 	export VERSION="${PV}"
+
+	# Don't install README and COPYING in unwanted locations
+	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
 }
 
 pkg_preinst() {
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 3ea9aae8c3ba..eb94f14181c4 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-extension-gsconnect-12.tar.gz 1034122 BLAKE2B dc9e4003532bbb500c81d2bd0d2a715f60bb5c70b6bcf3286ebd8b2219d511f51e63c93ef30b0b71ced720531c811462f3b343d9a9eaa07ef4a56a498e5c497f SHA512 3b88aa7ff6e55556a6e438376c578a007d41d266dc91f6d56dfccde217bd0ede7ed40c10b05903582d9bde392f0a375f34b1fbdfd1aae0204f46b9d7e6c246ef
-DIST gnome-shell-extension-gsconnect-20.tar.gz 282464 BLAKE2B 1d0949a34f209f85ebe857494ef94ca429755c13d4988f5ef965f90194b7fad2d37ba0ebfb65ddb2df0db8aba17f27ca400e19755e528cf445dc1cd2b5a8b9d5 SHA512 7db21a580593f429eb7d89054d6ec5e867d33ddc36e29a7e08ba54be8941cc507f081539fdbb0b14bd9ef3c6461964f02e23c12136f475c683c90685e4ea1354
 DIST gnome-shell-extension-gsconnect-21.tar.gz 290699 BLAKE2B cfdaf5d3e02e7a73009ff6f355f9ba444a811fa0834f1d16ac191217a613b56ab39d0952fdd1119e2e6371ba3e5ac89473d1a10de922189c6b2a40e0518b97fc SHA512 3382b5043fcaa359cb12777098f4f89ccdca1a20c6e0b953a8f165563902e3b4d0d469f09a59d01bad708748969efd79651cdd5ab9129c29ff656c6a918e0821
 EBUILD gnome-shell-extension-gsconnect-12-r1.ebuild 1467 BLAKE2B f89f94c2a40773189c8c23e6e39bb26d3e56ad3870ffbf878fe751a9f4985fe67a237a7607615de3e5855ccc4748197c0c154cb6bd522fe91582115031022f89 SHA512 8f8aa26056806b879abee4ba26dec54c72809d8bb94fc7209dce72ce2e6eac8f3dccdc2095ea7eb4ecb809387d466aabbe15ffbb40a804275b99994371fa66fb
-EBUILD gnome-shell-extension-gsconnect-20.ebuild 1420 BLAKE2B 41c067d19a759ff3e67acf064a381e5ca7552fd919d5f49460e71a62f20a3f6e6357a5a30c816530936f2e41b0004551f4e50f5a26bdaeacccc5885a1865aa98 SHA512 96264f963d67ea1176865e80d5888c43c9b605f54df0dabbc26814119c6effaa4114c82167ee5b323c3aebcb3934d167a154a6810f8699788cc97a6fcf42e499
 EBUILD gnome-shell-extension-gsconnect-21.ebuild 1431 BLAKE2B e0d64db350bafb87088b2ec5de4eedec776c06edb2c18af52d55c9fe0acf3369f7f47337076d1b04c9659a69651a8e9f51d94daefdfe7e75b85066dfc684a7b6 SHA512 83ef50ae1653840849c543b6ed586ef4aa7ed02e8dc1daee7b054bb09f6fcab04fb642f55a8991ae1ed9dc910375ce442a8a3e1872c3e366fb1fd1d581607af9
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-20.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-20.ebuild
deleted file mode 100644
index 8f9bd59c0ad3..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-20.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils meson readme.gentoo-r1
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.48
-	>=gnome-base/gnome-shell-3.28
-	net-fs/sshfs
-	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index 0896b97b4e84..3a33dac32e05 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -1,5 +1,7 @@
+AUX gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch 2645 BLAKE2B 3a24202c8bcb07b3ae6c6b6dccbd734d729da2f81d26bf08d5d4b5b20f7c77be0b4e958bc2e4be5b374e4f22479af85d16560c039b54328fd08138246ac58889 SHA512 4e6557e9afabedfd9ecad7383478a00dda38cd043c69023900080b194ffe7f47a0b8d64c6edda74b12339cd3f2f54d549df088493d94fa68da20f1e89e65ab5d
 DIST gnome-shell-extensions-topicons-plus-21.tar.gz 2756641 BLAKE2B 39414711365a9c68fa2b0172859e9969a7f71eae5e7498abee9ff05e4c215df09419cdad99192c60892b1bd6e8b27724c81c5d3da9a3d8ca3072d984824cb950 SHA512 f85db46f20c24f0b11ce2c79c0548b88262faf059d674073e328917dc8497de0e07ccd6f3613f45aa9e49109468d78293f3a8f0f4fea5a24a7c5254666cda5df
 DIST gnome-shell-extensions-topicons-plus-22.tar.gz 2757811 BLAKE2B 8bfe719d4a0e4d58db9b21d354e841ea69b88d82c69ba6aa4ebc8db65acde9330553487d0a0d3b623d5a6a2a18ff67e6ad4e45133c6e7b8a77e07bd90c589e63 SHA512 f0589bd8ed6697d616772ab374e9aa80779512d38c50f82c375820c02c06ef26a50b2a8c78c4e5fab5dc8588ed5fdcf0b7e73e7868af0855545528e741aa280d
 EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1327 BLAKE2B b8d030527a7364996f2258e5543344930ec64e2d4ff62d826f6e983c718521556f04789d9db36e121868e7227f983a473b9c53d700231470a71d9322c48b30ff SHA512 f18583531b6721b92fed2ac2b81c3ca3137331464196a05c4fad7ff02c21f33dbade7ecc657a1ed7274c5b231253f549f80b16013b8ece623773b06a3b14409e
+EBUILD gnome-shell-extensions-topicons-plus-22-r1.ebuild 1473 BLAKE2B 235c02a926104fd1ccf2eb82d86bdcb47c8075674ea178186e15f0a04f3793a7054822459aa591bac790f53667aea9b5a3a8dd8eaf2422976b26b4c752f2a69e SHA512 1792e2b5e3ab079d7146be83c54310a4292b2cd2693094dd1b2dee2352356057b97cf42925d38ad8fc226463c13d56fd501c33e9f3efe4c51b80cb70eb61df74
 EBUILD gnome-shell-extensions-topicons-plus-22.ebuild 1326 BLAKE2B 71981852375df8dcfe755fd9581c645234bb16f73d4007b48a4ccbc8befe7e01e7c3fb8fc0f79be1a3f145dad783da0c1a214d22bd158cbf572d3a5c3ce72382 SHA512 cdcb523a4f7a03a280ab9791da36b722e661253ba5fb315d92498b9ee6b117c36084951235d31b6fb6964696b94c04aa8245fba5492416b7eca1ce29305a395f
 MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch b/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch
new file mode 100644
index 000000000000..17082b4ac4fd
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch
@@ -0,0 +1,62 @@
+From e883e62a36c342bdf2e31af9d328b10f4ce61112 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Tue, 19 Mar 2019 09:39:36 +0100
+Subject: [PATCH] Fix shell stack trace when removing icon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes stacktraces like this when an application with a tray icon exits:
+
+Mar 19 09:09:53 apollon.suse.de gnome-shell[6868]: Object Shell.TrayIcon (0x5588a424ef80), has been already deallocated — impossible to access it. This might be caused by the object having been destroyed from C code using something such as destroy(), dispose(), or remove() vfuncs.
+Mar 19 09:09:53 apollon.suse.de gnome-shell[6868]: clutter_actor_destroy: assertion 'CLUTTER_IS_ACTOR (self)' failed
+Mar 19 09:09:53 apollon.suse.de org.gnome.Shell.desktop[6868]: == Stack trace for context 0x5588a17911b0 ==
+Mar 19 09:09:53 apollon.suse.de org.gnome.Shell.desktop[6868]: #0   5588a2b96d60 i   /home/mwilck/.local/share/gnome-shell/extensions/TopIcons@phocean.net/extension.js:127 (7feca5a061f0 @ 92)
+---
+ extension.js | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/extension.js b/extension.js
+index 113b8ef..58a0433 100644
+--- a/extension.js
++++ b/extension.js
+@@ -31,6 +31,7 @@ const PanelMenu = imports.ui.panelMenu;
+ const ExtensionUtils = imports.misc.extensionUtils;
+ const Me = ExtensionUtils.getCurrentExtension();
+ const Convenience = Me.imports.convenience;
++const Config = imports.misc.config;
+ 
+ let settings = null;
+ let tray = null;
+@@ -118,7 +119,8 @@ function onTrayIconRemoved(o, icon) {
+     let parent = icon.get_parent();
+     if (parent)
+          parent.destroy();
+-    icon.destroy();
++    if (!parent || !versionAtLeast('3.30', Config.PACKAGE_VERSION))
++	icon.destroy();
+     icons.splice(icons.indexOf(icon), 1);
+ 
+     if (icons.length === 0)
+@@ -389,3 +391,21 @@ function setSpacing() {
+     iconsBoxLayout.set_style('spacing: ' + boxLayoutSpacing + 'px; margin_top: 2px; margin_bottom: 2px;');
+ 
+ }
++
++// Code copied from PanelOSD extension (GPL 2.0)
++function versionAtLeast(atleast, current) {
++    let currentArray = current.split('.');
++    let major = currentArray[0];
++    let minor = currentArray[1];
++    let point = currentArray[2];
++    let atleastArray = atleast.split('.');
++    if ((atleastArray[0] < major) ||
++        (atleastArray[0] == major &&
++         atleastArray[1] < minor) ||
++        (atleastArray[0] == major &&
++         atleastArray[1] == minor) &&
++        (atleastArray[2] == undefined ||
++         atleastArray[2] <= point))
++        return true;
++    return false;
++}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild
new file mode 100644
index 000000000000..66bb954bfdbe
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.16
+"
+DEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	# https://github.com/phocean/TopIcons-plus/commit/e883e62a36c342bdf2e31af9d328b10f4ce61112
+	"${FILESDIR}"/${P}-exit-stacktrace.patch
+)
+
+#src_compile() {
+	# It redoes this with "make install" later due to a dumb Makefile, so don't bother
+	#make build
+#}
+
+src_install() {
+	# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+	make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+	# Assuming it needs only compiled gettext catalogs at runtime
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 5e99f1df7f9a..b8529f5ee729 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -3,5 +3,5 @@ AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332
 DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
 DIST gnome-tweaks-3.30.2.tar.xz 281820 BLAKE2B cd980f77a05d74f556fe461f1dc35122efb23ab0885b84ddb71c873dd6cb424d4ae213d393b7555f8baed8eb5fb3df8afa7d9b4cb92d772ba9eed59892871bfe SHA512 183df35e8051aa1fba54ca45aca64d665f28d92c56879ff6fa60adf3809a05676db15d97d7023bf5ffb9bac33df259eb62742bee3cebeb87d8ffa39679b2c078
 EBUILD gnome-tweaks-3.24.1.ebuild 1640 BLAKE2B 300b9616862e3872254783d6474d2fac61339f34f1b9293370cc111b790d7c7348581abfa81e35b56fdc9a8148b379b66b3e12004e9e157751b53e864b902cde SHA512 5de55cd5fcb8edafe4f2c000e84412f75b8673f6f8b7eb439aa00a950e3fc82a4ea9dd7a0b34b5124f58ee5a461456f305c2c8d855f696fc4f99749610153f51
-EBUILD gnome-tweaks-3.30.2.ebuild 1186 BLAKE2B e401946c3dcfbd6e503b4ad0c0d0d8a12e7b7ff69b5c6e94a6f49509ff0dd6868e509fdd2b8cf5e6334a6f813f422a5da8767e5477539b5257340751c60a74c8 SHA512 413cd4eccedc406728f71ca418b08e107b8caa5f1e84102356fc45a1c0bc144a9aea10267f69d7f29e61d26cc322315693bbc3bf5db119be04cefa3f399d2e78
+EBUILD gnome-tweaks-3.30.2.ebuild 1184 BLAKE2B 586e80e46891ea05b8f574f8ba6d86bac56ef7721f32c9cfc56012943c7701cc67aec3cda514c301a58a2ee646289de3f3f465c8df9dfec5b24b3ae7e1b7c34e SHA512 c5e995548da0d1961880b36e0dfb9ea3266491bf890f53e286d26982406446d9b169eb45e779064897c1b6ea75e60c1275d7fffce807b50881c95e69dfbba685
 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
index 926efdb349c3..02128c34a4d3 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.30.2.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.30.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit gnome.org meson python-single-r1 xdg
 
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 75739204a01b..e1786c9105ae 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-weather-3.24.0.tar.xz 5358924 BLAKE2B 89091c0dd2e69109621450621a03231da9fc6032cfdc44386e632ab3e8e478fc9a02efff86417277fbdbd2c39d730efd76df1a787e14112dd0447b53715b5aff SHA512 c286c97dc1cbb4991e56ed49e8c788c6a58f0f0dcd5534812ee3e06a0570fd1bb0b45f7e35bdc11443f62dc3a2cd262db4f3d2b1f238cfc24236de88de4a4bce
 DIST gnome-weather-3.26.0.tar.xz 5362056 BLAKE2B 0a427f8be6f8b79346d106430f6673961d03ca6770940f92eb866859907c7dc2e11805091bd9715e922176acad5c971114c9df33e6551c8992051e6ef873a298 SHA512 adb5400ca2674142132e499880793f9c4fafaa9a4459b2718eb24180480f8e4e1edb81aad947283208c3fe32f1c662d380421efa1b6b57968268ca64318a33ff
-EBUILD gnome-weather-3.24.0.ebuild 1151 BLAKE2B 04b41ffae09b3537db559c89f056b4dc224834147f51fdf35f535ef1391c3588165fc9b22e130aba00635d51e8645b56bab598a54e46c4adddae8f335f0c2d3d SHA512 5bfcd5ff83bf3e0526c5c759bb256575ecd36df0de1601d9e2587df9dcff36973716112881e69e46ffedcf80780c1946aa2ed6433071bd8f18a7032043d0b0c8
-EBUILD gnome-weather-3.26.0.ebuild 1149 BLAKE2B 9bf9abd3e91c5b64a9928f80a8cadfd5f7329c7edc7cbd6e61ddd3b0fc4c563f72d064621272572b327208d8282227a3d2379e47f19ae99290e940877898ed61 SHA512 5de52dc85bf41ec7a0b89ebf1cf34f875635d2ca254d6b949900670475eecf4c4f3c4141dc2144f390b8037bb217c5ce2e6537d46fcfd1f8a5aac1d5bc1fcda3
+EBUILD gnome-weather-3.24.0.ebuild 1147 BLAKE2B d55bb8ec3d4ae6103fac7a2f9eed551535b7cf0a813ef0fa9793db386456f5e3fdcfa80908393585dbb2435779a718212b2352a8569644d0cd1f28e5798e814c SHA512 f677c8fbbcdf1af27320788a7616e1b8d9bb5c46cdac1fc25ec1bc3fa305c9b21360999d365744ae9538951d70c9195b49bd1f6598319d76e1651d2f8a611392
+EBUILD gnome-weather-3.26.0.ebuild 1145 BLAKE2B 6d8273a1db1d240d37f27afcf43f3154f1318ad33a9fc725c75035e92d9c50fa703fc2c444ae2a4ada856fe8942913fc50daae3ec2403eb0765ca6054a9b6dcc SHA512 539258b1e9c54b3854da463bfbabb0ac8f33537f3de99af4e8d5c17e302f2cae73b77c04aae830828f6ca2a452c7a47229cce4f936016838a2aeda62fe3c7cdb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
index 2669b3aca7dd..ae57ebeea9da 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
index bc55ef114850..7e56a76d8b56 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 91c6a470881c..b04d95bae9da 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,5 +1,5 @@
 AUX enchant-2.patch 1480 BLAKE2B ba37c6d8370b3cb1d8fea4a36de966a2f2ee3202f4228d4e3d2bfad580a5478ade92b510895c8662213a845ccf4a6652796ac2851493ede1c0a03dbc51f2f5dc SHA512 2517bcf65d7ab7c328e38a2d34543630877fef5f14caa64a11d514e39171417d8075180b6f3bd747d8b9b60c49973510983413c25cc3e9e52ea82c78aa4e060d
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0-r1.ebuild 1067 BLAKE2B 1e59a8ba2d63b5822fbf90974509c9df8866844932ed9596a39046a8b602f468a54047718f332c68222a5f15480d24da7ee05122d060e67c9404bb6fc378e43c SHA512 b2b1b61dbf4590b2405389973cd6f5ae26a8357c511e5a8f0f2b988f1302dd8277593ee3371422a866e347623e5a1232013074582f189eeea2d6dabe2a1362c8
-EBUILD gtkhtml-4.10.0.ebuild 988 BLAKE2B 9c380fa816424cf6f7e238664856cd77bd16bfe964ea47c6702b526d8aecaac546d5c76f471b322703e474a95c545c3d4b237db70b598e6ec143ff6067d6972e SHA512 2e0d36666c93de5f672c8218490220e063675eb0310dec0b26f64223913f36ed904e9e09ca292cdd9f7fc519e18986c28813e2f022ea474e1c73b4c533648c75
+EBUILD gtkhtml-4.10.0-r1.ebuild 1071 BLAKE2B 5ccdca5a87b200926bf3d31ed543dbef0c3cfca979a43bee061d739fe1ee1e305bf538864c11701fa093480a9a3448784e12062dc7300a791cda1334000aaf85 SHA512 684b2ecc491ccd1cfe1568dff480f37aac7dc478fd87f7415b07d3fb76402b1baaa81098200749dc2c2f61e5465f95a3e88c62f1f52ceffa73655165cf4d193d
+EBUILD gtkhtml-4.10.0.ebuild 992 BLAKE2B 21238cea54f2b7b7edaae5dfe8c845f62608dfd83da9069d62b6ca996e4cee6ddf2e99215dcef30871ad61687522d0f7d3a2aef881a58a675fd8f06a3b1d18ec SHA512 36653e051126dee0b3f9b222c7e963f27614c779f236b270e00da9e595c724f7f5b5ba7b20c8396686ae4f0ea66a8f66e9875da47fa529d525562390eca994b4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
index 22fe176d121f..a6a88c2f7078 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools gnome2
 
 DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index b52c93f9763d..8109c3809982 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 inherit gnome2
 
 DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index c20b0046b689..cb75ecfca61e 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,14 +1,9 @@
 AUX 3.6.4-tracker-2.patch 779 BLAKE2B cd678e663a2579521cbd91af2bf194c436be8b7d2a1b749728a3fc3616d7fb1585922c4ca76c27e7079c1fefd1dc1bb7a595716576b23f097aed7ae6c8601983 SHA512 a3ee36493aef8ef0b5d32a4ca43d961420a263f970f4081888a8c7cbb52e94b9c7c3bfcb9b9ae50454c773305915f1e201b4d1c85520a91d9c0233c35195b178
 AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5dc2779332c8d5445a3f7dd40aebbfc0080acf812a766e18b7119b64f283f76552b44c025c9a1370c4 SHA512 0a07de349129f7a81e2e02ec99008d091544b0961efd3188a2309489c3c48385d485194615bbb4d7817c0e651ec6a6a197861cb5f2d5841c990d2d540f58672d
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
-DIST nemo-3.8.5.tar.gz 1424948 BLAKE2B fc773f7a1666d94beabfaab3b1e97c4a6f32cd61dbb2e5eefc57cb3fd577df780f5d220501d7dbc6c67955afb9a623d36d1631c8b3c5e201894529784ac1991c SHA512 8ae4eafdd056e7e33c722c96a82e8bb5b10617823397927a3247e27bde14a3083f4402cd7e7bfc6a4f7802fe8c7aed005fa912a9855b6accb36af3a7f63b3188
 DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
-DIST nemo-4.0.2.tar.gz 1446758 BLAKE2B 37141bf514b4a17a41876a643f89cb489a7991d2ef0792a23a9b5b08ff1462733e820cde3f23dc1943dec90eb57e9d68ff1e58e526026c738d3f3b71cc0b7957 SHA512 d2c60f379092dee79902877beb2d47d2cfcb4a22b1f86fd84fafb96367c74cc2cd060bdcf8c7fef28ef5ff6df488a4a15f0c8b9fb1680eda26a13208a4a5742c
 DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
-EBUILD nemo-3.6.4-r1.ebuild 2104 BLAKE2B 5085117349473e64789395d1d764aebd2e5722653de0ad40288b7b4aa317991bb4e122076580ff3e3b1d7e95d658a18dae6c69cc79fdde190bc1b14d3d659fe2 SHA512 f30a798f92fc42bc04ea17e41f3ae9ffec1ebbf7f924575967bf7bd63eae0a4bf2373109466f0b994c7a442c973a7a2f22d66e3606b009b9f5f1504c78af20ed
-EBUILD nemo-3.6.4.ebuild 2084 BLAKE2B bd1ced9533fa6c2f65e4c4cc09a2cd0b25a46beb1a30c1ffa96ed8fa4a199ba6d15176fa0ad99051b6c1c836c67ac9495df0564a8b7d1cc97fb89351d3f5fc09 SHA512 1108f55d96be0a639eac59a83acc89a14c26cce5bd02bff37df8747f96034db565177d01bc135a653b4bad0d32543b046a80250f1b2d25c383a608073b1d97ed
-EBUILD nemo-3.8.5-r1.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
-EBUILD nemo-3.8.6.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
-EBUILD nemo-4.0.2.ebuild 1970 BLAKE2B b4833fea21f5a166e2f24c658d356d2a87780f1302faa24821a7237bae1bee0a6f5e463a38a307cb37dc4580e9d04e6b8a872627a2ece623450120d6638ab5ad SHA512 f83144c5d6ccca761064f21b82ae2b60a2934926552e5f9c0a73e01433400cd925dac241b2b69fb3768e74ed1a1ce91008ea313847f8e15b9b1bcf986ee09681
-EBUILD nemo-4.0.6.ebuild 2057 BLAKE2B 20401b16500cf3395554b847e5374226e64a342d6e72bff5dda51913882f17f0c965ce5678bca753c886a2aae7ea9bd82388402fe128beb7e0c842c525d850e0 SHA512 92777c6ee8139efe815336f58b6cf4a161c1c34c7d04b6f2154b422b4d5f3fb02c8bd579e95ee1a64010f4355b0c32db9d6517f783f820dc23de179d4788068a
+EBUILD nemo-3.6.4-r1.ebuild 2100 BLAKE2B 5eb464b052cf646ef083d00bce998915011f344dbe327ba04ec2e58c5feabeb4daabd8b252e16beddc9d0db05655533c61607efd0389cd89038dedbb64ea43c7 SHA512 3ebea7a6b66f93284b2f8c4f0a3918ae074d86e86a71578470bf6c272fdcf94e57925d7e22c59d2260a7f2a27b5acde74836e313ce13caca9e86b2b2731b9555
+EBUILD nemo-3.8.6-r1.ebuild 1995 BLAKE2B 9079ca667c1dc132f85c656d28b2125720a40443509ffd7f5b5a0dc3c3ca921bb0f8df1146fadbfd1a6a5bb4f29dfc2f5c2ed16ba3a96ed47a8c7d6e21084130 SHA512 8367b8957a2282f5dcfdfe8b98f8ef019eca89a4225b17d53634c2d157feb8af6cccddf158fabb0c1bcfbe5f4f8c185a3b77ea88506a3b473074ae71ac2e6a25
+EBUILD nemo-4.0.6.ebuild 1995 BLAKE2B cfcdf828d36d552cce7adb9c3c663dd24ad754965da507dafa1a437e3e607ed85b8299c9cb560b2c896aaf1b6b5f4c5115f682c26199a77b741703005559d5f6 SHA512 5f41ef563465e27f40a4e59227e6280109ef8521a62a02d3eaa8a4c39074795784b214ee843e69a7ce9c3ce835ff33a1b6419603e4056942fae8d20ec44a6417
 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 b28b79b73bb6..7019bc0db237 100644
--- a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
+++ b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit autotools eutils gnome2 python-any-r1 virtualx
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="exif +introspection +nls packagekit tracker xmp"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
deleted file mode 100644
index bba409dbc557..000000000000
--- a/gnome-extra/nemo/nemo-3.6.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif +introspection +nls packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.0.4
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	sys-libs/libselinux
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
-}
diff --git a/gnome-extra/nemo/nemo-3.8.5-r1.ebuild b/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
deleted file mode 100644
index c4ae41b45371..000000000000
--- a/gnome-extra/nemo/nemo-3.8.5-r1.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
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit meson eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif +introspection +nls packagekit selinux tracker xmp"
-RESTRICT=test
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.0.4
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
-	gnome2_src_prepare
-}
-
-src_configure() {
-	meson_src_configure \
-		-Dexif=$(usex exif true false) \
-		-Dtracker=$(usex tracker true false) \
-		-Dxmp=$(usex xmp true false) \
-		-Dselinux=$(usex selinux true false)
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/gnome-extra/nemo/nemo-3.8.6.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
index c4ae41b45371..4ddc41997b43 100644
--- a/gnome-extra/nemo/nemo-3.8.6.ebuild
+++ b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
@@ -34,7 +33,7 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
+	tracker? ( >=app-misc/tracker-0.12:= )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 	selinux? ( sys-libs/libselinux )
 "
@@ -65,9 +64,7 @@ DEPEND="${COMMON_DEPEND}
 # For eautoreconf
 #	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
 
-src_prepare() {
-	gnome2_src_prepare
-}
+PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
 
 src_configure() {
 	meson_src_configure \
diff --git a/gnome-extra/nemo/nemo-4.0.2.ebuild b/gnome-extra/nemo/nemo-4.0.2.ebuild
deleted file mode 100644
index 84fe05b0dad9..000000000000
--- a/gnome-extra/nemo/nemo-4.0.2.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
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit meson eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif +introspection +nls packagekit selinux tracker xmp"
-RESTRICT=test
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.4.0
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
-	gnome2_src_prepare
-}
-
-src_configure() {
-	meson_src_configure \
-		-Dexif=$(usex exif true false) \
-		-Dtracker=$(usex tracker true false) \
-		-Dxmp=$(usex xmp true false) \
-		-Dselinux=$(usex selinux true false)
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild
index 80cd39e0275d..4aa693cf74b4 100644
--- a/gnome-extra/nemo/nemo-4.0.6.ebuild
+++ b/gnome-extra/nemo/nemo-4.0.6.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
@@ -67,10 +66,6 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
 
-src_prepare() {
-	gnome2_src_prepare
-}
-
 src_configure() {
 	meson_src_configure \
 		-Dexif=$(usex exif true false) \
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index e777c7624709..815ca06c2622 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,5 @@
 DIST network-manager-applet-1.8.18.tar.xz 1550448 BLAKE2B 93e0075b87c13f81d3551a62da2cfc8fa41f478043c1d19540aaa6fa3ae149ce1f08d931a8141473bb759e09fbb231bd29e9d1aec8f97fa670c059b83489d48e SHA512 4871d95f3260beb8c3207e5ec8e25437b3d01758afc3bfe7d877774b21a05f4523449ee32e4cff27c082fefef88fed01db718d2227d6896c3c9b85d09cee927b
 DIST network-manager-applet-1.8.20.tar.xz 1551392 BLAKE2B 91258012715f226467126e4eefdfcd6ebde36958be80ae5e264dbf5168e0b772ce04404030d3f7dac9a6f72088918a2c5160aba694b6b7f7d4d6289b716b76f1 SHA512 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41
 EBUILD nm-applet-1.8.18.ebuild 1633 BLAKE2B ba80b0cac495071fd961509af7c15ba7dfa3eab07663dd634282d13361972ffa3a7e103fd86116d16d5fb2ac43f72b827e6db301002537bb88493a752d0e4e56 SHA512 809d8e54ebcebcea0927d8f246c296fb4533d8553c7b133a95d557d054462ac18a4c5a45f63f33076ac41d9b5f75d1f7d9c0823d380116b2a998f9b093f225eb
-EBUILD nm-applet-1.8.20.ebuild 1654 BLAKE2B e5c25bc5c9f390c8fe6b7edea11097621e5548d191b49a20cae17192edcc174459d4ddb6faf6df91d95122a5edb98c81fd42273253aa6873522b5a59c7735417 SHA512 da8d7c1ff8c3d3f3e6e3121d169ead87d12da1ca510b698aac0a2dce27124750306b1c182a8ee878eeda912d7778fdd0f47c46237e11f33a43f55257bfe4d082
+EBUILD nm-applet-1.8.20.ebuild 1652 BLAKE2B 7c46f50db0ade503045cb33d9d267d879718809d4e68f5c810a90acc26293be0e328b3bb81fcf0488292b3439e1aec00fa43ef4da4c2baa6db3f66fbb3ba8355 SHA512 0afd250aa5b7a857f16b37624aa34a5ab8ec85edb0a952757c54ee7221958b5ce2439d23714423d5916d090e9df0d14ab97d2f8fc8d1e117614da9ee0534e87b
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
index 601b8b123ea7..5532c487d811 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
new file mode 100644
index 000000000000..d0b6a35733c5
--- /dev/null
+++ b/gnome-extra/pch-session/Manifest
@@ -0,0 +1,5 @@
+DIST pch-session-3.30.0.1.tar.bz2 8854 BLAKE2B 55e90c00d3637d21b80ec87db96561a43d4f770ffcc6d90c7c83189ab979565cbeada0dfb64cb3d10d72c6f4e40466345db2023b930971bb6b784a0f7c469551 SHA512 dbb6a28cc1cff37992f717285476b73201a5d96de682fa2e91774f644bd8870cbd6444f768c1395b81a8ba0fe36e60404343251a66d339ae6acfc2a7f47127f9
+DIST pch-session-3.30.0.2.tar.bz2 8925 BLAKE2B 0dc3440d42f7507a0f73ad24cbcd94d106a836b2c9abb74e3d85272ed1dd0660ff85c60b7a3e824687916817f513aed321e92b4d2406e1d5f1ace3aad5bc8456 SHA512 3e8ae7db254c0489c57fb1aadffbd3dfff6ba992c5ce51f993ac5f8a2704b59aab39e65bd36768ffd3fc47eec24bfa9c34046fbd01819976bbb9eedcf84d4e89
+EBUILD pch-session-3.30.0.1.ebuild 842 BLAKE2B bb637e335813673390bc9ce8a79d2daa9c1558fc057883a8e48b6b1649f5ab1300dd0271898645bda4f2a9643aa3b5c61df055007cc23640c09675e236a4e897 SHA512 6eba349ee52c00798a9b452bc9be3ab7df44f31c225d8934c596786bc18d8151495f09392f65cb792714ed255844e4cdb3998e24eef2d7bcebb68e58673f9e7a
+EBUILD pch-session-3.30.0.2.ebuild 991 BLAKE2B cd1bab1b4a21fc5bdf03d561e01c3e3cd818f00bbf9d27d0a798a5be1a375cc31f24d7bce1f45b0e5c18072b1bc1b9dfa60b49924d3f87219705a47adfc82a53 SHA512 b35a8d6a4d1694a10bad7ba121710c3e12777c02f499a14f2fff5f892341ecbb5b7f76ef17dbf9221a2ad39a3202eb88e9cd62e041f57869f946fa87c6088763
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/pch-session/metadata.xml b/gnome-extra/pch-session/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/pch-session/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/pch-session/pch-session-3.30.0.1.ebuild b/gnome-extra/pch-session/pch-session-3.30.0.1.ebuild
new file mode 100644
index 000000000000..ca53eeb88fa6
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-3.30.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
+HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=gnome-base/gnome-shell-3.30
+	gnome-extra/gnome-shell-extensions
+	gnome-extra/gnome-shell-extension-dash-to-panel
+	gnome-extra/gnome-shell-extension-desktop-icons
+	gnome-extra/gnome-shell-extension-gsconnect
+	gnome-extra/gnome-shell-extensions-topicons-plus
+"
+BDEPEND=""
+DEPEND=""
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/pch-session/pch-session-3.30.0.2.ebuild b/gnome-extra/pch-session/pch-session-3.30.0.2.ebuild
new file mode 100644
index 000000000000..a789ccf56fc0
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-3.30.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
+HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# gnome-extra/gnome-tweaks to configure extensions easily
+RDEPEND="
+	>=gnome-base/gnome-shell-3.30
+	gnome-extra/gnome-shell-extensions
+	gnome-extra/gnome-shell-extension-applications-overview-tooltip
+	gnome-extra/gnome-shell-extension-dash-to-panel
+	gnome-extra/gnome-shell-extension-desktop-icons
+	gnome-extra/gnome-shell-extension-gsconnect
+	gnome-extra/gnome-shell-extensions-topicons-plus
+	gnome-extra/gnome-tweaks
+"
+BDEPEND=""
+DEPEND=""
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index c5bcf77974d6..5be392cf3a12 100644
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -1,3 +1,4 @@
 DIST polkit-gnome-0.105.tar.xz 310876 BLAKE2B c4b44d8d667ecf043516468fea061c668c94f670aeb0649ecfe1cecdd466d46156b6fffbf642020bd575f4e40f84e6155d3752ebfef57ef0491019616a4f0c21 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42
-EBUILD polkit-gnome-0.105-r1.ebuild 1089 BLAKE2B 562f3c61d73fec764135a8830e157fbf146d99aa5b0106a88539c33f2f8ba4db59795fe02431248ebb8609c255148d03a1e7e316a10c28adf35e4f98ab2517fb SHA512 db286471057eb3db927037c4a09a6271f992e7eb78fa5a5a41487f03111fff1fecc7e33f086ce33056c76f1b85e77d605451c25aea5b7f29fc85250eb20dd309
+EBUILD polkit-gnome-0.105-r1.ebuild 1088 BLAKE2B 1cc36a4bf4cb9cac81393762db1d4c2d6408d9f2c36eb69b498ee92eeaef21bf6a301e7979a8b553e20203a22289e2988b7821cbfdc89a79d8fcae2a58329584 SHA512 ce1d63afe6e7d6dafba11d10621bf1b2cf16821b4e67f0a36c55678beab7a48f3760d79d0c33e4d2cdeb52bc42cff36832875ac488f56c091d4ab739f225f729
+EBUILD polkit-gnome-0.105-r2.ebuild 1103 BLAKE2B 74d2494d880a365ccad06296917ade0436c3385534592fb2e702eae8dcedac5bdbd44ef4815f44ec5742bdbf93091fcea8dafcd8c1dd80341ba875415ac42b6f SHA512 4ed095a28f90cd26af4152d4c1bd22b4007f018863f12c0e368cc517ab172f17442065a263acc090ed0ecc64fbc43bbec895db20634752ee3c776ab6c37f4306
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
index 5013ca8e3219..6d9051ce9e6b 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.30
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
new file mode 100644
index 000000000000..b271426d6e23
--- /dev/null
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org
+
+DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-libs/glib-2.30
+	>=sys-auth/polkit-0.102
+	x11-libs/gtk+:3"
+RDEPEND="${DEPEND}
+	!lxde-base/lxpolkit"
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	cat <<-EOF > "${T}"/polkit-gnome-authentication-agent-1.desktop
+	[Desktop Entry]
+	Name=PolicyKit Authentication Agent
+	Comment=PolicyKit Authentication Agent
+	Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+	Terminal=false
+	Type=Application
+	Categories=
+	NoDisplay=true
+	NotShowIn=MATE;KDE;
+	AutostartCondition=GNOME3 if-session gnome-fallback
+	EOF
+
+	insinto /etc/xdg/autostart
+	doins "${T}"/polkit-gnome-authentication-agent-1.desktop
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /gnome-extra
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)