gentoo resync : 28.04.2019

14 files changed, 205 insertions, 128 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 876c427e81ac..9dd4669e3f88 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 8744ef8619c7..6dec42dd04ce 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -8,6 +8,6 @@ DIST gnome-desktop-3.30.2.1-patchset.tar.xz 3572 BLAKE2B e8a681ea7a3eab8186c89d8
 DIST gnome-desktop-3.30.2.1.tar.xz 1052492 BLAKE2B 064ca0580e00e7561bba73a4ae14fb642fb3c66e9619cf3690df996bbcace27188da0bc33384f06147f69653f43ea7bf73adddeb4477a7d231db66e6dca444ed SHA512 dddce479ccbb7245c6bea0638199118a88ba6d4f8f61e0c673aec2e738c26d9a99053499b3db190f731cf48ef8967feab5e4b253fc96ae68aa19d235bb52b31f
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
 EBUILD gnome-desktop-3.24.2.ebuild 1591 BLAKE2B 53e0503424cc142789ebe095c4b04f064b214e550cdbd88fa5c5943f183f8f63b7830167d754e591f580e6c9b3eb89fa7359fa5583b190bd71722fb59fd7d3a7 SHA512 e8ca8f0ed30fd58901ddbfd253dfb90afb7c100ee19c5533813db02670140168944bd294a1741dd98f83f29c02fcf9b88ef819035144a9e400199203f137f362
-EBUILD gnome-desktop-3.26.2-r2.ebuild 2053 BLAKE2B 5a776ff52fb3757f06f5a013b5c93941780da0f2539feafa897ec4001556b1965161edaa61b61389dfe51998306dc69671c7849f48377d2b35e07902d8f017c7 SHA512 27efb3512a728af66bde8b781a37666ac6a9a28459e4463fad4e8d0366c66022ffcbcead5976d654832ba75e99e8224b881cb93d09e83f17c4858d4b6055b95f
+EBUILD gnome-desktop-3.26.2-r2.ebuild 2060 BLAKE2B 162338d1095af7c06f71f74a3041530a94697a028ba0280b2d1b636f8232963abb13334ce6aa67a64844d3e587ba851ee3fecd5a11f4a31c3201b472a6070cb6 SHA512 09979d7241039cc5f2a82c614b3d0cbbcc7850eb744958645cffb68a64b314a43b21ff53fb8f01610af6066edf8a6b9c63b4509e010985a8ee465818ce8eaf36
 EBUILD gnome-desktop-3.30.2.1.ebuild 2000 BLAKE2B 9c142cd2a339cec15dc5bc8e8a83d64e20e3b492cbb8fa8987217b6d7fc70f8eb082f30f88d00ecc99b8fcf0211a82436265f09c3a1bba9879e5e67657fce8c7 SHA512 f68a558f1a8f0940ce52e6764b6f61a30eae0564095a39544e338c0ce7205badf03ce3e5ddd92fecce57372157db30ec6e13659bb1da7ea84f870bba1278456e
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
index f3b2892bd8b1..aabc9847f481 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/12" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index e14126d8e73d..8bd4b95b733d 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -4,6 +4,6 @@ DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a743
 DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0
 DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458 SHA512 7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d
 DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84
-EBUILD gnome-settings-daemon-3.24.4.ebuild 4721 BLAKE2B 8e8933764655357514fca45a002376d2de3dea4eb5df7ce4bf1bdbc4b465d8d351aabf4f91aabdda46bfe3f72812137e8fc8423d30060e99e07ce045e7fed3dc SHA512 f4382da6b22932620ccb995a166ed3b6d1006bec9c2e96cabc42269d73e0508d945d4803efa5b84ccd4167d72a6c7c44f6173a5670af60895fc577e18cf98e5e
-EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3891 BLAKE2B 0272b5255682a868ed82509e281fc870ea341744cdb765961b92a5c8fc79b1e2b124a2a51298c96dc9f28bebf257a372dcfcf1af1e1c380f7ff0d545eb288e14 SHA512 4dca17b1099f5107cfcbf64b559eb40822f55d0d5709d9b8ee12745014b10f1a21b74cadbd727d8fe20e92f3d29027aee335fc4fe188519416f6aaed3478b4af
+EBUILD gnome-settings-daemon-3.24.4.ebuild 4717 BLAKE2B 97dfe4ac80f022e19c5315a82f3ebaafe9decbdebd3d722a9cd8b25ff5daecd1dfc6151c9c7976883dfd01f30ee841aef6fe015c51fc58b81883f119c931b9f9 SHA512 dea9e27581240b46d5a07edf5d04dc5860b9566bb0d52b162f82e9a49bbe911ebfedf152c8c1dab0a50b9de0c57e3d89dc8198831bc70d494bf5502d11fddb18
+EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3887 BLAKE2B ad85f83f58a738c9bbb503e252f194ad7f417a2d6c9f676f4840320f3673244ae5f710062b238bcac3271b7a893348585153619a0fa48170e42ea19b0458c676 SHA512 7475708944aa4d7fe28bf9349afcb1c544aed1fc2f453c8096422fa8c4c02d3b2df30bc38d5da1006b7ca603e7df84d86d7fbdc8408fa66f9444eac7f2498c34
 MISC metadata.xml 774 BLAKE2B 94211f84287a451ef68bddcae9824b5345379600b3761067267d8c127bc083337e9bdf41162308efd47f419f13ed790221f082ea6282aa0038a85d13c9edc902 SHA512 4de08b4c743a03dfbb7e9e39cff7473c0f9529ba897b78d0adef9fb980b584a65274b617d1cf50b824e9c35722f6f6ab0565da37ae5fb4c820bdae37b5832833
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
index dbde38ea9373..20b059fb7b2e 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 GNOME2_EAUTORECONF="yes"
 GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
+#PYTHON_COMPAT=( python{2_7,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
 PYTHON_COMPAT=( python2_7 )
 
 inherit gnome2 python-any-r1 systemd udev virtualx
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
index 31e16ecdba58..9a4a4901a479 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.30.2-r1.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,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 5e1be3c6bdf7..8eaa1b3c38ab 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,9 +7,11 @@ AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d138132
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
+DIST gnome-shell-3.30.2-patchset-r1.tar.xz 41324 BLAKE2B 4d051a327d106e8431c7b75d56932137dd3af2694c313656bf4751a385a86ef43dd635f31902be0426899746c63f1cd1aa782e9c0827f750fe61683512fbd43c SHA512 3761688e86694be00d81eac2bcd8774d8fdff62f44cdcd26c29b9e7513d2db0edc0ba097e0fea474a232496e3f9b8797e6215a040915a0832517235b26cbc265
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 61c02e5ae87ab24f30d28865f4444f20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8 SHA512 8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6
-EBUILD gnome-shell-3.24.3.ebuild 6629 BLAKE2B 9442d16e86abde07688dfd2a4ac82c88063ed5a0f103b64dc0491a4dafd89cc5b5ef4cf4c25b233749afca00af191f5aa7055e3c255535c2c1eb1842c2bec166 SHA512 059cba2b4b010241c6715579904df48ad58426d2037466b3540165dd78674ef258cec2bc338881c72f4d18eb0f83c69801cc7a056dc03d46f14a9add15f4a24f
-EBUILD gnome-shell-3.26.2-r4.ebuild 6615 BLAKE2B 30ea1dc614bc95f373a596c190553bab87ab2e0a491fa7e34ddceb9e831a461e6047c89ef8ef0e82473b26cbc9699d088b9afdd0abdbeda5561e0a3bf4a0f460 SHA512 24c2e0fbe7e904f55a8a089ff6faf4a1b68c9a9fa31379da79a2491fd5eb1e1f8e8161c68b49856d47366b68bfc2de329025abf3d80aed6045e62d7cdff94d0d
-EBUILD gnome-shell-3.30.2.ebuild 6571 BLAKE2B c518507942af74dfa56d68fc67c75797f925c36ca69bedc240640b5a91a6a26995743489aadff998386394b04fcf991a0163040c8c8501e7acc85270e2c5a3b6 SHA512 5921abd8cf4b2df53db64123339ac134c51db2d397e95a58216601038417ef7e90210baf77a9707cdc9c822464c2f35a5eae41a76426dcf74b3ec06a7a5bf6e5
+EBUILD gnome-shell-3.24.3.ebuild 6627 BLAKE2B 11f38494c15a4ea34df2f6f4bf00f1478e3ef53e64a3a3c0cc32fa33de53ecc90d746eb840d75102d955679d4c4526e64633f522ed87ce45bb9d80fe91ef77df SHA512 ddf65e678e087a579fe52c87776f21cd53f3bf7be8e8b2b98830b088a3151c98a108cbcedc93bbce81d8c71ae7c860488244ec671ca5cd663c7a3490581170b3
+EBUILD gnome-shell-3.26.2-r4.ebuild 6613 BLAKE2B 03e06ce7c6b60541b4efe93e51a0979ebb47a7b7d1a1f5ea6affb26f4f56dccc027680ef29f150a27df21977aefb7338142d04072655a1fb8a9d28361c7ea824 SHA512 61c03adba290399094ee0b5bd6004e791a6739581eb552d876b4d93ea42e8098897ec7be5031ae4525f9cf0319eb6fa8701e3cbde46027bcd5c35899354a2930
+EBUILD gnome-shell-3.30.2-r1.ebuild 6499 BLAKE2B b3d2ff45b435b997208a0d3e5300853222bb5dedb3eecc7ff825bd0c136b16e2ee715f2b5d4de9f720b9ad54e9522a93d04f2fedb0820105e48db31f97f0ae02 SHA512 5bf7736beca8eee514e939cd062b20dc6738f556705267f4b674a4e6b9c3c1ef39829c1956d319148b80afab0c36deb0b8be14f4fd25434bf5cdad2c20f0bc04
+EBUILD gnome-shell-3.30.2.ebuild 6569 BLAKE2B ec2c58fb65eccf251bcb6bb75b9c4a9eb1f0aa9d7e713fa2263dd16882433219e4b3ddcd418f5ef07c651b96f52eb50fbf981514ce99ccf5a54582fef6bcffb9 SHA512 5241067c91205d9194e55892d833a5f27b58ddf0473e318a14deccd6164d99906c984bc70761e212e39605a8eb144792df4e208ab3ff474874a25d45abbfcbad
 MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
index 4639ca5f8726..de96ae77552b 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.24.3.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 gnome2 multilib pax-utils python-r1 systemd
 
diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
index af185e103a1c..0d9a66872aa2 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.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 gnome2-utils meson pax-utils python-single-r1 virtualx xdg
 
diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild
new file mode 100644
index 000000000000..d659f15c9707
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+	>=dev-libs/libcroco-0.6.8:0.6
+	>=gnome-extra/evolution-data-server-3.17.2:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=dev-libs/glib-2.57.2:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.54.0
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
+	>=x11-wm/mutter-3.30.1:0/3[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.27.90
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.2
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? ( >=sys-auth/elogind-237 )
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	media-libs/libcanberra[gtk3]
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	media-libs/mesa
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	>=dev-libs/libgweather-3.26:2[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-lang/sassc
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Patches from gnome-3-30 branch on top of 3.30.2
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${WORKDIR}"/patches/
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/3.28.3-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins
+	sed -e 's/mozilla/nsbrowser/' -i meson.build || die
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		$(meson_use nsplugin browser_plugin)
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
+	pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs}
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	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 GNOME Shell'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 "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild
index 54d8d3fd4fc6..b76502772cbc 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-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 gnome2-utils meson pax-utils python-single-r1 virtualx xdg
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index cb6c97f14bba..cf159466d190 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -6,13 +6,11 @@ AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e89404
 AUX 3.30.5-seccomp-sparc32.patch 675 BLAKE2B e8d9d9c4299cd700ea02656bf66f1ddec1801901161f026f78b88cc393793392c0e0af97a8de47a851545b5cd6305160233b952c1a0ba86ccc1d1f7dadf1dea0 SHA512 fe91a78d17a9142b8964d6d52778b32ac0b88e85dc0b1b05b838a1d90396f7c73927f9dce63ebe8585f8d1cdf94ebdc6a123b58196dc1248ce5aa6dce5d73990
 AUX 3.30.5-thumbnailer-updates.patch 3978 BLAKE2B 0c7c7147d5bf947617f32d6f1ec1949941f5f9cf77dd351ddeb3c41871e247eac10855b3075f81f4d3dfe0f692f76e25590d5db5d4823ec4d264b6a65ee3177e SHA512 2a14f9256c3ff5d2744038ede78fafdd27b033ee6576885faab35aff77b60c69035e3aa1400c183f9f0497b0bbb8890e3be6dfae5fa3a77df180601c185939d7
 AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601ba61f2ff78f3a4ed6fb860b7854c4198963769df5673cb5cdf2753fbfeeb540aa31f7fd29deda0431075747860068b468dff SHA512 44011606a10bb6d8f45cbc2b20b802ea347d930c44959de33bc0f395dd050e01884ec1b6a85b899b1b30aa6fde07fff8d6ff4dcb4d1a7fe86d27a9721668e8ab
-DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
 DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
 DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
 DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
-EBUILD nautilus-3.24.2.1-r2.ebuild 2834 BLAKE2B 49e34f2586cdbdd09880865fe0118665e00b0438c76f31109a5901f0a8ea8f41272facbc3e1384cd313e261f361df5248a5f2844269eb1f6db6e1c1e86bd29f7 SHA512 c082f2a82cd948edfe20c2cb31b868eeb01ca9ac8e96226abaed3d22b52f58f877b27f031127c285fcdc59a78cf65f33b0c6e815d2b72792dc7ea1f256422d44
-EBUILD nautilus-3.26.4-r2.ebuild 2780 BLAKE2B 1cac10c09ebc7039477779bc1e94b5f0de938772d6b0f45a9dd86cd01c6694bc7619ed136ae19eba7f828000a46c434c881c70c469c8d38d3a99fe629be44a94 SHA512 d87e1f98052e47ce4ac107dcec984be45e655c5944043c54444bebfaf98fb2a6495a5b81e6a57652f86e5b64c279ebb9f7a0e7faa01a29fc827ba58afad8b409
+EBUILD nautilus-3.26.4-r2.ebuild 2778 BLAKE2B 774becb8cd3ee153b913e6a15c203fdd40bcf47e2c7bad1bc9333acdd909ec19ac0cec8d5280ab40980386a249ef86629be05ee51db31184bc0db926aa03aaf6 SHA512 481a36457d59e6db0ec049f6e64e9f509f0485c280f28b65c1bdfc98072c8198f9cf9ac8b40bad7186ba9059dca0bcc49a49207bd2c6afc649c7c5c1a9122ad8
 EBUILD nautilus-3.28.1.ebuild 2656 BLAKE2B cd1f74358d8e23af670c498ad510c27e261423ef560b59559be4ceb79745b0db16f61da3580edae7998ca88eb7983401ba656c0a105aca362770f6ad2a08c206 SHA512 6ab0cbc44f446eb9e82d9046aaaee77f1bb34768c2583ed5143fd17f12af7d2f46027f08732f9483fce151091d6cf167e13879e301360056ded4a2326bb9c4d5
 EBUILD nautilus-3.30.5.ebuild 2776 BLAKE2B a8a8b73f4c6151b09cb03a9a0be1064b3388f087967d747a2ef7cd4a2f3da0b5ccdc97212daa77444573959fc79ad8c913875f079e4b30b123461a37c51c5a95 SHA512 67ad73530b9bcc01da31c92991ad8f1308e25332d6a1174f37566b806e1f6ccee1a7fe934cbc93a088b47af00251098859803a7e972fa06ff8fe8ab64e7f0445
 MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668
diff --git a/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
deleted file mode 100644
index ae97ee6cbaac..000000000000
--- a/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit gnome2 readme.gentoo-r1 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=app-arch/gnome-autoar-0.2.1
-	>=dev-libs/glib-2.51.2:2[dbus]
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.21.6:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	selinux? ( >=sys-libs/libselinux-2 )
-	tracker? ( app-misc/tracker:0/100 )
-	xmp? ( >=media-libs/exempi-2.1.0:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-desktop \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable selinux) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
index aef38545ec00..735f54ca0fe1 100644
--- a/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
+++ b/gnome-base/nautilus/nautilus-3.26.4-r2.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=6
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.51.2:2