From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 24 Dec 2018 14:11:38 +0000
Subject: gentoo resync : 24.12.2018

---
 gnome-base/Manifest.gz                             | Bin 5690 -> 5695 bytes
 gnome-base/dconf-editor/Manifest                   |   6 +-
 gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild |  33 ---
 gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild |   8 +-
 gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild |  44 ++++
 gnome-base/gnome-common/Manifest                   |   4 +-
 .../gnome-common/gnome-common-3.18.0-r1.ebuild     |   3 +-
 gnome-base/gnome-common/metadata.xml               |   4 -
 gnome-base/gnome-core-apps/Manifest                |   3 +-
 .../gnome-core-apps/gnome-core-apps-3.20.0.ebuild  |  54 -----
 .../gnome-core-apps/gnome-core-apps-3.24.2.ebuild  |   4 +-
 gnome-base/gnome-core-libs/Manifest                |   1 +
 .../gnome-core-libs/gnome-core-libs-3.26.2.ebuild  |  41 ++++
 gnome-base/gnome-desktop/Manifest                  |   3 +
 .../gnome-desktop/gnome-desktop-3.26.2-r2.ebuild   |  68 ++++++
 gnome-base/gnome-light/Manifest                    |   2 +-
 gnome-base/gnome-light/gnome-light-3.24.2.ebuild   |   4 +-
 gnome-base/gnome-shell/Manifest                    |   4 +-
 gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild   | 205 ----------------
 .../gnome-shell/gnome-shell-3.26.2-r4.ebuild       |   2 +-
 gnome-base/gnome-vfs/Manifest                      |   2 +-
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild    |   1 +
 gnome-base/gsettings-desktop-schemas/Manifest      |   4 +-
 .../gsettings-desktop-schemas-3.22.0.ebuild        |  28 ---
 .../gsettings-desktop-schemas-3.24.1.ebuild        |   2 +-
 gnome-base/gvfs/Manifest                           |   5 +-
 gnome-base/gvfs/gvfs-1.32.1-r1.ebuild              | 134 -----------
 gnome-base/gvfs/gvfs-1.32.2.ebuild                 |   2 +-
 gnome-base/libgnomekbd/Manifest                    |   4 +-
 gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild |  33 ---
 gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild   |   4 +-
 gnome-base/librsvg/Manifest                        |   4 +-
 .../files/librsvg-2.40.12-gtk-optional.patch       |   2 +-
 gnome-base/librsvg/librsvg-2.40.20.ebuild          |  97 ++++++++
 gnome-base/nautilus/Manifest                       |   9 +-
 .../files/3.26.4-file-view-crash-fix.patch         |  81 +++++++
 .../files/3.26.4-optional-introspection.patch      |  49 ++++
 .../nautilus/files/3.26.4-optional-tracker.patch   | 264 +++++++++++++++++++++
 gnome-base/nautilus/nautilus-3.20.4.ebuild         | 110 ---------
 gnome-base/nautilus/nautilus-3.24.2.1-r1.ebuild    | 111 ---------
 gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild    | 111 +++++++++
 gnome-base/nautilus/nautilus-3.26.4-r2.ebuild      | 109 +++++++++
 42 files changed, 905 insertions(+), 754 deletions(-)
 delete mode 100644 gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
 create mode 100644 gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild
 delete mode 100644 gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild
 create mode 100644 gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild
 create mode 100644 gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
 delete mode 100644 gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
 delete mode 100644 gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild
 delete mode 100644 gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
 delete mode 100644 gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild
 create mode 100644 gnome-base/librsvg/librsvg-2.40.20.ebuild
 create mode 100644 gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch
 create mode 100644 gnome-base/nautilus/files/3.26.4-optional-introspection.patch
 create mode 100644 gnome-base/nautilus/files/3.26.4-optional-tracker.patch
 delete mode 100644 gnome-base/nautilus/nautilus-3.20.4.ebuild
 delete mode 100644 gnome-base/nautilus/nautilus-3.24.2.1-r1.ebuild
 create mode 100644 gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
 create mode 100644 gnome-base/nautilus/nautilus-3.26.4-r2.ebuild

(limited to 'gnome-base')

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index d478c2532ef8..8743c90fbf50 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index f71f048ea93c..a9dc8ee0b3ad 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,5 @@
-DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361
 DIST dconf-editor-3.26.2.tar.xz 542828 BLAKE2B e7bd35b39d7b0124105513d44f3a24d005f1c6daf2dccb1d3eeb324b65038adfc11e5ee83078058489b1e918222538a97621c74fb0a0ceb20e1a708ccf5a82bd SHA512 25a6536c97b4f6fc26890915e2d0ed3ff1d2247175fd25a7d86e44f33da8667064415b22890c799d3586cd0f08becc90414f02bf3d988aa1d02eee90d7e45ba5
-EBUILD dconf-editor-3.24.3.ebuild 709 BLAKE2B c7109dba5e8f3d88ae08b828d3a6376331a11b7a07fbd6090419300c4dcf88e0af193272b5654e9b1e4fcdd3c3090a272946808b16f94ac3df25d2bb30309dd2 SHA512 92c1ed759feb097ad15ac719a63399933da0e8dead7c0234f57030eebad5e06efeb878a72f974e6779d14e263c8f2e9fe34e823ed5671dfafaf349bb27eb2f5a
-EBUILD dconf-editor-3.26.2.ebuild 711 BLAKE2B 4b2485c15b542d7162c2fb9bff89127009919017f7f1096e98cb90f5667522bcd0d428c773e98494d1bae61d353edacf2595e95cb6e6e444517ba017a0846066 SHA512 12cd0f5f72300590a5e539ebfca2011abff4ad15ef84760aedf55c914362323811cff81655972ee9e9c3d3428e46a99855c25841cb6fe4bbe6afe20692458c0a
+DIST dconf-editor-3.28.0.tar.xz 417244 BLAKE2B 1237b199b7b991055fe30829dff0554be7e3122001c9c1a3bd1b17dc1aeeb0a4df6536560b072559c96d4da0b26bdf234479cb9c38ae979d08c220348df48649 SHA512 435c159fd3356c19e459ed9441671b508c5ba1b2d9f491d304280ef66b980779fda5769bb2e1e85a294ceebe9e729e4899ac0ab750f86e5ccdbdc455cf1ffc44
+EBUILD dconf-editor-3.26.2.ebuild 705 BLAKE2B 62ece465f4d27773b1089f646660601c10d82efe5bf23811b8b5aa4a4d499a0876d649828305d1408f84d440d80c35a6b073c5ede6f85e541f268f2ccb0ed64a SHA512 40d057586b0eb2710c7d202c3aa5df4901eea00e75dc22f028b5271aca35dbfdc64f74048f6d56d2e11ae22802df91c2ff2c41e938b41a440a6acdc5aa31842a
+EBUILD dconf-editor-3.28.0.ebuild 863 BLAKE2B 64b20c626f40bd0aff5fd40fa8ec2e22751f60b88747c8e474e70451218323fc4ad87a0f5b3253b0c75ec537b1832843989113c045e7163b0102f0f856967e96 SHA512 b999a3f7c4d479b37a94b8775aeeaeb9a6ebdce2029e57fbcb63f72980f8aca13568e4b050169b682353e27b50199d8d9493aafd2cf960348a3e291036a7f2de
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
deleted file mode 100644
index d594f7ab6d14..000000000000
--- a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Graphical tool for editing the dconf configuration database"
-HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/appstream-glib
-	>=dev-libs/glib-2.46.0:2
-	>=gnome-base/dconf-0.25.1
-	>=x11-libs/gtk+-3.22.0:3
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/dconf-0.22[X]
-"
-
-src_configure() {
-	gnome2_src_configure \
-		VALAC="$(type -P true)"
-}
diff --git a/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild
index 793439eceeb8..5614929cccd4 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,12 @@ EAPI=6
 inherit gnome2
 
 DESCRIPTION="Graphical tool for editing the dconf configuration database"
-HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/appstream-glib
diff --git a/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild b/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild
new file mode 100644
index 000000000000..1b5810193421
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.28.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.36"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+
+RDEPEND="
+	>=gnome-base/dconf-0.26.1
+	>=dev-libs/glib-2.55.1:2
+	>=x11-libs/gtk+-3.22.27:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index fdc556b29cee..48ec4184479e 100644
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-common-3.18.0.tar.xz 155804 BLAKE2B 5e5dbccf1851f45e2890e2fcced1be5630dd378bb22448e38ff7988a18145bfa90dee03a64a4ba4ff9d22ea6fd812e9f02a1ee1f9656b4d47201afc174d69229 SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719
-EBUILD gnome-common-3.18.0-r1.ebuild 652 BLAKE2B 0725bdf9003c74ab4745901197aaeb1b13c00de09bf2a34966a530dca4137b3a8bca7be3ea46c9a1f7cb64048376efc7a62e10ecda8b5199b1d9527807dec900 SHA512 083f8e28bc62d132c3bce9913ae5a1e901270760a8d66c96d5de9a315d6725572b55d1b556119691b58d2cc789806102ee5034a2806962e18f8bf1bc9ed9b10a
-MISC metadata.xml 423 BLAKE2B 7e825de85ab5542370d4563ce0d7a9c1643aba435b9ab8ede4af4e4c8ee371c99130289502dfe3e606df5f6dcfb91adca6a60728218bc6b2df9d669918449df7 SHA512 267dd7f1897f75f178b4f83325117792d9bccfdc339327eb54b151452c65fedadd72b4c0205b00d18a9edd985dbb9cc32e11bf4e3b587a8dd3d6a3a9bc8d1183
+EBUILD gnome-common-3.18.0-r1.ebuild 624 BLAKE2B bd0c1edb7af5dcf2ffd88be81e87499bd616b8891c27651540f19068587556a98da9e8ae8df0dfc414d0c761c32b86aea36608d606ea201d8a6250bda418ade9 SHA512 44cb43971dd841eb988a96a585bbdfd6e25d219f16ae867846b9908172b5a6a6e4527bbd9fdae8596151c9a95e90c25f237b2c325c34ea2d74df0fe0d2962314
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
index 5d99893cf7f2..24db11b7dda9 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
 LICENSE="GPL-3"
 SLOT="3"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+autoconf-archive"
 
 RDEPEND=""
 DEPEND=""
diff --git a/gnome-base/gnome-common/metadata.xml b/gnome-base/gnome-common/metadata.xml
index 1340d1a31fcd..39980802b1da 100644
--- a/gnome-base/gnome-common/metadata.xml
+++ b/gnome-base/gnome-common/metadata.xml
@@ -5,8 +5,4 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<use>
-	<flag name="autoconf-archive">Pull in <pkg>sys-devel/autoconf-archive</pkg> for ax_*.m4 files
-		instead of installing them from the gnome-common tarball</flag>
-</use>
 </pkgmetadata>
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index 501616c677ef..52cf5bda337e 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,2 @@
-EBUILD gnome-core-apps-3.20.0.ebuild 1446 BLAKE2B f14dc6f63582ab8f9a11c55e780d3a56a3e9642ed8ebd6c109e9aaabf8f95910c266e124a16adf14f8b4af367fa74c27ac30a4c198c1fb779fd226e6dbd64daa SHA512 265e62a1341dc6dcd4da66ae67e11ae43a5b434fac1b18c329646871201663cee4c7fa1cb1b16526193057d7da9345a38d62e9f82c2f64be8323b2411ef3bd8f
-EBUILD gnome-core-apps-3.24.2.ebuild 1506 BLAKE2B 514feee02bfe57ff00f83db8a0beb317a6be0678a066658b39b7740000625ba647410a90384769b7041aa19ea681803124fd492dde4209089a65e769dbe11f59 SHA512 5e7f9285e94ca98f1ea51d17d91f994a657b4a25f41e64357130e40aa287bc10106376b5f98f67fc44664ceb82519886a03d9ff218008ee85a1de4bba191476a
+EBUILD gnome-core-apps-3.24.2.ebuild 1508 BLAKE2B d28ee34bb83608702334297815bb57bc0d7609fbd22140853c15ee620f226c932a302e9d837b3e0e434167ed6651e04cd00083fcebebd89db0028e849c2e7437 SHA512 4ef8de35566aeff15124d332e9d4a8d020782edde45a51aae4b5fc6edec90b5172feb592bf16fd80cfb81efc6687f06ca5544f0718d3a2080fa54b0529cd4b9e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild
deleted file mode 100644
index d7f6d2f5522e..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth +cdr cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# Note to developers:
-# This is a wrapper for the core apps tightly integrated with GNOME 3
-# gtk-engines:2 is still around because it's needed for gtk2 apps
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-3.10.1:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=app-crypt/gcr-${PV}
-	>=gnome-base/nautilus-${PV}
-	>=gnome-base/gnome-keyring-${PV}
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-${PV}
-	>=app-editors/gedit-${PV}
-	>=app-text/evince-${PV}
-	>=gnome-extra/gnome-contacts-${PV}
-	>=media-gfx/eog-${PV}
-	>=media-video/totem-3.18
-	>=net-im/empathy-3.12.12
-	>=x11-terms/gnome-terminal-${PV}
-
-	>=gnome-extra/gnome-user-docs-${PV}
-	>=gnome-extra/yelp-${PV}
-
-	>=x11-themes/adwaita-icon-theme-${PV%??}
-	>=x11-themes/gnome-themes-standard-${PV}
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} )
-	cdr? ( >=app-cdr/brasero-3.12.1 )
-
-	!gnome-base/gnome-applets
-"
-DEPEND=""
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
index 3822a36e6092..27e4af5e4100 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ IUSE="+bluetooth +cdr cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 
 # Note to developers:
 # This is a wrapper for the core apps tightly integrated with GNOME 3
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index 2ab84d652d38..f74095048f85 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-core-libs-3.24.2.ebuild 1053 BLAKE2B baea5363a73c2a7ea9f77417d3e224d24983405572d4aaa48fdf41198b489aee0ca9c5df2820a8f676adf2b28b28bc31c9154e8dcab1deee390782b5c14c46d9 SHA512 48301a8470a7d2179ee9a8b639cf449d7493b41abfe48a33f454fe66f88eb67d888827d15f2bccbc63a93923bcbca074ade6e185251a93eac2cc374506284ac0
+EBUILD gnome-core-libs-3.26.2.ebuild 1048 BLAKE2B f1b4bc798385dc820e47b85c65c49912a16fd956ea66c58d58395e853e695aae47ae7d4f065be1aa6a57bf7c803bee7ead8054fc58cad02147de4e2aefa60ba3 SHA512 b23abcac52a03ab0caee15adf4f2be77b2be1c6c84cd6198bae5a9523e301c9d0f1272125d4ac0e2e39a054f332946a2861a1b9fc698969c77f8c63a84e543ef
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild
new file mode 100644
index 000000000000..eb913408f5b4
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.26.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="cups python"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc"
+
+# Note to developers:
+# This is a wrapper for the core libraries used by GNOME 3
+RDEPEND="
+	>=dev-libs/glib-2.54.2:2
+	>=x11-libs/gdk-pixbuf-2.36.11:2
+	>=x11-libs/pango-1.40.13
+	>=x11-libs/gtk+-3.22.25:3[cups?]
+	>=dev-libs/atk-2.26.1
+	>=gnome-base/librsvg-2.40.19
+	>=gnome-base/gnome-desktop-${PV}:3
+	>=x11-libs/startup-notification-0.12
+
+	>=gnome-base/gvfs-1.34.1
+	>=gnome-base/dconf-0.26.1
+
+	>=media-libs/gstreamer-1.14.1:1.0
+	>=media-libs/gst-plugins-base-1.14.1:1.0
+	>=media-libs/gst-plugins-good-1.14.1:1.0
+
+	python? ( >=dev-python/pygobject-3.26.1:3 )
+"
+DEPEND=""
+
+# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 89413ebff983..98d55a8d654c 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -2,6 +2,9 @@ AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a3
 AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
 DIST gnome-desktop-3.24.2.tar.xz 1064808 BLAKE2B 8574d26f2c2adedd7a287651fb34170e75d1744ad14e6caab8ede87af63b93197bcf4cde60dd9f6352dae8ae7bf8d598d0b24588d3a06cc2192c651b58577562 SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2
+DIST gnome-desktop-3.26.2-patchset-r1.tar.xz 13336 BLAKE2B a90b0e223d3187e616819a6cc5b0b972dec62e2dfdefde6284d2f0526a651865b72143d900cc2b9e9a3758bd23288d9f99a0084f353bcaaa2821f19519be32fd SHA512 f5a0b756c52e4307f3dad6092685b2c178a04467c483322bc9b7a47b3545bd75a70f56658e5cc90422bbf715601fcda7d3e48ab129c778dd7c34ac9d35783c1d
+DIST gnome-desktop-3.26.2.tar.xz 969500 BLAKE2B fb1e671d8fb890d9aabbd351b824b76f13ed7ba62dd3f82a36fca7cbe590af8901fc7bd8ef1be6a5c9b978569b306eba5c3d2f9545856389438a43539b1ed9e4 SHA512 1425bead81a63d9d19f09fb8d23cd2611645898a910887c2b6a672bfbec3dd956e29e1d8c5f941d06929febc7734dec0550f7a15336583fcf9be41f1a4e9c783
 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 2043 BLAKE2B 58ea4eda89eaea8a9078992aeadd12cb7efcb05a4eca5a4da36590127f88aed91d7b815d57d831b1a496d4272407d7067ad53d498d16ef885e715d9532d34320 SHA512 7701ebb1e9c4a556243fbf5f3b69d7307b619503ac1cedd1fc187090b0ad7dd1ef60efb109bdd56c8ef0fd71469f2ea86b971587b2ba5cd0d1727825c8c97ffc
 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
new file mode 100644
index 000000000000..681b86d1337f
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 virtualx
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.53.0:2
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	seccomp? ( sys-libs/libseccomp )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+	seccomp? ( sys-apps/bubblewrap )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.6
+	dev-util/itstool
+	sys-devel/gettext
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	app-text/yelp-tools
+	gnome-base/gnome-common
+" # yelp-tools and gnome-common for eautoreconf
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${WORKDIR}"/patches/ # Requires eautoreconf. Various backports for sandboxed thumbnailer, leak fixes and more - https://gitlab.gnome.org/Community/gentoo/gnome-desktop/commits/gentoo-3.26.2
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable debug debug-tools) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index b3d80a61b66b..8fec82200cf2 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,3 +1,3 @@
 EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
-EBUILD gnome-light-3.24.2.ebuild 1709 BLAKE2B a95ca9100ad9842d54fff566dfd4088adf709636eb5a1458446c400ff1f55b807a7a8eef295002ea798c94a064dc7af93de5d693445dfeb1586e5913286c068e SHA512 5a79223238c824c08a835bb6e35036d5ef0d3244a92c04684d716b35a89220830a0a59a19ea44af108b54bbc650b2e85140adf042c81d5fe6a377e28520a4f1e
+EBUILD gnome-light-3.24.2.ebuild 1711 BLAKE2B bb5e48a4346beb4e4fb7e4237ea684fa4bbfb4fc3e57783ef7020282a54baa68a0dc56d06f730e915d55628a10c0e6a66510e96b8ba54fa6b54ba0b93d28d02f SHA512 a1a9d02b0eea870d92084193173042351bb9b7c1110d18accf98c0852be66f27c0f1f6c79e45da7f9946d00c2c78ba9729588106dae51e723b00e9ba01284f4d
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.24.2.ebuild b/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
index 00f36b71176e..00b249831385 100644
--- a/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 4b34fc9fbed7..1f11f696ae32 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,11 +2,9 @@ AUX 3.26-optional-bluetooth.patch 2406 BLAKE2B b747c9d5cdbefbec8c045e24502bcb57b
 AUX gnome-shell-3.12-bluetooth-flag.patch 1894 BLAKE2B a53360d103faf25aa605cd5c73eeb892ce667f57313fbd90bdcf176151158b1389ba49becd4421d825e5d63d4dcb0a2e99618f3558de87f0afe2b46851a353f0 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80
 AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5
 AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d1381326ad2059a59b3ff9579475b160d9c6fa715acfcf0f3d9d3544bc435b13fcdd45cf420b761ea6681718e540a39533f615b7aa0214 SHA512 b534134cc76dce49c78621d9245e9c457f4eefc3ac89dc09f036a178524b0ad3608683f43a0920fdb1d36410aebbfdecd701725217b6239f4549ef4ba82b7213
-DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b571c6819c1fdddc20e019e282bcfbdf6d9f40850667756046187e0e3a52a57ba60962cc49b7b4b49909ec5f992e518e6 SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9
 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
-EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3
 EBUILD gnome-shell-3.24.3.ebuild 6612 BLAKE2B 79ec20064d5dd5a4224918b2d7a4b37f7f86d26f3bc1a9bb9637b01c0e2cf6c8067fc16a75667955499b70b56af83673d8719273a7939d8fb95af9fa902abf7b SHA512 69d2e339a772a41d2ee95487597963a202ab5d3d0786a009adaac36df8ce5c1f56f0377e6b31eea5de5d264315048e2592fe81df0e7c953c9beca13290b0db2c
-EBUILD gnome-shell-3.26.2-r4.ebuild 6583 BLAKE2B be471765a8fc69fd3301470accdbbf78b52bd3bcc64bde4956dbef69d42e9b7d7e0a6d44fabc62b3d72ec555e4e68ca430481898d0a61c2cae6d7c570137ee16 SHA512 5c0a6ae0d442504bd34ea1b217579b6307ed8fc25b8d42268a3d32132c6755066848ed65a4c8f90ea1d3fdb73c01dd0ce87753a56dc2084e00c2e3b36cb74708
+EBUILD gnome-shell-3.26.2-r4.ebuild 6595 BLAKE2B 24a1f07e5d224a89706bc36a8baaed1ac4e1b92f31a90a667179a5fb57b61875744e1319cf5fa030d10c15ac88291dc5ca66c9245b024fc1c305268bc38a99df SHA512 0ed0eda6f5e52c291de12d75f548efe176e7b09f7f50f88c6a2e59890e0994bdc2df9858cfaca6e7329fb0f73f618bd497006edd449e2573179567527f459780
 MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
deleted file mode 100644
index 9d87933477f9..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit autotools gnome2 multilib pax-utils python-r1 systemd
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +ibus +networkmanager nsplugin -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~arm"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.45.3:2[dbus]
-	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-1.49.1:=
-	dev-libs/libical:=
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.21.3
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.22.1[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8:=[introspection] )
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-"
-# 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 is needed for gnome-session-quit
-# 3. Control shell settings
-# 4. Systemd needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-# 8. IBus is needed for nls integration
-RDEPEND="${COMMON_DEPEND}
-	app-accessibility/at-spi2-core:2[introspection]
-	>=app-accessibility/caribou-0.4.8
-	dev-libs/libgweather:2[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	>=x11-themes/adwaita-icon-theme-3.19.90
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	>=dev-util/gtk-doc-am-1.17
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	!!=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
-
-src_prepare() {
-	# Change favorites defaults, bug #479918
-	eapply "${FILESDIR}"/${PN}-3.22.0-defaults.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	eapply "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
-
-	# Add missing path to libmutter-clutter when building .gir, bug #597842
-	eapply "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-man \
-		$(use_enable !openrc-force systemd) \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		$(use_enable nsplugin browser-plugin) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	else
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	fi
-}
-
-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 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 "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source"
-		ewarn "drivers."
-	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."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	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
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
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 e8bb212e6a83..6ebaf3f99c33 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
@@ -16,7 +16,7 @@ IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin syste
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 59786f35cbd1..895a3ae27aeb 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -12,5 +12,5 @@ AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
 AUX gnome-vfs-2.24.4-openssl-1.1.patch 839 BLAKE2B ebb91d34946354c2995a04b6c784be9cce1c93429d9ece7ac93c93795411d3c85ee8cf5ccfdfd53f15775df496ea83dfcd75d443d524442071e5412ca85aa307 SHA512 77c00b421f7026cf2ad3a05866ab9afb8cef78da3497604823c3eab1830475ad1a0d460b80f9599f579e7e789b9ef2b3a00887f6313148698a4ec4e4c98d3345
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 4196 BLAKE2B 0045d973ed8488b2d51448f97560fc677ceeae45b866d0ea7f17c93a68c1cfcaad2290af053f0dd7a71916e5cd5c21399ddfc1ebafe8e16468ec3c831761800a SHA512 8e4db01d7313b521abc532ad4fdef799ab41b58141636fd132636448612e1e64c8407f4c20288ac355b03a2c22f5d110a00341336c65111898688f84654f4dc2
+EBUILD gnome-vfs-2.24.4-r5.ebuild 4217 BLAKE2B 393963131dfbbcb976a1b891672aadf06b70c10eb63ac3574290e47ecd74d17d297a25d29aa9fec2e1ab865939f94d61fd7bd8aaf31b2a98fa4d7f9512220606 SHA512 800467db92068e5e50368c5fe396fc2e9295599655f9d6cc9cb6ab3b6c861b06f2f33c7075d795dc3aa05646433f7ea1ccff9284a86a089ca708fac6f025bc0d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index ad3dca34e334..6d393236a8b7 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	sys-devel/gettext
 	gnome-base/gnome-common
 	>=dev-util/intltool-0.40
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 237b9eb234cd..4ffa85817d81 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,5 +1,3 @@
-DIST gsettings-desktop-schemas-3.22.0.tar.xz 598412 BLAKE2B 0249dfbdc7d574824ad6c34cdbafc7859eba4d78494c80d42b9b5a739cfaa8bb6d43e13093148253dedd0ae2762261750f791d809ba8058a78098fc7f8dad510 SHA512 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
-EBUILD gsettings-desktop-schemas-3.22.0.ebuild 751 BLAKE2B b52fdc0273e8e3773d19c6440d50b06c21b7368727566adaff4ab08f659ca7515d2bd1e5dd05c8c3926813724238b015dfe0ca03f217c0c06409f08b2f1c7474 SHA512 f4cd579af06b36c984ba8e30dc44d5c4b191e98bc42af2aac497400e15d7b361a1b7c035cca6b5916d14d00f89b1556686e69a8818a01c4d30f1a8e624224a88
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 770 BLAKE2B 0d5ace168229729963d8e65a720ba8d39e96de31f7027bfcbf6f6806e37ee9227bc7b8de9acd6e1c1a950bd96c336c6600a43c57602461a491f315bfbb54f7d4 SHA512 a9cceefc4aee3b79eb786ccfcaa133f18108a4e2f029391dff8b924352fd2659eb0ebb7925ca78841819dce7c48fbbfceda5555606f274c2c7f6f93842551458
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 768 BLAKE2B d75705caf4a4cb9c4b9566b477d7b5c931a474a4774b3e52683a58e1623dcc24b4ecb7595ca72847f98d61c830f872661a02474f6e5b0d7683c25de99fcb258a SHA512 c164cb3178e74ab186ba0b0b7989b138ae9c6cff22ae0d331a2c8a19a36ed364c7e2b8d43d5b338b82e82178722111ee3c22fe5ef77c2889d271bfb65c3eb204
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild
deleted file mode 100644
index 46e6974c8ee0..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0:= )
-	!<gnome-base/gdm-3.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index b52eb1191ee4..06acddbb33f8 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index a28d844ac2b5..141bfb2556b9 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,11 +1,8 @@
 AUX gvfs-1.30.2-sysmacros.patch 525 BLAKE2B 27337a06b02aea544e98b5726ac5a1ae29c8632150c373ce85f0f601c368e0f1430217ee729de5494e15162a05423c738e0756431a46c87b62ac647615b6273d SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2
-DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823ebffca2e7e73245b3597e085f2fff5c98999e6eccd052fa3564339b75d764f2124592c0977fddd2eb4afeca819b965 SHA512 c3e9de02e013aaf707878f8ffab96c42ac558412020f8462f928d2c7bd8b9756aa980e6b8db50e6f0ff0ad91f250ef1a26358d80b5d1cdaa9234475ec3a3db4f
-DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8
 DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45
 DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
 DIST gvfs-1.34.2.1-patchset.tar.xz 2608 BLAKE2B 1041815fa35e052219df561325bab4a96e9e36c5b3afac70c6bf16f21fe3d72b70edbc59fb9df4b5b266748f6fdeb7358182bffd0eb61572d86c369a57a49bb9 SHA512 1baafda67997265ae5ad0facbdaf1d274fb400fffa3059aad40a9239b20c1362bcaa58e3a751dc575b46c5e71f94e245e625e2b12c2f178acff7d3b0dbf7c3c7
 DIST gvfs-1.34.2.1.tar.xz 1822700 BLAKE2B 2de1e86bf9dfe6567c59c7d1e2032f9e749daef0a1deb27963c0b5122be5925256c02a90dae5371bed9e037137400cca8e3461f415b3bed36de4310757bced62 SHA512 ff8d2ebff220e8432584d13640747d54c78c7350c0b8b9ed8544eb311fb4211897fb8473375b246cc1271df507f5ae2dd4edc6d5fd5d2061792377f3f37ebdb1
-EBUILD gvfs-1.32.1-r1.ebuild 3815 BLAKE2B a1408a9ce388b9d895a979635fa9d11757ab4c587d259112248c3043c9fd29fed18b190ad57646c655e1289e90a1ccd23b4f4ab578ffa3ee273510cfa3c9df92 SHA512 cec870f90d034016cb3e1e8a78de11e1394f5a4c949f0396e630146ec89f179c3cc3e5099e48c6ef8f55c50122420a434211ce3403fc8eba2fd2f8a507387ed0
-EBUILD gvfs-1.32.2.ebuild 3812 BLAKE2B d3831f040722761675605c574efa452fc5ad912ef112cde14b38f8c25bb311090bc3c7e73a9066d7f67ee0a4dd92256fe0e811c43b50b1384f1c0a98087c5733 SHA512 292365f31b00f3805e57addf88f7545d8b6abead6e319e77a582ae29007026497738a40ad993271a760bcfb51dc94a2301cdadd6a6ed5f01c7bbdedffefb6799
+EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
 EBUILD gvfs-1.34.2.1-r1.ebuild 3741 BLAKE2B cdc826af8a3ceffa2e211ae804f31b970c554aace54dcd71ef3eb197ffef40be96c68c0b7624214c6e3007c922d8396f9f8c8d75409b16f7b36081cdd8acfede SHA512 98afd5b53bf08526a43ba561b8bd27e295f4f33247b29a344a0142657a5715d0af29edd55ecccf1912985ab416e34eb837191769de84b3255058e0e1fda22fa7
 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
deleted file mode 100644
index 308671cea698..000000000000
--- a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patches.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	elogind? ( !systemd udisks )
-	google? ( gnome-online-accounts )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( !elogind udisks )
-"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	app-crypt/gcr:=
-	>=dev-libs/glib-2.51:2
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray:= )
-	elogind? ( >=sys-auth/elogind-229:0= )
-	fuse? ( >=sys-fs/fuse-2.8.0:0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
-	google? (
-		>=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts]
-		>=net-libs/gnome-online-accounts-3.17.1:= )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:= )
-	mtp? (
-		>=dev-libs/libusb-1.0.21
-		>=media-libs/libmtp-1.1.12 )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
-	policykit? (
-		sys-auth/polkit
-		sys-libs/libcap )
-	samba? ( >=net-fs/samba-4[client] )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		>=virtual/libgudev-147:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patches/ #599482, 641522, gnome-3-24 backports
-	"${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
-)
-
-src_prepare() {
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--disable-gdu \
-		--enable-documentation \
-		--enable-gcr \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable elogind libelogind) \
-		$(use_enable fuse) \
-		$(use_enable gnome-keyring keyring) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable http) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable mtp libusb) \
-		$(use_enable nfs) \
-		$(use_enable policykit admin) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udev gudev) \
-		$(use_enable udev) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild
index 182f1bb3d768..f723d5916d31 100644
--- a/gnome-base/gvfs/gvfs-1.32.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.2.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( !elogind udisks )
 "
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	app-crypt/gcr:=
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 7b6aba566700..ba49f20fb16a 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,5 +1,3 @@
-DIST libgnomekbd-3.22.0.1.tar.xz 450572 BLAKE2B cc7c0055dfae0c0593d9456e3de27da8cb33d9814151346a4a685a317f7701658392e6a403e942ceb928ebd9c06d0ba3b38c0f7f1abd08976c807d48d0246b58 SHA512 a4d2e6feac18cb7e3a65553dcd587f284c71154d3058866b0b6285b1acca549d33d0bd0014a97f1e153eb5e2a5a16e8b18eb680ce0078edd80bdd68a51ac080e
 DIST libgnomekbd-3.26.0.tar.xz 449204 BLAKE2B 360f6da6ea7ad2850ecba062e0825cadcbc62ab9fdd432ad1fd4f38d32230e9eb6da1b7eb50116302b39be76565da7554df2c96e3a348e5130c428158bfa7792 SHA512 dc3ee91468e570d038bc91c4458ddb49dc097639c671815eecc4308efea85e29c1121cfd959e62f970a2e8112f818296802be804e99b96ee89fd5de8136645d9
-EBUILD libgnomekbd-3.22.0.1.ebuild 769 BLAKE2B 58d9731b2987528629011d281b202e6d4df2c80684790640449661cde1a7c06ce9b2bf3a4c2b6e3bbc4c0db08141259e9ea7de5336c6a5bff38e226253939de5 SHA512 ababe33db7a72c81d17918291107e28a402b82adcff386d593468f67218b96b9017881dca47c733dcc0223ae5d977059787907c356161c2032197458ff30cf96
-EBUILD libgnomekbd-3.26.0.ebuild 792 BLAKE2B 8470cb1c8cc36b6b13887b3a2cd4fbe598c87058d3bd637aed9bf13180ae2b9cd051d6262f5b6d829268ca5548ae8000b7b85377293e4043a8dcf766d16b8f3e SHA512 6040f01d9229c320ec2f870986931ba16b3eff2188b2d4b2eb430bf553198a44e59d8e3f8ab0d19a9f990a9dec0cd2e5cc9ef7d18c2ad59f9dcdc8df83f32733
+EBUILD libgnomekbd-3.26.0.ebuild 787 BLAKE2B 367e2a745e6a8127738df87127a08b9cadf19ddcacf691ebff875d3c1f7ae9fbaa0583158abfc94649d516aaca567350a7094672825b945f5395ab0f293ecd23 SHA512 90b8bd48ecd21b71f88adff154383601cf6a14fdcfafee9a35bcc1e785f733c81b456db6951051be4a07688ef66585642d0df2a3e39e8a25c2aacc2d90f7f0c8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild
deleted file mode 100644
index afe2aff53cac..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="https://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.91.7:3[X,introspection?]
-	>=x11-libs/libxklavier-5.2[introspection?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
index 847b3a6a86d4..9bc10e4ce687 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org"
 
 LICENSE="LGPL-2+"
 SLOT="0/8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index a476c5f4b962..ce85c7150716 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,5 +1,7 @@
-AUX librsvg-2.40.12-gtk-optional.patch 2192 BLAKE2B 6f04fb0a8ad1cef7847eab6b74708343c558b32256b19c70dc6e90ef8894e59b0992d214261dc1fe5ffcb020b5f2f3dd16fb73747e85cc03f0e017b5c5758281 SHA512 d9af98164138c52781117d72b4245ac03b7049f8743cc7f644314ba10d0e74c0f2f08a7c9d163bdef3e07ca3a66ce75089c23af3562ff0afebbae838c901bddb
+AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 AUX librsvg-2.40.2-vala-out-of-source.patch 1066 BLAKE2B 43bb0dfdc90f3fe3084e23ee5d275d92e41a60f7f5c3763180c91232f4543fe93b036ff22a455247b15d09f514bd8a9a4145ac1aec09b444cb9fc5414410c4b9 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f
 DIST librsvg-2.40.18.tar.xz 574384 BLAKE2B 964997ef3bd5f8bdcab43e67f22d12458683c0eeee2fa81e7a6199f6a31c7ac11c599327a6a66118000f63549ea735a042c71429635f6dc9bf073f12eab067b6 SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182
+DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
 EBUILD librsvg-2.40.18.ebuild 2686 BLAKE2B c93c8988aba169199d3c631a9ba394b0cff890f6729bc7f7373d434e4653fec755a4421d70df6406087d2d22b795d2c59f7389e13eac37adc58dc90ddd02387a SHA512 52fe6200b0ea54eb7211fe22f84914bc14791adb29703ae720d8ac843219794674a109a773ddc37ac55d82d7e235cee9d089fc4de5b78924276d210fa691acbe
+EBUILD librsvg-2.40.20.ebuild 2700 BLAKE2B 82446438cf8c997acfa823f00e4a005b54606eaee665795c986ca42373e6a6d6823573782f404bc5a8603bd1e26e8d677bebef2f590d2f88b8894a2549650a5e SHA512 d9bdd2f632592617c61ac14ec6a8b1bb68f33cc5797454e9e9fa94d3f13deae057ed26bc6e7f42b3c9e3f6d61751bbf2ebac3e2bf7ba9c7e0021c00564ce6aaa
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch
index b7c5b85223de..11c5803d69d6 100644
--- a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch
+++ b/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch
@@ -55,4 +55,4 @@ index f7a89dc..1498f72 100644
  	Build miscellaneous tools:      ${build_misc_tools}
  "
 -- 
-1.7.10.4
\ No newline at end of file
+1.7.10.4
diff --git a/gnome-base/librsvg/librsvg-2.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild
new file mode 100644
index 000000000000..e007dc163158
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.20.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils gnome2 multilib-minimal vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection tools vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+	tools? ( >=x11-libs/gtk+-3.10.0:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
+	eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --disable-Bsymbolic )
+	fi
+
+	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
+	# only for librsvg developers
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tools \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with tools gtk3) \
+		$(multilib_native_use_enable vala) \
+		--enable-pixbuf-loader \
+		"${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a64aaa250601..16b1d1f9750d 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,8 @@
-DIST nautilus-3.20.4.tar.xz 3453376 BLAKE2B 47e09f45909f6abd735c976ea6ab0b90c918490193a931b186472d9be1d22f5c7314647ec14e36a88b9f8013f3784f7788b4d9ef136e139e1b1cb41b0167c378 SHA512 01bee5c70067c508ca918948afe0b400680eb68518ae69803e2971a215b0eaf54c9251566c6c44835a1c0b9b20248450539a47936c6aba5c9accc9ef3cbe8a8e
+AUX 3.26.4-file-view-crash-fix.patch 3031 BLAKE2B 83214c9c55d3e3d135c3c038bfe432ff353a512a94a880ee9d449133b0423414fc9a7f22b3e1f14633789439d0e666ab6983363209279fda379530d3e1003de7 SHA512 85f696485f0f2b8171bcaeee6a19fbf1b9cb507f9ec8a69c7b08614fa98514fad7f3cb1857750d2d2300ca42b017434720d85918daaf37e3cbae496b65924aba
+AUX 3.26.4-optional-introspection.patch 1860 BLAKE2B c2792432024dce322b1fb6fe3411f8ae8e86b000ba31885c94570620bffc8c39bf1e51be649d2a24469a1ae57c6507ec63efe0645e506483b81b76ff7b40148a SHA512 9ee5736e9d999c1cf8f103eaffd2f6395336d23187e59d08ce7d949ee277cdaa297aef9f071d4af22c1adb2f9daed9c7920d5ccc87681df9b0ad84dcec624814
+AUX 3.26.4-optional-tracker.patch 8897 BLAKE2B 7bedd3d4837d6289cfb204f14245d3a92aabe99a8a7e6fe8fa09a02e25214865f71a594d26f5cceaab375d55658902bd498caa1eafe4aee27f39222f06bb7da5 SHA512 169217ba039a23a98ac16f59ad04a9a135b3af399f668bc413df740de02827a3120c49c67f1e8964a5587bb233030995c63b2bf61003c5972e7a83b2bd61a25c
 DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
-EBUILD nautilus-3.20.4.ebuild 2837 BLAKE2B be19399d97989e79c7775240065d1e88946a57022cc9abc9d6bb3bfbf78e2e8bb06b53b62154e63360662bce1a1daeb1a0b2803092c7236027f15bad04906659 SHA512 cddbe0f26a60fa4b4aa152571a3d1ede0267ef622ac904bc68e3b098e17f439e763c714dede348b9df9177dd499f7c51f55ea6945b26ee93d8fd1fdaeaff604a
-EBUILD nautilus-3.24.2.1-r1.ebuild 2871 BLAKE2B da6c167deb2ebedcdf46d0740c4a71e1283adfa7a289126fc616919d8a5cb98345655e5e8d281ecdc8b2bdfaa11b95bf95432678bb9163d33c7a3fd026d34a55 SHA512 9bd6e66823e83c6c79f025709d23381a4eb2181e94fb5a799f075ac04022bbad24377e6eb149414934461831c530555942f24dd4361c0ae7703f07e629c8401d
+DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
+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
 MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668
diff --git a/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch b/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch
new file mode 100644
index 000000000000..72077f4a9fa4
--- /dev/null
+++ b/gnome-base/nautilus/files/3.26.4-file-view-crash-fix.patch
@@ -0,0 +1,81 @@
+From 834c4e7fe39f7053efdb126f9e1835e6b8e529f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Thu, 26 Jul 2018 02:55:19 +0000
+Subject: [PATCH 1/3] file-view: Always unset pending_selection after freeing
+ it
+
+When a file view was loaded with a pending selection, and not all the files were
+seen yet, the private pending_selection list was properly free'd, but the pointer
+was not cleared, causing a crash when `nautilus_files_view_set_selection` was
+called again, as it was trying to deeply copy a list pointed by this invalid
+reference.
+
+So, removing the unneeded `pending_selection` temporary pointer from the main
+function scope, as it only confuses, while use it (with an autolist) when we
+need to pass the previous `priv->pending_selection` (stealing its ownership)
+to set_selection again.
+
+Eventually use a g_clear_pointer to free the list and nullify its priv reference
+
+Fixes #295
+
+(cherry picked from commit ae3382a281b018337a8032ef13663ec2d9c7fd6c)
+---
+ src/nautilus-files-view.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
+index 8784f63f8..36d791f80 100644
+--- a/src/nautilus-files-view.c
++++ b/src/nautilus-files-view.c
+@@ -3556,7 +3556,6 @@ done_loading (NautilusFilesView *view,
+               gboolean           all_files_seen)
+ {
+     NautilusFilesViewPrivate *priv;
+-    GList *pending_selection;
+     GList *selection;
+     gboolean do_reveal = FALSE;
+ 
+@@ -3577,21 +3576,23 @@ done_loading (NautilusFilesView *view,
+         nautilus_files_view_update_toolbar_menus (view);
+         reset_update_interval (view);
+ 
+-        pending_selection = priv->pending_selection;
+         selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
+ 
+         if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) &&
+-            all_files_seen && !selection && !pending_selection)
++            all_files_seen && selection == NULL && priv->pending_selection == NULL)
+         {
+             nautilus_files_view_select_first (view);
+             do_reveal = TRUE;
+         }
+-        else if (pending_selection != NULL && all_files_seen)
++        else if (priv->pending_selection != NULL && all_files_seen)
+         {
+-            priv->pending_selection = NULL;
++            GList *pending_selection;
++            pending_selection = g_steal_pointer (&priv->pending_selection);
+ 
+             nautilus_files_view_call_set_selection (view, pending_selection);
+             do_reveal = TRUE;
++
++            nautilus_file_list_free (pending_selection);
+         }
+ 
+         if (selection)
+@@ -3599,10 +3600,7 @@ done_loading (NautilusFilesView *view,
+             g_list_free_full (selection, g_object_unref);
+         }
+ 
+-        if (pending_selection)
+-        {
+-            g_list_free_full (pending_selection, g_object_unref);
+-        }
++        g_clear_pointer (&priv->pending_selection, nautilus_file_list_free);
+ 
+         if (do_reveal)
+         {
+-- 
+2.17.0
+
diff --git a/gnome-base/nautilus/files/3.26.4-optional-introspection.patch b/gnome-base/nautilus/files/3.26.4-optional-introspection.patch
new file mode 100644
index 000000000000..54bf5ac95fe4
--- /dev/null
+++ b/gnome-base/nautilus/files/3.26.4-optional-introspection.patch
@@ -0,0 +1,49 @@
+From 5058b09996181fbd398c799eeba6a1d83b083186 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 11 Dec 2018 16:14:11 +0200
+Subject: [PATCH 3/3] Make introspection support optional
+
+Upstream has it optional again with commit 200a5869b5c1dc8 as well,
+but that's included only since nautilus-3.29.90
+---
+ libnautilus-extension/meson.build | 2 ++
+ meson_options.txt                 | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/libnautilus-extension/meson.build b/libnautilus-extension/meson.build
+index 067ad2414..4702964a9 100644
+--- a/libnautilus-extension/meson.build
++++ b/libnautilus-extension/meson.build
+@@ -41,12 +41,14 @@ libnautilus_extension = shared_library ('nautilus-extension',
+                                         version: nautilus_extension_version,
+                                         install: true)
+ 
++if get_option('introspection')
+ gnome.generate_gir (libnautilus_extension,
+                     sources: libnautilus_extension_headers + libnautilus_extension_sources,
+                     nsversion: '3.0',
+                     namespace: 'Nautilus',
+                     includes: ['Gtk-3.0', 'Gio-2.0', 'GLib-2.0'],
+                     install: true)
++endif
+ 
+ nautilus_extension = declare_dependency (link_with: libnautilus_extension,
+                                          dependencies: libnautilus_extension_deps,
+diff --git a/meson_options.txt b/meson_options.txt
+index 0c23c7921..6ad3a72de 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,10 @@
+ option ('enable-profiling',
+         type: 'boolean',
+         value: false)
++option ('introspection',
++        type: 'boolean',
++        value: true,
++        description: 'Build GObject introspection data for extension library')
+ option ('enable-nst-extension',
+         type: 'boolean',
+         value: true)
+-- 
+2.17.0
+
diff --git a/gnome-base/nautilus/files/3.26.4-optional-tracker.patch b/gnome-base/nautilus/files/3.26.4-optional-tracker.patch
new file mode 100644
index 000000000000..037919967708
--- /dev/null
+++ b/gnome-base/nautilus/files/3.26.4-optional-tracker.patch
@@ -0,0 +1,264 @@
+From 74a7d02eb342416194dcc3c676199d8f5266a481 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 27 May 2018 13:54:38 +0200
+Subject: [PATCH 2/3] Make tracker support optional
+
+---
+ config.h.meson                      |  1 +
+ meson.build                         |  9 ++++++---
+ meson_options.txt                   |  4 ++++
+ src/meson.build                     | 19 ++++++++++++-------
+ src/nautilus-file-undo-operations.c |  4 ++++
+ src/nautilus-file.c                 |  2 ++
+ src/nautilus-files-view.c           |  4 ++++
+ src/nautilus-search-engine.c        | 14 ++++++++++++++
+ 8 files changed, 47 insertions(+), 10 deletions(-)
+
+diff --git a/config.h.meson b/config.h.meson
+index 4f5cb5848..58d71e96f 100644
+--- a/config.h.meson
++++ b/config.h.meson
+@@ -4,6 +4,7 @@
+ #mesondefine HAVE_EXEMPI
+ #mesondefine HAVE_EXIF
+ #mesondefine HAVE_SELINUX
++#mesondefine HAVE_TRACKER
+ #mesondefine ENABLE_DESKTOP
+ #mesondefine ENABLE_PACKAGEKIT
+ #mesondefine LOCALEDIR
+diff --git a/meson.build b/meson.build
+index 0b8a6f1b0..559c3dbfd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -81,9 +81,12 @@ if get_option ('enable-selinux')
+     conf.set10 ('HAVE_SELINUX', true)
+ endif
+ 
+-tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
+-if not tracker_sparql.found()
+-    tracker_sparql = dependency ('tracker-sparql-1.0')
++if get_option ('tracker')
++    tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
++    if not tracker_sparql.found()
++        tracker_sparql = dependency ('tracker-sparql-1.0')
++    endif
++    conf.set10 ('HAVE_TRACKER', true)
+ endif
+ 
+ if get_option ('enable-xmp')
+diff --git a/meson_options.txt b/meson_options.txt
+index c934dd8b1..0c23c7921 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,6 +8,10 @@ option ('enable-exif',
+         type: 'boolean',
+         value: false,
+         description: 'enable EXIF support')
++option ('tracker',
++        type: 'boolean',
++        value: true,
++        description: 'enable bulk renames and search using Tracker')
+ option ('enable-xmp',
+         type: 'boolean',
+         value: false,
+diff --git a/src/meson.build b/src/meson.build
+index cc08345d8..8ea10b16b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -254,12 +254,6 @@ libnautilus_sources = [
+     'nautilus-file-undo-operations.h',
+     'nautilus-file-undo-manager.c',
+     'nautilus-file-undo-manager.h',
+-    'nautilus-batch-rename-dialog.c',
+-    'nautilus-batch-rename-dialog.h',
+-    'nautilus-batch-rename-utilities.c',
+-    'nautilus-batch-rename-utilities.h',
+-    'nautilus-search-engine-tracker.c',
+-    'nautilus-search-engine-tracker.h'
+ ]
+ 
+ nautilus_deps = [glib,
+@@ -274,7 +268,6 @@ nautilus_deps = [glib,
+                  nautilus_extension,
+                  x11,
+                  gmodule_no_export,
+-                 tracker_sparql,
+                  gio_unix]
+ 
+ if get_option ('enable-exif')
+@@ -289,6 +282,18 @@ if get_option ('enable-xmp')
+     nautilus_deps += exempi
+ endif
+ 
++if get_option ('tracker')
++    libnautilus_sources += [
++        'nautilus-batch-rename-dialog.c',
++        'nautilus-batch-rename-dialog.h',
++        'nautilus-batch-rename-utilities.c',
++        'nautilus-batch-rename-utilities.h',
++        'nautilus-search-engine-tracker.c',
++        'nautilus-search-engine-tracker.h'
++    ]
++    nautilus_deps += tracker_sparql
++endif
++
+ libnautilus = static_library ('nautilus',
+                               libnautilus_sources,
+                               dependencies: nautilus_deps,
+diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
+index e833d0578..d6e407ca5 100644
+--- a/src/nautilus-file-undo-operations.c
++++ b/src/nautilus-file-undo-operations.c
+@@ -31,8 +31,10 @@
+ #include "nautilus-file-operations.h"
+ #include "nautilus-file.h"
+ #include "nautilus-file-undo-manager.h"
++#ifdef HAVE_TRACKER
+ #include "nautilus-batch-rename-dialog.h"
+ #include "nautilus-batch-rename-utilities.h"
++#endif
+ 
+ 
+ /* Since we use g_get_current_time for setting "orig_trash_time" in the undo
+@@ -1087,6 +1089,7 @@ nautilus_file_undo_info_rename_set_data_post (NautilusFileUndoInfoRename *self,
+ }
+ 
+ /* batch rename */
++#ifdef HAVE_TRACKER
+ G_DEFINE_TYPE (NautilusFileUndoInfoBatchRename, nautilus_file_undo_info_batch_rename, NAUTILUS_TYPE_FILE_UNDO_INFO);
+ 
+ struct _NautilusFileUndoInfoBatchRenameDetails
+@@ -1303,6 +1306,7 @@ nautilus_file_undo_info_batch_rename_set_data_post (NautilusFileUndoInfoBatchRen
+ 
+     self->priv->new_display_names = g_list_reverse (self->priv->new_display_names);
+ }
++#endif
+ 
+ /* trash */
+ G_DEFINE_TYPE (NautilusFileUndoInfoTrash, nautilus_file_undo_info_trash, NAUTILUS_TYPE_FILE_UNDO_INFO)
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index 0ac53984b..549e1eb39 100644
+--- a/src/nautilus-file.c
++++ b/src/nautilus-file.c
+@@ -2407,6 +2407,7 @@ real_batch_rename (GList                         *files,
+         }
+     }
+ 
++#ifdef HAVE_TRACKER
+     /* Tell the undo manager a batch rename is taking place if at least
+      * a file has been renamed*/
+     if (!nautilus_file_undo_manager_is_operating () && op->skipped_files != g_list_length (files))
+@@ -2421,6 +2422,7 @@ real_batch_rename (GList                         *files,
+ 
+         nautilus_file_undo_manager_set_action (op->undo_info);
+     }
++#endif
+ 
+     if (op->skipped_files == g_list_length (files))
+     {
+diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
+index 36d791f80..691d5606d 100644
+--- a/src/nautilus-files-view.c
++++ b/src/nautilus-files-view.c
+@@ -28,8 +28,10 @@
+ #include "nautilus-files-view.h"
+ 
+ #include "nautilus-application.h"
++#ifdef HAVE_TRACKER
+ #include "nautilus-batch-rename-dialog.h"
+ #include "nautilus-batch-rename-utilities.h"
++#endif
+ #include "nautilus-error-reporting.h"
+ #include "nautilus-file-undo-manager.h"
+ #include "nautilus-floating-bar.h"
+@@ -6264,6 +6266,7 @@ real_action_rename (NautilusFilesView *view)
+             {
+                 invoke_external_bulk_rename_utility (view, selection);
+             }
++#ifdef HAVE_TRACKER
+             else
+             {
+                 GdkCursor *cursor;
+@@ -6281,6 +6284,7 @@ real_action_rename (NautilusFilesView *view)
+ 
+                 gtk_widget_show (GTK_WIDGET (dialog));
+             }
++#endif
+         }
+         else
+         {
+diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
+index 209bd4f80..436cd7471 100644
+--- a/src/nautilus-search-engine.c
++++ b/src/nautilus-search-engine.c
+@@ -28,11 +28,15 @@
+ #include "nautilus-search-engine-model.h"
+ #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+ #include "nautilus-debug.h"
++#ifdef HAVE_TRACKER
+ #include "nautilus-search-engine-tracker.h"
++#endif
+ 
+ typedef struct
+ {
++#ifdef HAVE_TRACKER
+     NautilusSearchEngineTracker *tracker;
++#endif
+     NautilusSearchEngineSimple *simple;
+     NautilusSearchEngineModel *model;
+ 
+@@ -73,7 +77,9 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider,
+     engine = NAUTILUS_SEARCH_ENGINE (provider);
+     priv = nautilus_search_engine_get_instance_private (engine);
+ 
++#ifdef HAVE_TRACKER
+     nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->tracker), query);
++#endif
+     nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->model), query);
+     nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->simple), query);
+ }
+@@ -95,8 +101,10 @@ search_engine_start_real (NautilusSearchEngine *engine)
+ 
+     g_object_ref (engine);
+ 
++#ifdef HAVE_TRACKER
+     nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
+     priv->providers_running++;
++#endif
+ 
+     if (nautilus_search_engine_model_get_model (priv->model))
+     {
+@@ -158,7 +166,9 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider)
+ 
+     DEBUG ("Search engine stop");
+ 
++#ifdef HAVE_TRACKER
+     nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
++#endif
+     nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->model));
+     nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->simple));
+ 
+@@ -333,7 +343,9 @@ nautilus_search_engine_finalize (GObject *object)
+ 
+     g_hash_table_destroy (priv->uris);
+ 
++#ifdef HAVE_TRACKER
+     g_clear_object (&priv->tracker);
++#endif
+     g_clear_object (&priv->model);
+     g_clear_object (&priv->simple);
+ 
+@@ -387,8 +399,10 @@ nautilus_search_engine_init (NautilusSearchEngine *engine)
+     priv = nautilus_search_engine_get_instance_private (engine);
+     priv->uris = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ 
++#ifdef HAVE_TRACKER
+     priv->tracker = nautilus_search_engine_tracker_new ();
+     connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->tracker));
++#endif
+ 
+     priv->model = nautilus_search_engine_model_new ();
+     connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->model));
+-- 
+2.17.0
+
diff --git a/gnome-base/nautilus/nautilus-3.20.4.ebuild b/gnome-base/nautilus/nautilus-3.20.4.ebuild
deleted file mode 100644
index f4706dbc6097..000000000000
--- a/gnome-base/nautilus/nautilus-3.20.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~ia64 ~ppc ~ppc64 ~sh ~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="
-	>=dev-libs/glib-2.45.7:2[dbus]
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.19.12: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.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	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 )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	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 \
-		--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.24.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1-r1.ebuild
deleted file mode 100644
index 1f0975815f92..000000000000
--- a/gnome-base/nautilus/nautilus-3.24.2.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-1:= )
-	xmp? ( >=media-libs/exempi-2.1.0:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=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 )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	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.24.2.1-r2.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
new file mode 100644
index 000000000000..ae97ee6cbaac
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
@@ -0,0 +1,111 @@
+# 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
new file mode 100644
index 000000000000..aef38545ec00
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+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"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.51.2:2
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.22.6:3[X,introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	exif? ( >=media-libs/libexif-0.6.20 )
+	xmp? ( >=media-libs/exempi-2.1.0:2 )
+	>=gnome-base/gsettings-desktop-schemas-3.8.0
+	>=app-arch/gnome-autoar-0.2.1
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	x11-libs/libX11
+	tracker? ( >=app-misc/tracker-1:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gdbus-codegen-2.51.2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+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; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-file-view-crash-fix.patch
+	"${FILESDIR}"/${PV}-optional-tracker.patch
+	"${FILESDIR}"/${PV}-optional-introspection.patch
+)
+
+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
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-profiling=false
+		$(meson_use introspection)
+		$(meson_use sendto enable-nst-extension)
+		$(meson_use exif enable-exif)
+		$(meson_use tracker)
+		$(meson_use xmp enable-xmp)
+		$(meson_use selinux enable-selinux)
+		-Denable-desktop=true
+		$(meson_use packagekit enable-packagekit)
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
-- 
cgit v1.2.3