gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /gnome-extra
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
79 files changed, 1806 insertions, 603 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 4f9b645cc9f7..370c0961c660 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index 8d4490cf04ae..e12a98a4b511 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,10 +1,3 @@
-AUX chrome-gnome-shell-8-enabled-extensions-array.patch 1231 BLAKE2B 78150fd5c0aa3591d14d8856e2946f41cf91bc61bbcf6fe2e1f8427c33a45daa9f01224ecd197ae9f98f4acb9050039bf86e3d062377abbd1cb7c9ab237af959 SHA512 1c7423fcea6b258ae55fdc83658dab547b199b2b69e4f0fa54dc6b922718a23ebe6cf506a279eeff6c7c3a42bcc662e218bf5d4be9825c3558150495dc8a3bcf
-AUX chrome-gnome-shell-8-get_dbus_connection.patch 2851 BLAKE2B 7ab0caf998f58f3b8d5c03634f35d6a771fd2bcb42af68d6a459662449e5743e71e2243e2dfa929be9c5bff0183716c518beba75b6d37ac12b9b892ecb521684 SHA512 555674bf8b4077f466657ae101da344c17fbc8062012ab341943b48d3260fa83b9a0a3d7c7fdd11dd93e856cbbce5aaf6f7561b9d6457081cec3398d79ecbfc8
-AUX chrome-gnome-shell-8-metadata-version.patch 1155 BLAKE2B be54db5312bff9f23a672068c71689ad2509ab67089a0dcc6558e37ea86b85ba31a67c7070b8e0b581fa884c1fe0adec50a63ab3776ab8bcec557a7626c59641 SHA512 2d38dfd0fe30829053a7f3bcbee8a2afa6cda2cfe1b52d664338b95081b49d9974a5a976a75ebad7401c5dbeb4e76d0920e260e20f722c7af0f9f83b9bd224e8
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-DIST chrome-gnome-shell-8.tar.xz 143224 BLAKE2B 9dcb94f7dcc263c6cc332c476bd652b0ea62443ffb154f67ba869ddc970e892a28ef96be13732d49dfbf5c3db9c4c8fed18918359f240e6b1b6218fa3a2bd462 SHA512 61acd4b0564892667bd1468430ddfff4c0cfbe92b573d8b7e4c5448c25266bd0ee6e89e9bebe08553de4f9661ceeea46f5af38d980051491c40ed7deb24e3277
-DIST chrome-gnome-shell-9.tar.xz 151984 BLAKE2B 884906a308d864893664f499172c130b6ab7cc3ae7a5746f7430f3d779f43320de723c9757fc4c8a9328704b2b5c40c8a829d74280ac78d4f09e000f593c3805 SHA512 b9b5f913a74bdfa641ce35c62f15aa1ceff37e6e0fef43c127ff8ba31933ba2d9c93ee50809b013336ec63ae1020d4e1cacd56d9a86204e1ba4c0bd1d8ed50cf
-EBUILD chrome-gnome-shell-10.ebuild 1036 BLAKE2B 44910ab3d3f02d93a5c31cb168c60296eafad69842f31650c4bd9401bafe112c0b5e276281b4895b8d5141e5f59359999d107652a74d21020f663710ff018f94 SHA512 406653ec832ff9f51326ceb35ff73d62050598a0999df2872716ee33cb29d01f7d9bad6b8f2c7f4c151268802f8d5888dd91ebbf333cce17d637906c43b675e7
-EBUILD chrome-gnome-shell-8-r1.ebuild 2135 BLAKE2B 2f74d0cce221510f4724d90e23908c67eedd894740bc459ae65cb931091149f49012c0371a2d230dc115660b62369e4d050e66b04d42c6cb230e9be4b42dd6f3 SHA512 a53ddffc9b2a923fcbd3854963d1906166d43db8c5e6df026c006a6a898399d5cb8357df0ec2774e1572096d79fd79998ceeacd5b0d6d0b7adcbc8a00f81d2bf
-EBUILD chrome-gnome-shell-9.ebuild 1868 BLAKE2B 1406711b618d76f8d59957a58575298eed99311788288b7c6fa982d0726698063f388e834e742e477150208fc5b72b7777c6c4cd0e02032181c6c0ff4f0736b5 SHA512 84cbb17759a69935ddadf9386dfc649fa9b00bd6574ec5a346cfe5ead80a94fbda18d0de49b1ecc602c1e12526ff31d53494fa56280a88d36ec74ea7629b2bff
+EBUILD chrome-gnome-shell-10.ebuild 1038 BLAKE2B 00dc41dc18f0d750f82656d0f48c039974ed7484a2d518f4eb5d523400a28de45f26d71fbd92a303e141b308e66e3ea1a3ee3b46230ec14506b97be11fe79162 SHA512 5087fe9300593d578d1c32f3af8558875bd08d3f07132827da0527b51ae1fcc624e46b925952c68973eac6d37408618457d78471a829a1e3741fca50bafcc323
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
index 3f8d388c2963..2389b912cc20 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
deleted file mode 100644
index 0ddf6116f70a..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-shell
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-enabled-extensions-array.patch
-	"${FILESDIR}/${P}"-metadata-version.patch
-	"${FILESDIR}/${P}"-get_dbus_connection.patch
-)
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Chrome policy files should be removed with package.
-	# Otherwise it will not be possible to uninstall web extension
-	# from browser.
-	echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
-	echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
-	echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
-	doenvd 50"${PN}"
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "If you are installing ${PN} for the first time then you should"
-	elog "restart or reload dbus service before starting your browser."
-	elog
-	elog "Please note that this package provides native messaging connector only."
-	elog
-	elog "Managed policy was installed to force web extension installation"
-	elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
-	elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
-	elog
-	elog "For Mozilla Firefox you should manualy install web extension from"
-	elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
-	elog
-	elog "For Opera you should manualy install web extension from"
-	elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
deleted file mode 100644
index 599855c9cf5c..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-shell
-"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Chrome policy files should be removed with package.
-	# Otherwise it will not be possible to uninstall web extension
-	# from browser.
-	echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
-	echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
-	echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
-	doenvd 50"${PN}"
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "Please note that this package provides native messaging connector only."
-	elog
-	elog "Managed policy was installed to force browser extension installation"
-	elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
-	elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
-	elog
-	elog "For Mozilla Firefox you should manualy install browser extension from"
-	elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
-	elog
-	elog "For Opera you should manualy install browser extension from"
-	elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
deleted file mode 100644
index 7a56ca0256be..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1de3c56c636adfdb74970bf9d7a5424af3830d92 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 19:43:30 +0400
-Subject: [PATCH 3/6] connector: assume that "enabled-extensions" array can
- contains duplicates
-
-See-Also: https://bugzilla.gnome.org/show_bug.cgi?id=777650
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/26
----
- connector/chrome-gnome-shell.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 719a347..0b92d83 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -424,9 +424,10 @@ class ChromeGNOMEShell(Gio.Application):
-                     continue
- 
-                 if extension['enable']:
--                    uuids.append(extension['uuid'])
-+                    if not extension['uuid'] in uuids:
-+                        uuids.append(extension['uuid'])
-                 elif extension['uuid'] in uuids:
--                    uuids.remove(extension['uuid'])
-+                    uuids = [value for value in uuids if value != extension['uuid']]
- 
-             settings.set_strv(ENABLED_EXTENSIONS_KEY, uuids)
- 
--- 
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
deleted file mode 100644
index be5f6c4e51d0..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Tue, 24 Jan 2017 19:42:19 +0400
-Subject: [PATCH 6/6] connector: do not use get_dbus_connection after
- GApplication was released.
-
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
----
- connector/chrome-gnome-shell.py | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 0f6e5f1..ac6740a 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -106,21 +106,26 @@ class ChromeGNOMEShell(Gio.Application):
-             self.hold()
- 
-     # Is there any way to hook this to shutdown?
--    def cleanup(self):
--        debug('Cleanup')
-+    def clean_release(self):
-+        debug('Release')
- 
-         if self.shellAppearedId:
-             Gio.bus_unwatch_name(self.shellAppearedId)
- 
-         if self.shellSignalId:
--            self.get_dbus_connection().signal_unsubscribe(self.shellSignalId)
-+            dbus_connection = self.get_dbus_connection()
-+
-+            if dbus_connection is not None:
-+                dbus_connection.signal_unsubscribe(self.shellSignalId)
-+
-+        self.release()
- 
-     def default_exception_hook(self, exception_type, value, tb):
-         log_error("Uncaught exception of type %s occured" % exception_type)
-         traceback.print_tb(tb)
-         log_error("Exception: %s" % value)
- 
--        self.release()
-+        self.clean_release()
- 
-     def add_simple_action(self, name, callback, parameter_type):
-         action = Gio.SimpleAction.new(
-@@ -191,7 +196,7 @@ class ChromeGNOMEShell(Gio.Application):
-     # noinspection PyUnusedLocal
-     def on_service_timeout(self, data):
-         debug('On service timeout')
--        self.release()
-+        self.clean_release()
- 
-         return False
- 
-@@ -203,7 +208,7 @@ class ChromeGNOMEShell(Gio.Application):
- 
-         if len(text_length_bytes) == 0:
-             debug('Release condition: %s' % str(condition))
--            self.release()
-+            self.clean_release()
-             return
- 
-         # Unpack message length as 4 byte integer.
-@@ -255,14 +260,14 @@ class ChromeGNOMEShell(Gio.Application):
-     # noinspection PyUnusedLocal
-     def on_hup(self, source, condition, data):
-         debug('On hup: %s' % str(condition))
--        self.release()
-+        self.clean_release()
- 
-         return False
- 
-     # noinspection PyUnusedLocal
-     def on_sigint(self, data):
-         debug('On sigint')
--        self.release()
-+        self.clean_release()
- 
-         return False
- 
-@@ -545,6 +550,5 @@ if __name__ == '__main__':
-     app = ChromeGNOMEShell('--gapplication-service' in sys.argv)
- 
-     app.run(sys.argv)
--    app.cleanup()
- 
-     debug('Quit')
--- 
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
deleted file mode 100644
index 238d1fcd1df6..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 48ded6911e60fb8415190b252ca420b994e6c525 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 22:29:12 +0400
-Subject: [PATCH 4/6] connector: assume version 1 for extensions without
- version in metadata
-
-Bug: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
-See-Also: https://git.gnome.org/browse/extensions-web/commit/?id=214f03ee90f0f391d3d4fdec23feedf45e3d0507
----
- connector/chrome-gnome-shell.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 0b92d83..0f6e5f1 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -506,7 +506,7 @@ class ChromeGNOMEShell(Gio.Application):
-                         http_request['installed'][uuid] = {
-                             'version': int(extensions[uuid]['version'])
-                         }
--                    except ValueError:
-+                    except (ValueError, KeyError):
-                         http_request['installed'][uuid] = {
-                             'version': 1
-                         }
--- 
-2.10.2
-
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 4df58f149519..de9abd927659 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,7 @@
 DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
 DIST cinnamon-control-center-3.8.0.tar.gz 3870700 BLAKE2B 7d75b7697f72e6d1c9af944a6bb0b0b3cd4d6ae387aab744ddd75f5fc122aa9a770d405cc20c00f46802e6bb5dcb40b384b5a75630f9d5a4f3a4b456e31ef279 SHA512 76f85a3d17fb91d5f0d14c784b4a3c5798e9cc74f22990737684808d1e43c6c8cd6e42ca5dcadb4788dc365f7c06dcc945aa13be2a9ecd1c6cbc8ddac550f5e1
+DIST cinnamon-control-center-4.0.0.tar.gz 3872314 BLAKE2B 85a49a6713347741a4f1bef8bdd339645abfbccbe9621de8621b5898586d93d399312794be42834f3338fd70c7408f5d5f314ce03ef332fc0db19e053be70a69 SHA512 4ec0dab3dfe36a1730577abf1ecddfc96194364a1dfaf9cb939686b1621b96d6cefc60b204dd000b7ab017237c32b138cbe15644da5dea4a2406c2bf1a686638
 EBUILD cinnamon-control-center-3.6.5.ebuild 2466 BLAKE2B 7a3bb2afeb1618e7d020c4d5320baf222ddbac924b4fcf3f0ccebf10072e9ccc990a0781a7a20d3feb6017c9e7370b8b62c33d36ba71612f1ed5d2f2c71e877a SHA512 9f3b7c43c256d1565904eef0262e276f53b9e2d272e6546f54645e0852a1432f32e1ee51019df243d21c234ea6845d0d2f232ba56d676a3549679c02733afa52
 EBUILD cinnamon-control-center-3.8.0.ebuild 2468 BLAKE2B e8472023968e0e4c55876058da7805e50fd86cc651a3505ec3b9ffcb52bf29e6aad70245c806eee5ecff8008611879a583c911cc731a7bdc860e05ec4f972de2 SHA512 e42d45c9ac71a35737f8989012c28ea5324bb1b3e20b9fe175fc6b7a19c3482209a168db45993a193941292fe5bc09e02b2991bf09531652a178fd889210d20d
+EBUILD cinnamon-control-center-4.0.0.ebuild 2465 BLAKE2B 69011fe3456ddbcd4faecce5881ea07ad19fc10efc370322822af3933a6f2dc14659e10ca8ce89d94ecfabb6d82d0d3ddba967495ea3c41b69d82b0decff7a7c SHA512 c95310fbb092e069c05a891a3d884423e9a0d5214124904dbf1eb3e3061f2241ff9480cd1083af98a8893758213adaa41f0d972aa0b7e2f609844606b699af21
 MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.0.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.0.0.ebuild
new file mode 100644
index 000000000000..d5007242a7d6
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom systemd"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8:=[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd sys-auth/elogind )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-base/xorg-proto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+	sys-devel/autoconf-archive
+"
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--disable-onlineaccounts \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable systemd)
+}
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index f2828f13e308..0ccdc53fd1a1 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,6 +1,8 @@
 AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f86be4d00b9c3504ba20348a0382a644b313f30ce4c32e833cbcd690a3dd3d1870851a1b17d3174c7ffe9c6f154e456720c4d6d01a0b71382 SHA512 b8d72287707a1caad2dfe90a220973ea70b0c523ac14b79b21c11c87ca9a8e844698e9a33ec6f27f0dcd9c8e88d2117aab8b0064688917d7e1acbdc368e85f2e
 DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
 DIST cinnamon-desktop-3.8.1.tar.gz 489295 BLAKE2B cc2216040387ff573d4cfc740e7e400862c8fc1361f38b2771ac94c490a8710e487ae1d33ab1a7ed98423c94e77bba32db6cbc563e9152c67b011459f91ad123 SHA512 d4b5e6d848a4cb01e811410da8b07d2a400f6632abba9cc0ed74e5321ba3fafd1ec9ac90307eb56ba7047dbfabbad9526e1348533c6207c9a7756c24751da933
+DIST cinnamon-desktop-4.0.1.tar.gz 489598 BLAKE2B 3d223faf0d9381bc5bcd4be131f9dbe1bea0f6ec57cc5413e24fac8a1855737ba55f55faff36436c8b8d6266be264d96ce51ec1bd8c1406f5737c9b3ee41c0a9 SHA512 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
 EBUILD cinnamon-desktop-3.6.2.ebuild 1684 BLAKE2B a663d72bb18781e3e6ee22212d29bef6a49bde9fe434a78d5ceadc723cb975f48b04c1021f1390e6d676833ca9880091de4059ceb306778d3917e4dbe4d3d62f SHA512 1254cfe83cd36533bd8a398ea47b9bdeb95822768ada0e477fb1b810dc0b1ec73eef6fa0ff6b6aeb0b31f2c22f35ac82b8b4a7f8edcba6b56bd158c894b82e62
 EBUILD cinnamon-desktop-3.8.1.ebuild 1575 BLAKE2B 6e0d44dfbd5f3ba48cb9000e52af2dc57d02bb90a7dcdaa47be688a2798e56f30ffdd415d8ffb0ba1382be8197e384122ba0a19d15656db3deec786210e67560 SHA512 1830124b212ce6da7e8610412e83a39bead49d6773a41a52e2c4c412602aa3fca0d091fc2cae0133555780534120de09772aba620485eea1a7579688885d0539
+EBUILD cinnamon-desktop-4.0.1.ebuild 1572 BLAKE2B a668696170590a3d5cc057c81fee40884ce02db7089be6442d3bb63f750c730d27c54bece4394e1a36dc55ca17598c7e7e873a5e14443717f9abd5e8528cc021 SHA512 9e96c90723df0d72e7ac9f6d03d5e37bd49a4850a17fc3f6c1b0da880e00367492f3754c78e5e7d78a2909da68835c3e8438004ca91b25470fc8ba37ebf3093c
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
new file mode 100644
index 000000000000..259596fc67c4
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit meson eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	sys-apps/accountsservice
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_configure() {
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 4be035fdbbfb..1cf3a3087ac3 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,7 @@
 DIST cinnamon-menus-3.6.0.tar.gz 180165 BLAKE2B a014c120bc84206914be69fcae0f4ec09b98a281012ed3f6f2f21f46762ea0b5e289c6dbd321fb7889f6172c9e7150673513e4c15dbd2e634c48efcefa816176 SHA512 dc90dbb8633ac77f4c8be7b013e3d6f9ba8f4e830f7e8c09ec7dcb9566a3768171a59cdc90b6cd11ad015b93629cdf6fc8c2397656f74603a517c0fbc97d3b14
 DIST cinnamon-menus-3.8.2.tar.gz 181252 BLAKE2B 9f91d22760d0ee13ce968dc0b553d2bbd8ead94169baf4bc8d4157e23225ec0a9e70d2eff22975aec6c2985517391b5e6293fd630e038061d313098320a8a498 SHA512 ce75e4076fbedffa998654537520dd0efa146ae4419d76921bf7de44a1b16c3431cc819a55436bfa038947d21f83cda37dc56fab5dcb372a90ca8a3850271868
+DIST cinnamon-menus-4.0.0.tar.gz 181311 BLAKE2B 6893e9478220dd2b8d5f9e883bb647fcd529744e4bb858f29ff2332f06abe1581b7abc6f19d78543ded8da7061cdf7095e361df2059e806c821e60847059bfe4 SHA512 8ada5b351d7d7b09dbdb8f3d6650c03e9a78a5ee729a2f557bd2f49180fe9272889a39309751548d4680794c606294f997ea20aea7e6f6229fb7fbde4b038852
 EBUILD cinnamon-menus-3.6.0.ebuild 869 BLAKE2B 605b700314515d29704c6a4d834c4d3a8911fb8d603743215adaec321e33a90995c117ee98e8e547460717295a61996ecf8248b67534e172e356d961a1b4c93c SHA512 fc67e347dc2eb02a2c641fbf137000e49758e6e7ec546f373779b0b18419702addc12e66d0ca39d25bb206b1c5938bab4822a3d9fa79083f24777b5747b6b290
 EBUILD cinnamon-menus-3.8.2.ebuild 871 BLAKE2B 052d9d7d79f0f45c8a40ad9eb8803cef75d2147435ed66b2cf07a19f0feab00f3cc32cf222f7643ea7631051f6fe5c38b48787dd30773694c44da03634d51593 SHA512 657908c263a9caeca19d9f2eb3b94136150355859ae271b1cd524e5596a438d9d0d279de3aa0139f959b6f13d92d3ec4eb9680c41f9ee396d800087904675a42
+EBUILD cinnamon-menus-4.0.0.ebuild 868 BLAKE2B acdc18bae5ba877b97c044f566afff0037fc8879a41148b8d92787bca2833cfb15caf7aee50e5aec20ad07e3955859d46b45613389d55d5233f526ad7f74f0df SHA512 163fa3456743ded8c3f0179dd03c1b315c4d137074e462b5af82a03fd8153448ced1a593675408451b24949139f1dbf777e16b703b8fa480f276f2837f6a4f3f
 MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.0.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.0.0.ebuild
new file mode 100644
index 000000000000..4ce6af5d1df7
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		--disable-static
+}
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 9d847ea55bb2..7636399c0582 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,7 @@
 DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
 DIST cinnamon-screensaver-3.8.0.tar.gz 161238 BLAKE2B 1deb5439c30eed8f16240cdacb20beee3dfeef9529d9efb913f4922b7a53ebf3372f64f80c1afdc9899eb5350b97bccf9a1cb98d703d19afa05e6ce11377531e SHA512 9abed09abfdf193b66c70cd2220d7d7aa056a99b6ffe12e3d80ea8af39d4aef79f0851e83b525850cc56da5944d7b29ceb8c4e15e2bc1e847ce62c13c45d1bdb
+DIST cinnamon-screensaver-4.0.1.tar.gz 156640 BLAKE2B e82354ce36fc325f524e60680c51d46ba7924154e2ff64514687498a7ebbf13d626e5441177d0679c763a4bd3c10a2b7e08ed01470358bc4606be90d37867570 SHA512 c1262d6c1e9575da8007f41f637ab9f7ba33ad5a3a909a7b756cef1f4cb0f323ea4d89fd7498d9589975b9fa6e4715d631413eec7fbcb9c3b46d3a42e02ac7bf
 EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2024 BLAKE2B 80141dcc65f1817703fc4339ed02599d40af68f62f729564ccd64dc41fe498781e3427c9ed7c73b6ad1af8b37661361f00bf01558b6c6a870bb53c310d79a224 SHA512 e5d43f38ab31e210746706197b69d176e522f567ef49df24e6ecc1b9ac74ebbf5fa4a07d5ed72000a2488aa2b25668eec1930e5e14f8c9b6d8185264c89e3abf
 EBUILD cinnamon-screensaver-3.8.0.ebuild 2026 BLAKE2B 585e7a3617ec977a43e0736a7847f23fe825bf03d80d5973236b274c79bcdf3c9993af477b4cfe804566e0901c70cc47689ec5999133211ec60619ee6b523d42 SHA512 1386edb28d75600d99bd6a35d762d6f9eab94a8a3959b22fdaa0b67b283baab4b6666da9cabbde807c3d6fdb42fd6f4add3b4de6ca8b7da3ac5df2b8b65f2daa
+EBUILD cinnamon-screensaver-4.0.1.ebuild 1990 BLAKE2B f5f6c69cb525d3e616345c571a305681302e9d60651c4f8f37b9b6c96ca764518eed2762f168339ac7cfbb67a9d2241a5e9dbc8fce56b3a025ef82968fa81cda SHA512 400573de270b1ea21c0cc5132b35e4cb2d4fcb057d1de7128bf902ec043ac8416481b9b49c9df53448eee4a40646c719dbb079a81458c3e480bb2d6d6ae05308
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
new file mode 100644
index 000000000000..12ab502a50f9
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	!systemd? ( sys-auth/elogind )
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/xapp[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable xinerama)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index d0d69c3a6442..3e50eedbe274 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -5,6 +5,8 @@ AUX cinnamon-session-3.8.0-elogind.patch 712 BLAKE2B dd1ce68b30e849a62dd563c3bd6
 AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e16b2284e0fdd7a89963e1e9275cf635caade162022573e029f3d745bd1511f9a11920304da0a84b54b0bcca211327330d6f244 SHA512 756dc8c0f57187d20c491a27fa130ee56c01c156d8c0881f2a0bac7173dd7f039aea38475fdfba52b8c467ea2258cc0af7ebc7ba2053817df5c9e5f50bcc32f2
 DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
 DIST cinnamon-session-3.8.0.tar.gz 197983 BLAKE2B e0a8b57637668586f941c64df6e610a5df385a6ea67a71e1e666344a73e0095861beb9d958344dfd18988960df1e4380e72257c5f490ab344a4e0de6a749c2d1 SHA512 c737ee77396d38e27d93a5d2cec76d9072038f6a096c6071f450a9a3eb71d83beb1da3ff3320820d7989731281e5a108c330eec333a7fcb66ca7a37f16501c76
+DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B 713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39 SHA512 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
 EBUILD cinnamon-session-3.6.1-r4.ebuild 1540 BLAKE2B de1d180a3c7ef0b85ff0f8e9766108d5e6f8ed58fab9c124b21d9acf5907665db3eb45723b48e31bdbc9772ecfe5358d0f46c9702c346253530de4bfc9f7dca0 SHA512 4e12e45b19c8c54cc8319ff554c1372942a72ad54f8e13e5b24e23f230ea09292403395fad216cb95bccaddf64d22d4b2a4adc281e8abe4b4b27271d1004123a
-EBUILD cinnamon-session-3.8.0.ebuild 1450 BLAKE2B f9f5547f664e96193165f7d2bd183ed162026700f201d49aba1f681b9006123a22aa204fb369f661bb923b409133df25f3fd7318cae96d1d6c2df2081c907b71 SHA512 db53aa1732d2dfa0d84ad4c1788b59b292028d5b90c2916342782ff78f483b95e7eeda126b4b2b242ad601188f5bae538398f47bb5a374be156bda18afec6fd4
+EBUILD cinnamon-session-3.8.0.ebuild 1474 BLAKE2B 5e8dd60d0a4c5ff3a6b6c5f68f1be9e30847eef7670889883a47e760ec0e5bb6cdaeb2c9a2feb162bbd26be6d79f793c90ab7ee043b9d02657fb763b29206187 SHA512 505078b87d43e3460bfed29622e93b799f154f2da1d12498647f6a85e270461798eda594529ce5eccdfdaf15b4a497ec9073c54cfc7e55600c45a765c4a29ca7
+EBUILD cinnamon-session-4.0.0.ebuild 1471 BLAKE2B 96fc2466fc1089c7b66e26e748241ad59f3503039695761908b6ac6dc1b4da116d35de8239fd84f3a66b67621caa310ceb9987220596bbdcafb7e85ecde7bc61 SHA512 74e65752aa91f079ac0f77230a0abe8370a121340dc45be2c6b5cddef7cfdc4c2c68a7a101a713de6fdb96587bb44572ef89d25f160673694076f0cb0d2970fc
 MISC metadata.xml 343 BLAKE2B 6526f06bd8b9c250154c56a126b12c40b9c61fc52b6d4175f9b5e86e3a3ef5b1eba4af9db0b9ef768aaac361e941f2ab93f4e2d6291afb5cc1657c20f69d825b SHA512 dbdf14a6641b809dcdf364577f4e9ca9ca31d6db62a74f74bbbf1f5ee962e69452fb027098735bda31138c27dd43692b78915eca1ad40ab5a29938a28a56b610
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
index 1dd7ed6cc952..199699e2688b 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
@@ -29,6 +29,7 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
+	>=x11-libs/xapps-1.0.4
 	virtual/opengl
 	systemd? ( >=sys-apps/systemd-183
 			   sys-auth/polkit )
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild
new file mode 100644
index 000000000000..80d2ae516f7e
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson eutils gnome2
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.88
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	>=x11-libs/xapps-1.0.4
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183
+			   sys-auth/polkit )
+	!systemd? ( sys-power/upower
+			   sys-auth/polkit[elogind] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
+	!systemd? ( sys-auth/elogind[policykit] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+
+	gnome-base/gnome-common
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-3.8.0-elogind.patch" \
+		   "${FILESDIR}/${PN}-3.8.0-elogind2.patch"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	meson_src_configure \
+		-Dwith-gconf=false \
+		-Dwith-docbook=$(usex doc true false) \
+		-Dwith-ipv6=$(usex ipv6 true false)
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 9d0483580665..ff06e302ebf9 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -2,6 +2,8 @@ AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037
 AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2cb062434621e3f336aa9b833f31c2e7dfc214dbefc74bc2655b95376b945386e29873c9fc696b6e6c027fd6d2d1296c0002a0322e3a1f921c2d76 SHA512 87a15d3274129ea8fe9195f3abb0cfe1dc6d11337e5f2748197cb8b1ecd062e9da1967fe83f11fa7b98af2d95eef9fa4a3f6c55642be2715bcb76355a30fe8ca
 DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
 DIST cinnamon-settings-daemon-3.8.4.tar.gz 660607 BLAKE2B 1db6e8677c9f9e1fc649d29b3de46d2797f01dbaad3a907329eb6781c6c4ec17706d06045ae230315c7802a5ea176dda73dfcd437fd07e3398ad732e96240a83 SHA512 5bd91e781d47413b50b69b6a8d4cbe9060579452db7408d375f01b05b4070caa684d333ef875a7dda85d1acad3442cddd38e13167fa198e3a5540fef7bedfb75
+DIST cinnamon-settings-daemon-4.0.2.tar.gz 662735 BLAKE2B 158e2ee120e2b359c6d84aa52c6b2c9214148fcf48cdc8ed9c777344f21ce82b5c3e4d0b358046abb1de8fc23a43b7cced02b77b43c1230fc2d97db58423e125 SHA512 3e51628339ae7766c37090c82a7550e2f925843ca62ef9cca606568c9771a8f16035735b3db612aae0938553fd37fb6eaf8d30437baa501160221d1b71d0e94e
 EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 5941be45774f98c77b5cff4ea89403166943715c46a7904f634c394fc168bc6aeccd9dfbd35869cf36dd0fa4af89ec286aebaf9be861722dc4096399c9ed3ea8 SHA512 41702acbfccba846c82ebec1e88a9b15c3b5946cd73231075086b7bac52734f15d8061e02f80e7431469b204d2f2e8259dd5d101361f48357c5e1c0fbcee10f0
 EBUILD cinnamon-settings-daemon-3.8.4.ebuild 2128 BLAKE2B fcfa71c27b440eb39ab6ad5dbf4e6283476189084c7cb57ca04e8cae5796cf1cda726371ee7d026dbe83425a61a89d2e2ba9deffe987932332a9edc7ed3c1edc SHA512 7dfe766d4cc43325b633465e78bf7f0825d3f375eda5ddad413ead31111016f116f29f2d4a2260e18cb56aa95874525e19d68306b8c9ba666e19cb970d7345de
+EBUILD cinnamon-settings-daemon-4.0.2.ebuild 2125 BLAKE2B 13f3293169b74d65b3bcaec9a5e9b23d5109424086769f6cf95d0bfe08a20dc56135fc731ca11ca9c3968b2c7202994240802d6775f352be47555a79e5c38a04 SHA512 9a467be0079e755217704ab57b1d494617cad60a71acf0c75b9b392f594cea76d74d5769279a30209c5fb4a669c8407a35647b93ca9b0c5867ae5b39d16497a5
 MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.0.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.0.2.ebuild
new file mode 100644
index 000000000000..1a4d83a8c1da
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.0.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+RESTRICT=test
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-base/librsvg-2.36.2
+	>=gnome-extra/cinnamon-desktop-2.8.0:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxklavier
+	virtual/libgudev:=
+	>=sys-power/upower-0.9.11
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? ( sys-apps/systemd:0= )
+	!systemd? (	sys-auth/elogind:0= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.37.1
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# make colord and wacom optional
+	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
+	eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gudev \
+		--enable-polkit \
+		--enable-logind \
+		--disable-accountservice \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 48118663b70c..b7a1849ffa20 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,6 +1,8 @@
 DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f64df66e69de347ffe01984d9958b3388109d7e89f839205913432d7d68a7fedda743d4de52d63b1d95fc54ff77a8b80501d7e668 SHA512 274ad790ad9e8bc1d424ce45ff426ebdadf868bd48c065a21a8be014cabc889927974de5eb56ef909317bcecf4a0ca9e98af8ba3ade08c903fa286c93e05f695
 DIST cinnamon-translations-3.8.2.tar.gz 9741950 BLAKE2B 23ae3b3551f911ca23b86d06a60e49ac063be7bb0fee65a05e1b5fe55908bb971b73e24e62b8bd82b5f486dc6d37aa724ad5252d8526f60c00b96e8570727f92 SHA512 8ed052da06764b71a344d2e8eea2d7b3132e5b185167d7d2e95b312df89e5302eeacde15d0ec337ab5573f7497be7b66db3fbfa4cb8a654e8199690315c319bb
+DIST cinnamon-translations-4.0.0.tar.gz 9742058 BLAKE2B e55931643378ea43508488f431f95f83efb4de8691303da5fa1e91bdee7486fec9881ac75123a2775e88708d40f148fc3a6b0580e447cb370b364d412a8a571a SHA512 a4ecd3808e28de61556f6995c3f21c7170c2fabb81f8c10e548909eca2dabc0b33d912aaa41f4fdbc5d66f573c2e50c8ea9fed93d2fc6200a1e1662291a75811
 EBUILD cinnamon-translations-3.6.3-r1.ebuild 1361 BLAKE2B b30f76730a9e283a793ad8036e5e4bd5a6aca87e02903c6c87e64c67db1149ae426e37036dd94e2ab163a0d1ce1318ada461786e9e5df939fb3096cb0b807a20 SHA512 9eefaf04e7d7f151df23305fe6e84b8d9e05395def647b3773a762ab369f59e1521af377ff162c266272ac1f6608d8905b9920f22c6a2a4f3c6adee3d3c847c1
 EBUILD cinnamon-translations-3.6.3.ebuild 1309 BLAKE2B 7cff20355506a7a644f58bf10b0498fb9f08782177d78af6790c590703df83d7533239c033058adf903ad580572857959d9b26ee9daab59cb5cc8eed7a0924f6 SHA512 dd6b64f23edb69ff0a8672dee36ce4f34bb60a7883b265cb6b6c3caffcf3ad57419551dd4057f6b386df679ae6cbc28fb58abce676c844e80e50745fca5f8d83
 EBUILD cinnamon-translations-3.8.2.ebuild 1361 BLAKE2B b30f76730a9e283a793ad8036e5e4bd5a6aca87e02903c6c87e64c67db1149ae426e37036dd94e2ab163a0d1ce1318ada461786e9e5df939fb3096cb0b807a20 SHA512 9eefaf04e7d7f151df23305fe6e84b8d9e05395def647b3773a762ab369f59e1521af377ff162c266272ac1f6608d8905b9920f22c6a2a4f3c6adee3d3c847c1
+EBUILD cinnamon-translations-4.0.0.ebuild 1358 BLAKE2B 55b13c776b5b0c3b74435f47b8b3598f428a6d5f0c13d491ca55c6c63407710b71af904d3a7dde6a28c672f384ab9c695c63053658b0f226a5c2e2da0e54f781 SHA512 e9dc87e46c0ab540c5d5de7e872848a8098cf901aea6310b88c241e5e4a1cd563c21b94444d0ef35b8b8c329b06bf0e3d38752ea9826a1291fca561165053b21
 MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.0.0.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.0.0.ebuild
new file mode 100644
index 000000000000..f2148817da6b
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
+RDEPEND="${DEPEND}"
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 77a2eb748c33..232c3d47d418 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -5,6 +5,8 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03
 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
 DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
 DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53
-EBUILD cinnamon-3.6.6-r2.ebuild 7646 BLAKE2B 15b814158431413272ec8a030141cf2874d64614a0a0a75ee6c09ec916b32397626fb5668527af039284eda72eeee68a4c21084a894aadaa1feeda1fe3f17b46 SHA512 f06a8fff3801480155d230dc962a6ab201cce072ae951f24f381e51087919961b3ac9f5ba5b0091410fe31aabae4d1715febe6bc354d6f14b1cdbd5a1f8dfe98
-EBUILD cinnamon-3.8.8.ebuild 6942 BLAKE2B df8d18bcecd1a8c7754e5026b496e7d0204a928e31829df96f2dfb0ac0803ab0578193964054eeac17355c668201fbeecf04c2a0fa237fc5db07ed2cca9912a6 SHA512 650c6e78a72cb0bdb19a4406f075da67bcedf0e48e4eec1dd32c31f068e8343e00cea2c49c9839aacfd2f671c44f827ca19507c8ae1ba39543441a0258eb17d1
+DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
+EBUILD cinnamon-3.6.6-r2.ebuild 7596 BLAKE2B 998559af3842688b6749e323410078d43e09de935efe8e029f3289b843edaf59a1f96a5acfcabfad19266bd54b27cf79a1000b84fad0b5e163d4b46603d8b4d6 SHA512 370e74d24a6a4be927845befbd1f038728dc38f8de52f1c1e362a3b1420e09c937d10518d149548a3a37af6f64c17e6fe0b52a3f4cd037fedf03d19a15ddf086
+EBUILD cinnamon-3.8.8.ebuild 6891 BLAKE2B d5f90ddb1f3f447f5dbe7d790af2b2a6b3c6450eb4ec43034cc256e76accb07ca333e9a93ca50da4cda15ce4ab6b7dcebff6d5093acd546cea30b2300ffb6ba1 SHA512 5aba804f4a78cad774e9fabab6b33ab60e484c7f5b4d10af60d5722b07c454480716df8b2b32368be52ba74dfb9ca1cea2c11a644cbf02e2d37fe6877ace1b0f
+EBUILD cinnamon-4.0.3.ebuild 6981 BLAKE2B 9eb1ea4fa72ee8ec818fa3ecb0f30ffd21eb3d08f6cb3a0d69de62c882c6d863781153b3b6a4ad96e4e4e8b7c38a3aec5c27ee72defb1af7a07933ed6dd5878f SHA512 af3e1ed72f43705b7ef9ecdef53f5f72cfeb1dfad8ff171647d822c02e3021e78dbce379bc1e8a18d1dca91aed9d5d504e5dfe5a328229c9feac5bcad610a93d
 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 504464fac2ab..17cda9870556 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.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
@@ -82,7 +82,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+	sys-power/upower[introspection] 
 
 	>=gnome-extra/cinnamon-session-3.6
 	>=gnome-extra/cinnamon-settings-daemon-3.6
diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
index 26e4c59984c4..5be067893687 100644
--- a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.8.8.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
@@ -76,7 +76,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+	sys-power/upower[introspection]
 
 	>=gnome-extra/cinnamon-session-3.8
 	>=gnome-extra/cinnamon-settings-daemon-3.8
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
new file mode 100644
index 000000000000..817f2262cd36
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://developer.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="+nls"
+
+# We need *both* python 2.x and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+	|| ( $(python_gen_useflags 'python3*') )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
+	>=gnome-extra/cinnamon-menus-4.0[introspection]
+	>=gnome-extra/cjs-4.0.0[cairo]
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.0[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-extra/cinnamon-session-4.0
+	>=gnome-extra/cinnamon-settings-daemon-4.0
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-4.0
+	>=gnome-extra/cinnamon-control-center-4.0
+	>=gnome-extra/cinnamon-screensaver-4.0
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index eec94da5f89a..6768007356b6 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,8 @@
 AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
 DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
 DIST cjs-3.8.0.tar.gz 446667 BLAKE2B d7d37d2aa47fb32b401727e2d5f7f6bd3779e62f5bdaf77501e0999bc7d74a14c5c9924702091d4b32dc7a572b5e920e2dcf19e50b048907f87993d8be392ea7 SHA512 7f776be2d4863ea7bb32e266efb0c5d5e0f86bab68bdabc1478e04809f8f887b4ff0853075baffa46055d347fc22c6252faefaceba750f61b0b21229f6130bd0
-EBUILD cjs-3.6.1.ebuild 2099 BLAKE2B 09dbb18fe6444150291372bdacac0a73ff6530e59f874cd2220df9a682f5af74beed4d632c6cd13c2abda6b571ef2cab4caef08111c8e3ba13e3d23e9ba37301 SHA512 9fc82a49feece084bb937045928ca3e1d33d2585bf9aaa822b4a9329e17179a3f71b3b7f83b263a5e36f3de3b1118aca81b20848dce04632ca9445d4987e7771
-EBUILD cjs-3.8.0.ebuild 2004 BLAKE2B 98c59a8043cecae98ee150751c842f8837332a12e8d400a0c98f3531e7e55a243cfe8a2e0528831b33c722e543d5740100f6d4ff009ab46ceaf890796589e1a8 SHA512 a7968e8750b66d75f7ac8d57eb3f77918054635c06caa19f1df3d2c30991e896b62069a1dcca2c6ded9a159d9484889adbd9f66db8f4113fce7432166049d488
+DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
+EBUILD cjs-3.6.1.ebuild 2096 BLAKE2B 5f2cc7c4517cc8c012075f2ff5ff0dba936699f5997e0cd3839fb17de6c0b8e5352c3bfdb3ce4dc00d86816352d7347c193a853b6c1a3e1741c310dc5b9dad1a SHA512 187d890fc87dfdbb36aabac71265949543c033ab650125782b806a9b2c1dae05cd9fae5316a4013d8fe20cfd6543dca2305f6634b1ab29dae26a175c6631e375
+EBUILD cjs-3.8.0.ebuild 2001 BLAKE2B f8aca1867ff72015b96331d882f31533656965f9758476622d1382dcf07bb8ea2831ef933bdcfd9fa01e8220538e1c87afe54bff54627aabafb6814f8a253303 SHA512 0ac840158afd4df20b43fc640fd4ed12ba2410e9b9817ab47e8fc293b291c6d46870993812bd3f2c3e2c7d399f8af41422431e166dd203702f2bfe312d5a4c82
+EBUILD cjs-4.0.0.ebuild 2001 BLAKE2B f8aca1867ff72015b96331d882f31533656965f9758476622d1382dcf07bb8ea2831ef933bdcfd9fa01e8220538e1c87afe54bff54627aabafb6814f8a253303 SHA512 0ac840158afd4df20b43fc640fd4ed12ba2410e9b9817ab47e8fc293b291c6d46870993812bd3f2c3e2c7d399f8af41422431e166dd203702f2bfe312d5a4c82
 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
index 8aea23c9840d..285c4c138814 100644
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.6.1.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
diff --git a/gnome-extra/cjs/cjs-3.8.0.ebuild b/gnome-extra/cjs/cjs-3.8.0.ebuild
index dfb627aff795..c36285e11ef2 100644
--- a/gnome-extra/cjs/cjs-3.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-3.8.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
diff --git a/gnome-extra/cjs/cjs-4.0.0.ebuild b/gnome-extra/cjs/cjs-4.0.0.ebuild
new file mode 100644
index 000000000000..c36285e11ef2
--- /dev/null
+++ b/gnome-extra/cjs/cjs-4.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:52
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	sys-devel/autoconf-archive
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+	!<gnome-extra/cinnamon-2.4
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+	sed -ie "s/gjs-console/cjs-console/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh \
+		"${S}"/installed-tests/scripts/testWarnings.sh || die
+
+	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh || die
+
+	sed -ie "s/'Gjs'/'Cjs'/g" \
+		"${S}"/installed-tests/js/testExceptions.js \
+		"${S}"/installed-tests/js/testSignals.js \
+		"${S}"/installed-tests/js/testGDBus.js \
+		"${S}"/installed-tests/js/testEverythingBasic.js || die
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index b7e4c09b8fed..a04af1446473 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,7 @@
 AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
 AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
 DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
+DIST gnome-calendar-3.26.4.tar.xz 2443244 BLAKE2B a3117b4599e435959f515d4e1740adf66fb43a0138a325e38bbb2d269ed55407216e6ec8d4c1aae659cd3d0794f71d8dc7134dff786227b46405f7f9c06b1412 SHA512 6b7ee4fe409b9eeb9a84307142b4aab85e348f623a64bf66db09f9432e7c958e0bf83db7fe65c6d57efad84518cf2f859282e58ffdafefa6d8c30d863fb5007e
 EBUILD gnome-calendar-3.24.3.ebuild 1154 BLAKE2B 577693f10c479791872e5ae80006a809547fe53cedc0c4b154ae3e044d525f3aedc2f81fb191cb6eade11fcc67acd7581a2c92bb3352a924285701128bd77263 SHA512 f2b3a07725ee80d4f6bcd98a309637cb40561d8340a6ca797f63983b67a78373fe2830b7172be1454ecb0f7f454444937b1458aa025b87885c4999674ab4a536
+EBUILD gnome-calendar-3.26.4.ebuild 1035 BLAKE2B f11ebbb3bdfe977daa90dd4f1e7a6598172d4ec54b36f792809a010cd9f85bb7a361232bd967a5564505f4f091f822946de4f90b8414590576f1f9bfa00431fe SHA512 ae994e89f140a66f4d7dd874e5a138a8a0ada3d23f56a06c52fe022cdc630bb199725654c8190b13b19fd6000446c95f93a15002696c1643cc5b25d0db1560f1
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.26.4.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.26.4.ebuild
new file mode 100644
index 000000000000..0ed62e53bf97
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.26.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+# FIXME add docs
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.21.6:3
+	>=gnome-extra/evolution-data-server-3.17.1:=
+	>=dev-libs/libical-1.0.1:0=
+	net-libs/libsoup:2.4
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	>=dev-util/meson-0.42.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index f1c7574c153e..09fb81a4cc2e 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-characters-3.24.0.tar.xz 1490304 BLAKE2B b7bea411ae623a29469fa82d8a9a220a718134776c0973431f4f16f6753bcedd34a8886f3cecc8af59b178f93c051310fa988aef198618b2c4d0be9001cb7ad8 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d
 DIST gnome-characters-3.26.2.tar.xz 1547868 BLAKE2B 8fda44bcb3f9033dba0717a698d9db100d260624b92843ed6cf1fa45a0de2d0c326fdce5eead1868b4841da7a10a1ae25fd0298051cafd4e60d0e26ec428ad02 SHA512 a9bce1810f4ba4de59275421e201838ede4781d636231307906ab10fd588ca4ba945aee6f6f8bb847c9b76a7a0db86613189542649cb8561542bec3c774645b0
-EBUILD gnome-characters-3.24.0.ebuild 1168 BLAKE2B 17e378c2397c5f9c02242ce840ba6c5f9626086e62287d00ded178f09a9d3f7a6797155b3946a39742006c9a80b032bea78466757c093c1142657dda1415fe29 SHA512 5dd6ce8d5cdb738fa247a2e97ac7703cfcccd9bf4bf7a2493e4443422de620665a34303ffba1005ea886ea0685ffd833c35aa617facdd95d756ded751570263c
-EBUILD gnome-characters-3.26.2.ebuild 767 BLAKE2B bfe0783bbd5736de1949e98ff6cb82b108ece445f4d2233c26b1f9b9cd95e6c8b4cbb6154ad15094d0473ff2c537789f14075ebe5811edd213b27e1e786e74d0 SHA512 d77b52045e1e8a8ebcd6ffb22a61c512b5ff0b8c2f1377c92f34718537ff40ae8d8d26cb7e3ea6283c528facb9ceff4f3d5e22527a8ca9a6cf99da3f451ef6df
+DIST gnome-characters-3.30.0.tar.xz 974068 BLAKE2B 294b401e410e4383120deaa4ef3adad485c27e59879ff412d9eb282678f07faba6fb5a93e01c0aebaac7dbac7abd5c19876a0b84403ad92ffc24211daec961bd SHA512 390536e0e5891497c5bd2374c70085beb5bc7c730f51d889e4147895f24999c5c3e9a0bc466a3d4c5652922f1cd7ce1f8f1a98e61007df59d682c230bc99acd2
+EBUILD gnome-characters-3.26.2.ebuild 765 BLAKE2B fe33d2032b4eb2c26fcc6a34f20f165aee3baf2613ed6c3f15856771e6dde399be18a3026bf8ddd2dfa1a28c452e47d0ac6223321f51ad696031e10921b2a00e SHA512 8301ccebbbd871d650cbcfead0c99befebf235890452647c3d85a44a73e9a85dc6655b7d176307d11a1027e3760cbe68bb64fd38a734a0bc8ce7e0308f94c0ee
+EBUILD gnome-characters-3.30.0.ebuild 887 BLAKE2B 506f44a059c55d38fba68acc35b154f622c58849247817da47929235b4eac0382973e6b70e6a4dc89d1f2ffaef3ef54eaae7fb25e94040fb35be2ea94990eb29 SHA512 14c36ae179369b71b32cf6496e8f8d1dc8dc47d6491f369fcafeca11ac34bc9c7ef8c629b64010c7883c5237f1fbd1d686cb9c47eb692665fd896d0e297e24d6
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
deleted file mode 100644
index ef88e3fd8906..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/pango-1.36[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed 's/print \(.*\)/print(\1)/' -i "${S}"/tests/smoke_test.py || die
-
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
index 0c62363572ba..92489a93a964 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.26.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
new file mode 100644
index 000000000000..5febaa80b536
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-3.30.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5
+	>=x11-libs/gtk+-3.20:3[introspection]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 1b011df00fda..364fe8b76164 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-clocks-3.24.0.tar.xz 954576 BLAKE2B 848303243391bfbc5ae2fcd8bfb4f3320ccb8465098d95379aaecf856341f05171964eda1a0a8637e04b5330cee6343003ec25063157f6d8ba0abcc22aa3f6ef SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1
+DIST gnome-clocks-3.26.1.tar.xz 800056 BLAKE2B 3ab9d611c9ef9f5b09ae3c5bd257a38582363e73da76f64784382d16c287fcd06524cd4d024a606328073c46604862a249f9ae5bbf5dbb31acd786a512bc2537 SHA512 226e0e253b5168aec8113da3018371dbf29716e4c0ba49c856333d66f6572a2bb846cca64cfc24dff55da577d0f60dce4eadfeb256eaa737d4040ee13fc62f85
 EBUILD gnome-clocks-3.24.0.ebuild 700 BLAKE2B 6eb7773cd6c818eed081337668cdd1a83cab80e946f8fc94635b895eff454f55d410297a113b58223ce8df2510418eeb188ac02fdcb4c38d6e049b8a6bf4aba7 SHA512 a108464748a745e78c230d635d1085fcbbc2b2a96b9a01a6fec6b63e7384b38377bd6e4fe40fd7a1784f0b970f6b772d36b08760e4812e160f9b7481d2bbb192
+EBUILD gnome-clocks-3.26.1.ebuild 940 BLAKE2B c629f6c8804bceed9bfe31a126ffdb23700c5839ee72e7fd50039933c416498bb4062bf8da5864937d450173b08901fe5dd12e742a6fe31a7896cfe356e08617 SHA512 cb354705ad07f8ac2d502a94eb15e8d8616ae773ff824d612bd3104616e699e068d9b06fd2db018e881282dc8a7dd86c4a9124d3266d6f31a0d3fcac3a79fe50
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.26.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.26.1.ebuild
new file mode 100644
index 000000000000..db7fe003bf7b
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.26.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.26"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgweather-3.14:2=[vala]
+	>=gnome-base/gnome-desktop-3.8:3=
+	>=media-libs/gsound-0.98[vala]
+	>=sci-geosciences/geocode-glib-1
+	>=app-misc/geoclue-2.4
+	>=x11-libs/gtk+-3.20:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=dev-util/meson-0.41.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 97ee856ff8b5..14be2a21469e 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,3 +1,6 @@
+AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90
 DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003
+DIST gnome-color-manager-3.30.0.tar.xz 2611088 BLAKE2B 2bbed2184d2c7afa9c4c4cd88470df3350f7deb2d776863dcd18ad6253538f1daee5f6397c598af8bdf1ce720980ede9280891139a9366edaffde3672d64b47a SHA512 ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc
 EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8
+EBUILD gnome-color-manager-3.30.0-r1.ebuild 1892 BLAKE2B 7f0845ab8fb49ab87a088e9f23deff36b950094423812febe0202996ce2ed1b3e7d2e6f33c3b114689e345a35958d223719448a645cbae31b2409674c9b91f89 SHA512 871d4d680471297a7d10fbe547ada0f4765289975d0d7c2c6ce6a298c0ecdfd1c6528b52b9cc075a11b895f71235a7848e11668295adb1b0987eb79913840fbc
 MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d
diff --git a/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch b/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch
new file mode 100644
index 000000000000..a9d3ad465a6f
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/files/3.28-remove-unwvanted-check.patch
@@ -0,0 +1,24 @@
+From 534eed4f8664c9f263d666ed78144c37dc05bf90 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 27 May 2018 19:27:51 +0200
+Subject: [PATCH] Fix unwanted exiv check in packagekit option handling
+
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9e179fb..08a0f79 100644
+--- a/meson.build
++++ b/meson.build
+@@ -108,7 +108,6 @@ if get_option('exiv')
+ endif
+ 
+ if get_option('packagekit')
+-  libexiv = dependency('exiv2')
+   conf.set('HAVE_PACKAGEKIT', '1')
+ endif
+ 
+-- 
+2.19.1
+
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
new file mode 100644
index 000000000000..5f035f751268
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Color profile manager for the GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="packagekit raw test"
+
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+# vte could be made optional
+RDEPEND="
+	>=dev-libs/glib-2.31.10:2
+	>=media-libs/lcms-2.2:2
+	>=media-libs/libcanberra-0.10[gtk3]
+	media-libs/libexif
+	media-libs/tiff:0=
+
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/vte-0.25.1:2.91
+	>=x11-misc/colord-1.3.1:0=
+	>=x11-libs/colord-gtk-0.1.20
+
+	packagekit? ( app-admin/packagekit-base )
+	raw? ( media-gfx/exiv2:0= )
+"
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=796428
+	"${FILESDIR}"/3.28-remove-unwvanted-check.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Fix hard-coded package name
+	# https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/3
+	sed 's:argyllcms:media-gfx/argyllcms:' -i src/gcm-utils.h || die
+}
+
+src_configure() {
+	# Always enable tests since they are check_PROGRAMS anyway
+	local emesonargs=(
+		$(meson_use raw exiv)
+		$(meson_use packagekit)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+
+	if ! has_version media-gfx/argyllcms ; then
+		elog "If you want to do display or scanner calibration, you will need to"
+		elog "install media-gfx/argyllcms"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index f33285beaf7f..ec2a9922fb36 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,9 @@
 AUX 3.22.1-fix-vala-0.35-part1.patch 884 BLAKE2B 2994fc2b28bbe8f3b547542b100324fce5d95b385ea8edc1013c86c1e0df1dabafb4306b8153953c67a36e1d96e1c658c599afea5f1c3e3a7d617d01c05d3224 SHA512 73754d230efe89d3e3273e1d24a69e58e45a8d6e74fce1a41f7a7889aa58189fcc2f5edf36ce2418c43871716634301308f0c211f0f18282cb409d009669bdf2
 AUX 3.22.1-fix-vala-0.35-part2.patch 1501 BLAKE2B ca7149152cae32912977bb8a2ca420d1711fcff5e2b18e040d9969e246a0398f66ad09cee72f22b282d6eec834d10721a99d270ba873d782f09bc6e30b7c80d6 SHA512 700772e2c87bfad32e408f20653a20976c0a3b243fd4bc8b6ed61cb9fe34f1b1f572b877aa05e9b9c3854cc444d5d7fc1c26dcd9ac28bf76694eb02c2e31bb4c
 DIST gnome-contacts-3.22.1.tar.xz 788820 BLAKE2B 8f620334dd380e8cb690f7b71d3a99a921f5814ab230690a60be6022150db7a6a0f74e426e72d8d027eb5280e1b6bfd04fa7b0b030519bb19e4718ca0c9f2120 SHA512 d93ed6c65ffdabe1925cc795b88ff374fe69e03fcd36af7c2fc67a5236b90ab6af4bd269b6fc3b344fcd6b4688d866628b8b090bb62de95f8bd0c2e40c26a107
+DIST gnome-contacts-3.26.1.tar.xz 974588 BLAKE2B da989125408702099ecd1afaad6c06ab1cbeda2309bc7b207be671c833792a325bbbba0ebc6561f960d2c524ebd51743a60d5b792a0c2b8126318d38a6d801aa SHA512 1ba445efd71dbc77213d75011b0abcffcf6fe534cba14cf8ca92890e8dfb7b44d9565399200aa7aa03862cf08be60289b78501a1807a760bb1e68f0fe46c4685
+DIST gnome-contacts-3.30.1.tar.xz 369392 BLAKE2B ba3e9263b1de210efec88d2ccecaaf7ae7a6761a5997e213d1a0d9a7694fed54f8123b792e138ec8ac67843408562e320a5490c5daf51478b763b9fbcb21adda SHA512 4aa5629299233d24c36ec1c67d412fc421d5b6836c9759a0278bebe0239897ec6046e3aa8ea7ef10c5e537ec9aed67346221a353f683e18032a708eb333826d7
 EBUILD gnome-contacts-3.22.1-r1.ebuild 1840 BLAKE2B 3678c0ff5796cb2bfed0d35954e0553bdb6b94c79fd9e4d120fac3a307351c948c4cf2d733878002907af6416548ef6c18063fce60a48b022e3f0faa9130e6d2 SHA512 81cfe1119ad2b63bb3041eecae2b4a5b0dc0e1b8e4901f6ad74cb1c52004abcd820dd131f3b2bac0e0d7b067c69c2a53a84187ab7f9019d991f81de79def191d
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD gnome-contacts-3.26.1.ebuild 1605 BLAKE2B 93f08053b6dfbc85916e9871cb4747e6d05d8933631ee5d06c3ee371eeda2e7cb16ad0350f24b7b39d475e13e0c4f5a57ccddacb156201a61ad3d2e9e7d38c33 SHA512 5d0d89ad60b377cdbda70c8a08f057ca7537a65b449ff7d80e18f6f899cae532a7e5f9e05471daa141413d7d8b397a477ccaa5d3da20dd2acac45d9ca0c4b277
+EBUILD gnome-contacts-3.30.1.ebuild 1719 BLAKE2B 3d412a3232f8b2a696ada524f44b009ea85b92a2869e058de47e370a475c3cea7e40b4f199522da891501b3dde47584b47395e4b46d718bec43a4aac789f1b14 SHA512 b6e689e1bfbdbc9b35bb0e02388be10ff9dcaff3f0614a7649f2146f56ab4e34f54b9bf841a40677a9096322c23892f7dd9a8008232c0ee635e29d0122c0eac2
+MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.26.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.26.1.ebuild
new file mode 100644
index 000000000000..0496d35861d3
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.26.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-0.9.6:=
+	dev-libs/folks[vala(+)]
+	gnome-base/gnome-desktop:3=[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=dev-libs/folks-0.11.4:=[eds,telepathy]
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
+	>=gnome-base/gnome-desktop-3.0:3=
+	media-libs/clutter:1.0
+	media-libs/clutter-gtk:1.0
+	media-libs/libchamplain:0.12
+	net-libs/gnome-online-accounts:=
+	>=net-libs/telepathy-glib-0.22.0
+	>=sci-geosciences/geocode-glib-3.15.3
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.20.0:3
+	x11-libs/pango
+	v4l? ( >=media-video/cheese-3.5.91:= )
+"
+DEPEND="${RDEPEND}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Regenerate the pre-generated C sources, bug #471628
+	if ! use v4l; then
+		touch src/*.vala
+	fi
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-man-pages \
+		$(use_with v4l cheese)
+}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.30.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.30.1.ebuild
new file mode 100644
index 000000000000..7144fd7e808d
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.30.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="telepathy v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-0.9.6:=
+	dev-libs/folks[vala(+)]
+	gnome-base/gnome-desktop:3=[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
+	>=dev-libs/libgee-0.10:0.8
+	>=dev-libs/glib-2.44:2
+	>=gnome-base/gnome-desktop-3.0:3=
+	net-libs/gnome-online-accounts:=[vala]
+	>=x11-libs/gtk+-3.22:3
+	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
+	v4l? ( >=media-video/cheese-3.5.91:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.22 )
+"
+DEPEND="${RDEPEND}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Regenerate the pre-generated C sources, bug #471628
+	if ! use v4l; then
+		touch src/*.vala
+	fi
+
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use v4l cheese)
+		$(meson_use telepathy)
+		-Dmanpage=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
index 39980802b1da..03d1d32cafd1 100644
--- a/gnome-extra/gnome-contacts/metadata.xml
+++ b/gnome-extra/gnome-contacts/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<use>
+	<flag name="telepathy">Start chat from contact details</flag>
+</use>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index f729bad898d3..513d6f8b0877 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,3 +1,7 @@
 DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 BLAKE2B 628dab2c9a938f3b265855443e794c1575586d0579692e1a21bae77dd497989cd061cff4dd97090f11719916f24742eedfc81bacb4fdf31536eca78cdd221d6f SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d
+DIST gnome-getting-started-docs-3.26.2.tar.xz 119168700 BLAKE2B 2b694dcc01e0a75c6c412f056b330b22232de540ac6c8f2cfe7927270479383e8255e996c15b86693e5cde5822703217aafbf7c3c1aaea1ea73c172fe479afb3 SHA512 9a8447d18f54efa23041f9d28ca8cfcbb18a7917de29f0c7806eb7384f98c23bdd501ef07ab7556e4b74796df2c8a8b531041c9b6eafe71f6e03102ba47e2b00
+DIST gnome-getting-started-docs-3.30.0.tar.xz 110244480 BLAKE2B 91acfa8731a60bb98c88ffb23bf46ba5bc83feee51ed8a6ae7ffff5d5e7c7c5695db9fe715d54ffaa7b1cbe2fbc9c0dcae86b577f81deec6acb7bb57d92f788f SHA512 15d7db0aba5c4ce056700ff6f1d5c23ad5cad5c113ed9c83aa0e569262d6c489bb48eedc697d25e25d3cfae7df3b8da039b84c612b9eba9346b4b4c2b4494952
 EBUILD gnome-getting-started-docs-3.24.1.ebuild 424 BLAKE2B 64093399bab07a9e68c313ab3084eb774543e336106b9f46517fcd27ec476c5cae4cc36091a1234c386374953ef0cce20c046a4db7942112b850cacdb84aab26 SHA512 adfea1597f4471168fed28f8de0f9002c83b95c47f5cfc254044252deac204bff92e29ef4514c66d35e6c043935afe0f9e3c249df8388a3bc501e2bda1fe45ff
+EBUILD gnome-getting-started-docs-3.26.2.ebuild 420 BLAKE2B bd6ba897e99ed0762e61cc444736ad90a20646d6feb95f71a96b3a407e4f275d0eb4de89c800fbbc501b9f5aad32c46bfadfa6d5a39f07d75d928f480b7d4b5a SHA512 63b3c5758d16a21ed2896f2ebb7d9eb4a94ee387797396f77b5495976bfd5f2f5591e58d26654b470266eb63462a675c5ed586d45cdad905b10b90926ee4974a
+EBUILD gnome-getting-started-docs-3.30.0.ebuild 420 BLAKE2B bd6ba897e99ed0762e61cc444736ad90a20646d6feb95f71a96b3a407e4f275d0eb4de89c800fbbc501b9f5aad32c46bfadfa6d5a39f07d75d928f480b7d4b5a SHA512 63b3c5758d16a21ed2896f2ebb7d9eb4a94ee387797396f77b5495976bfd5f2f5591e58d26654b470266eb63462a675c5ed586d45cdad905b10b90926ee4974a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.26.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.26.2.ebuild
new file mode 100644
index 000000000000..6eaff71d29e9
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.26.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Help a new user get started in GNOME"
+HOMEPAGE="https://help.gnome.org/"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="gnome-extra/gnome-user-docs"
+DEPEND="dev-util/itstool"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.30.0.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.30.0.ebuild
new file mode 100644
index 000000000000..6eaff71d29e9
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.30.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Help a new user get started in GNOME"
+HOMEPAGE="https://help.gnome.org/"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="gnome-extra/gnome-user-docs"
+DEPEND="dev-util/itstool"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 98520620014f..ed4735d9f474 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-logs-3.24.2.tar.xz 1000552 BLAKE2B da237fbce0b1ced77c52ffab1965f6e1209df8fa1f224274b3dddd30bea106fed6449e37e0ad654b579ce1128fb6b554ffd521faa5362db9ef8f8f2a54a1685f SHA512 6f7dabb0b0093b860198344373eb1feae244ed23c3a65494499c09a83c687ba68ff023ec5ce34846be51fd74293fdb4b575cf3a748a22fae183e89086eba1db9
-EBUILD gnome-logs-3.24.2.ebuild 995 BLAKE2B a84cd13c043754c4ef9e377ee4033cd8a018d9d5b46c6dbc1d2c97029d685c47ad00394fb129e710effe65030a765d9cb4d99088d54648a71493a6ccb937ffab SHA512 634cd794549eea11f7cf675f2e8404af952cc51f756fa8ea439776e8ab0f2b0fef4ec9045cde019fa9f78a88706df1ca79b31a30836f2476170924af8d98b47e
+DIST gnome-logs-3.30.0.tar.xz 1289980 BLAKE2B 51c99c335b72039eab96feae8acff55f17c65b44959ce7b0f6a310a71dc4d372fd7e225a73650896a7177650ca77df6cf340a91cdbbff0cd18dfc1b2fd658d1b SHA512 940aa6883538aad28ce86e313425e28f2633d68f55dc3b17260bd81f6232799b29234d9a26dfd0cd26af0d0debf0cb832e76b5b8743d95b8e32514ac5fe6ece0
+EBUILD gnome-logs-3.24.2.ebuild 1033 BLAKE2B c4180e8734703b25478ba80f6d2b0deff4474f03ff1473d792780e92b7a09cbc418e1da2288b52b867d8a047ea40ea5161a6a5d11e513e04be1327c4580464a4 SHA512 b0a7325fea9d3ba19706860ecc4fcea08081d3c7e7df51ca2703a33a9c68238c5508d3cd07c9710f1acd743649a0f5f5c16f2c36f65202855fb5e506a4d9da68
+EBUILD gnome-logs-3.30.0.ebuild 949 BLAKE2B bace88458b9cd7cdd6420c74be2786125597659254feb206164e6abf5b085aa2d84d474fcae8d1c73872d84c1436c80b7e6b4905faf611d9c333cddf755b32d8 SHA512 b39e796de03e5a350865bcb8096d7358935ce289b80b561edf943c27b539078902c4c87098fbdd51cd67536daa3f1c62a8bad64de989c4c76e7bd710e3193acd
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
index b5ed60f132c6..20e30a02d8c6 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-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
@@ -21,9 +21,11 @@ RDEPEND="
 	>=x11-libs/gtk+-3.19.3:3
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	~app-text/docbook-xml-dtd-4.3
 	app-text/yelp-tools
 	dev-libs/appstream-glib
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-util/intltool-0.50
 	gnome-base/gnome-common
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.30.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.30.0.ebuild
new file mode 100644
index 000000000000..c7c2b41671e0
--- /dev/null
+++ b/gnome-extra/gnome-logs/gnome-logs-3.30.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Log messages and event viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	gnome-base/gsettings-desktop-schemas
+	>=dev-libs/glib-2.43.90:2
+	>=x11-libs/gtk+-3.22:3
+	sys-apps/systemd:=
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	~app-text/docbook-xml-dtd-4.3
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
index 6b5dd5494b3d..5b4a425589c8 100644
--- a/gnome-extra/gnome-packagekit/Manifest
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-packagekit-3.24.0.tar.xz 2174372 BLAKE2B fd6b94c1e2bd9e29c73754e3c1625d6acd4e1931a80c61c572d6f1a90a3c1814cafea1358e64f8cb1be0308d00146716a3a5058a732702b14c3d6a9a0cc98d4a SHA512 af3291b11ad279d050fcd970e1c98257b65da5f36146d8e5f1f255ef1b17e6f2caf8073ce16623da130edaf452860788aa20dd2de6a4bbf639aaf9d3bbd7c095
+DIST gnome-packagekit-3.30.0.tar.xz 1744188 BLAKE2B e346d76a835a84a0b8be46da7af1dba63ef96826e978d06e38490aa44485a010f76b2ed44cde310b8128150f5cf7461cde8007ee5ef7603221f9b947c0e48185 SHA512 69416ccb61effca112ef62ee7a7ba29c262ce768ee41a8bd24a064b66a7106f5e968dc01c6cc3d30d270bd9ebf8cf353044531ad3a19d63b174f097c67edfe9f
 EBUILD gnome-packagekit-3.24.0.ebuild 2241 BLAKE2B 24984de13082b7b6adb336bab3400b297baabe1256d15a213b30c6147f8bbd84d4ef5b53038b4edb2d8a2decc9da7b3adeb6a0e715f8bbc030e0022aa3de7634 SHA512 5a701a9aec0294d81c126fb157f1bc89fd1dab84e94e33c1a9391669a8fdd02b6d05961a2bb03ce0b3fba907832353e31452cbf2ecbf4053031890545871ec83
+EBUILD gnome-packagekit-3.30.0.ebuild 1227 BLAKE2B 2b2a2c8a670777d444c171a0c8b83c70d819be2dbe6e488c6fe47e312655379581553100d9726f52852cb2ee88d7479ac641fde32cea4546ff9f2d9b54c8336a SHA512 a3cbf23853102a3fd086f228f56015705513dc121b4089b3ebbee1db58628399944c214b07aad3b004e325efb40314ab44835dbffe8670cd64c253c990feda13
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild
new file mode 100644
index 000000000000..078f468963e7
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="PackageKit client for the GNOME desktop"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.15.3:3
+	>=app-admin/packagekit-base-0.9.1
+	systemd? (
+		sys-auth/polkit
+		>=sys-apps/systemd-42 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils
+	app-text/docbook-sgml-dtd:4.1
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+# NOTES:
+# app-text/docbook-sgml-utils and dtd required for man pages
+
+# UPSTREAM:
+# see if tests can forget about display (use eclass for that ?)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_use systemd)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 1fb25f58426a..d15e17e6bf19 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-power-manager-3.24.0.tar.xz 554616 BLAKE2B f39ce93943426fe8e833b48b5e7e4a02645eb3ffd28aa9e3e8c515d159950409ae9904b2683419d0087b3ced8e30f1c42b4dd9c511100041952449aef0b18e0f SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0
+DIST gnome-power-manager-3.30.0.tar.xz 380820 BLAKE2B 9d39df24854f649ab3b40fcf454c7be73d93e3e99050b93ec5dfb86760e27055f856918e5fb7d7b53472a4062cf9b2039a519130bb5d887126a69326d9392737 SHA512 ed0e2a20bd8979fd9064cea9f4485da832eb44a2c727e39cde5ca9f9e2eb75a37e3d1b5a2181d9c666c19b1b300cbc62cd5f9e2c3f36ee4a4dfc3e1537a10329
 EBUILD gnome-power-manager-3.24.0.ebuild 1307 BLAKE2B e095a196b85063bbb4d24370c2f682c87527c29c1e768cfd214de4afbc608bc0494e95cd381da5e25ca2e361f09a6c488a3372f2a390954a2c4802f35b123df2 SHA512 e41221b0c3fbe36bc4944fd3f159d378d399cb073ddc29250186ab6922e5d9d1d70d6282f61893d6352bb4a51ca339cea2e443f4743687b46e68becdcdcd3a7f
+EBUILD gnome-power-manager-3.30.0.ebuild 1138 BLAKE2B dc65774e3e2c3c5f0074d65321d771cea6ef5f72da9288f167a75e6208938251c4770d7d3ad2352e97bb63f229e373b4b8218fe3f517d1552ef05a3e1a11f8c2 SHA512 5e4023afba1c3cda680fa47005ae542a7234878d5982cfd64247f58e4929703f3c9d11165ff280c0847916af1a6763dab01177919f4d683f4c7e2611fad638d3
 MISC metadata.xml 421 BLAKE2B db2e0d7210e04256add24c9bfa054291ffcd6cf8b52107c184b61b27859589ed17bc3ef2037cf3eaf1fe7a8ceb3ac381c67f6c3557f0d960ff0f1aaf67e9bb99 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild
new file mode 100644
index 000000000000..7b4ff33b41c6
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME power management service"
+HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.8:2
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/cairo-1
+	>=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	>=sys-devel/gettext-0.19.7
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
+# (files under ${S}/man).
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test enable-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 97a0df4093d6..ebfde12976ab 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-software-3.22.7.tar.xz 3865764 BLAKE2B c23e3b9e34a9b233a584a920fcd5969b3ebb5fa4227da147870e71c1531da6c3efda913149a903667ae1725c505c1c842aac0a76b439a2730bf6c837f39757fc SHA512 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825
+DIST gnome-software-3.28.2.tar.xz 5181868 BLAKE2B 4744ff13216ac1421700ef9c5ec9fb540ffb527ed8bff1bd2f7b90cb5c9b768180e3b30fc0b44724e27479f56f8867551b4b19a9496664418a6b6cbe0960623e SHA512 ca22ea589c19f3c5aae32fb2540646d3b3c8faf86f857dd414caf61b716bc50dea16281955c594a629f684da5ac87eeada6ac68247a9b0545600b739fa436dd7
 EBUILD gnome-software-3.22.7.ebuild 1905 BLAKE2B 37a604c6a5f8d29c2cfc3f8e8a0ab83d10e97a8232dcbe8bc62068998cc251686f53122e27c04db4d309f51b466431dc8e29723b5c197c9b3da76f3c0238ca58 SHA512 39cd8f54b680ade58142114ba78bc56ee18655a24659c4cdb3f1e3f2c9df155bcad34bf1b6a333a29ac697b50ef067eb17f6296b91dd0483985e6a884e16718e
-MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
+EBUILD gnome-software-3.28.2.ebuild 2279 BLAKE2B 401a34339b7d8484265b50ba83ed3476143aecd5eda7f49b6d75c392cda1e0ce19b0b47533fbdb6dc4c3ceb8f15572e20418d58e6e311d823cd1ba1ad879f5a4 SHA512 626eda6b4a952247501413f487e6c0fadfeb89a8215778e87b4646762a709675ea160bc01bee42d62e9f4e7e09a341d672c36db23765349654c0dde810a4b9db
+MISC metadata.xml 364 BLAKE2B 55dee83c2b28ef3c3ecf738dc837455c9ab16351fcbdeee41726204d7d246ae42d7fd129e40bedd8563d3fd05cf4e82b6d22faabc06bff7996a1d87b7cdbc9df SHA512 a19e76913149b546abd9039dd4a51af6f74b59580c79f0370e7d95cf6e66b129f71d152c3dcc64fe237b1eab22c2bbf97d521b0a7bc1f46af6e7671770310e83
diff --git a/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild b/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild
new file mode 100644
index 000000000000..3556c78411ba
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-3.28.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firmware gnome gtk-doc spell test udev"
+
+RDEPEND="
+	>=dev-libs/appstream-glib-0.7.3:0
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/glib-2.46:2
+	>=x11-libs/gtk+-3.22.4:3
+	>=dev-libs/json-glib-1.2.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.52.0:2.4
+	dev-db/sqlite:3
+	gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= )
+	spell? ( app-text/gspell )
+	sys-auth/polkit
+	>=app-admin/packagekit-base-1.1.0
+	firmware? ( >=sys-apps/fwupd-1.0.3 )
+	udev? ( virtual/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+# test? ( dev-util/valgrind )
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# FIXME: investigate limba support
+	local emesonargs=(
+		$(meson_use test enable-tests)
+		$(meson_use spell enable-gspell)
+		$(meson_use gnome enable-gnome-desktop)
+		-Denable-man=true
+		-Denable-packagekit=true
+		-Denable-polkit=true
+		$(meson_use firmware enable-fwupd)
+		-Denable-flatpak=false
+		-Denable-limba=false
+		-Denable-rpm-ostree=false
+		-Denable-steam=false
+		$(meson_use gnome enable-shell-extensions)
+		-Denable-odrs=false
+		-Denable-ubuntuone=false
+		-Denable-ubuntu-reviews=false
+		-Denable-webapps=true
+		$(meson_use udev enable-gudev)
+		-Denable-snap=false
+		-Denable-external-appstream=false
+		-Denable-valgrind=false
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
index 4cbddcaa19ad..74322fe8c80e 100644
--- a/gnome-extra/gnome-software/metadata.xml
+++ b/gnome-extra/gnome-software/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="firmware">Enable firmware update support through <pkg>sys-apps/fwupd</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 0c79626008fe..97fbadd223c2 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-user-docs-3.24.2.tar.xz 14167700 BLAKE2B deec09954a9c3bf915c86030d13df70efec81090c74744fb98192a1e9727cab2bd54ee608f1f3bddcf8707f6a3a6e1ddaeffdc5175e0d0f2ad4ab2e890036330 SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d
+DIST gnome-user-docs-3.26.2.1.tar.xz 14538856 BLAKE2B c51f8a70209255e93137411c7aab5f61f0cf2d9e00924b1a7728adaa38579702556540c01967e9fdda1157e7304d38ed6e765073e50fffc02cb2e719abbfb597 SHA512 eb1bb873e1b8871e07ebd6a4afc694561b5fa4ff30453d25bdaaa530cb4910e8bbaacd36fcdb7f141f9f52ee8cf34521a332856d60c18a9385bfbc2501d13d97
 EBUILD gnome-user-docs-3.24.2.ebuild 936 BLAKE2B c73905e25c9a419e3c8999f7a09ae702becd42b1a526d90342bc3b3436e63af99631f00875526940f387a98ed39d42b5383f39a55990bacb313f15113385f5f4 SHA512 1b63ecd8d58c1110c79134c3679a715a3fcb09e075fe045ce512d5a83ad82051d691da674bc7880f5a6ed7a0183957e172ee69764a020d5313061b42ad0c66cb
+EBUILD gnome-user-docs-3.26.2.1.ebuild 935 BLAKE2B 9351366198049ce31e19303353ad07c3896452cc390102444e271dffaafd6967fe9d00910743ffbca368c3ddb8c531767d16d12b60b9f0f79cd4858201d97ab6 SHA512 da2b18ce40d0d5fed4729eba0a8f5a8d9ea514fc6d2314721b9e8eba715633f4a55230602a725401bffe9c3b42d5149f0a07fd4295264cd7521f37412a5cc443
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.26.2.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.26.2.1.ebuild
new file mode 100644
index 000000000000..0ec2de174a59
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.26.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 29bb3b06716d..9426937c0a75 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,5 +1,3 @@
-DIST nautilus-sendto-3.8.5.tar.xz 382440 BLAKE2B 30c842c04838c52eb41b1d808828ea7a00a9811a634f96e7bdfb559eb01569db6bedf0f4f6b504df8a5a13c1400ad9ca548298faceee9abc97377d034ab41dc1 SHA512 d9b504d5615e761f19b7b4610d394ac9b928023163b3e416aca114f168330d3b35617ee8e80338cce2248151096a6e2094576e7978b80076d5eedb9bb847bfa3
 DIST nautilus-sendto-3.8.6.tar.xz 109428 BLAKE2B bc1f0798962d09ca05a64a0db7b98b697c68c7f63239eaf59278ebab7039061cb5b04b0235209db89bf537219039bcc8fff49c9dba2379fcbff32a7f9482dda3 SHA512 c690acdd6d53bde2fc2898362d1030b04312b857924e18735bb330621c64ab63656612a36b646fd34b586af5c34a93bd37c3f969c93bd87c4efe870f55934b92
-EBUILD nautilus-sendto-3.8.5.ebuild 997 BLAKE2B 571fc12497f3238790e580b907793fac2a09f3b54f0c0b4ad900c76f2df54e6b8cc3e7388db9b105099c9aa64363f154ea767a7cb3afae8cf630651cecb71dbd SHA512 a1cec99ec57bbfa246e6baf6e513dc69ed2b15e27749f522474dbb5ff486d2fba7132c5ed12b78d51e6315cd043a31cf22038e2aae91d48e093d807a8df32b7e
-EBUILD nautilus-sendto-3.8.6.ebuild 678 BLAKE2B e82993cec56339bbe5c7520f5b85c55ef837887da12984cdf2ab94b7dff5976dc0ead635d3ed463204d0c594b7a7c89562d1dbeccef97233d34c99fa27517735 SHA512 9c0596ccbb8e14d4fa5d5993560fef9ca3abc101d17c2b19e097d5b7c1703c6f21ae1ee9d7bba8be2cd87af3785ed72a85fca08ede806ed1fc52c98c906677df
+EBUILD nautilus-sendto-3.8.6.ebuild 673 BLAKE2B c2e9807a0b2e94b4aa3bd6ed4e237f86cde0c90a96fe49b3d5187456bf94f8ddf1ae4e8653e72aa8c47ca8963134f9ff4d9129974008174313b00406bdaac765 SHA512 7eeddb88d30c75306fd3f1c79049c702fa761115d1fc9aa1fb634a8ba543b849757a16ac5018447c21bf7a514f2bc57741979e99d1650c1c58bec0259112ffd5
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
deleted file mode 100644
index 99ff5a458ea4..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A nautilus extension for sending files to locations"
-HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.90.3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Needed for eautoreconf
-#	>=gnome-base/gnome-common-0.12
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Does not require introspection at all, bug #561008
-	sed -i -e 's/\(^ \+enable_introspection\)=yes/\1=no/' configure || die
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ')
-}
-
-pkg_postinst() {
-	if ! has_version "gnome-base/nautilus[sendto]"; then
-		einfo "Note that ${CATEGORY}/${PN} is meant to be used as a helper by gnome-base/nautilus[sendto]"
-	fi
-}
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
index 08c1263ce189..cf4b4bd28513 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.25.9:2"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index fe02453f9823..46021a4fd9e7 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,7 +1,9 @@
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
 DIST nemo-3.8.5.tar.gz 1424948 BLAKE2B fc773f7a1666d94beabfaab3b1e97c4a6f32cd61dbb2e5eefc57cb3fd577df780f5d220501d7dbc6c67955afb9a623d36d1631c8b3c5e201894529784ac1991c SHA512 8ae4eafdd056e7e33c722c96a82e8bb5b10617823397927a3247e27bde14a3083f4402cd7e7bfc6a4f7802fe8c7aed005fa912a9855b6accb36af3a7f63b3188
 DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
+DIST nemo-4.0.2.tar.gz 1446758 BLAKE2B 37141bf514b4a17a41876a643f89cb489a7991d2ef0792a23a9b5b08ff1462733e820cde3f23dc1943dec90eb57e9d68ff1e58e526026c738d3f3b71cc0b7957 SHA512 d2c60f379092dee79902877beb2d47d2cfcb4a22b1f86fd84fafb96367c74cc2cd060bdcf8c7fef28ef5ff6df488a4a15f0c8b9fb1680eda26a13208a4a5742c
 EBUILD nemo-3.6.4.ebuild 2083 BLAKE2B a42237f3a60077c8c317c0bf986c3fa35b8850a5a76adee061c7dd036dc6f2a25623182cfe11b7aa44a6d0966575d36b853ca8828f0d1eb9e4c1742466b1f8ff SHA512 a0e21b561853d86f9dd5304112bd924b46993d163c86354e9937dba2105d830d465e872e3f5ad84b38692ea039647432b26ef4f0c9be643f92a5342c2b9eefcb
 EBUILD nemo-3.8.5-r1.ebuild 1969 BLAKE2B 51889a5ca1b76e4a460ed0ee5b22113fe4ab541e1be75a8a091ee9a3face1a621a452f1f58a93970957577918b0f28077fe054785f2e98f80f34d63f5385fbda SHA512 22be7cd23b05e32538d8e1b979e2d46970825773df03dae718fbff727fafaa39cf871082da9c5661c3ed4811b91bd0af79bdf570923ce1d5256de248a546f89b
 EBUILD nemo-3.8.6.ebuild 1966 BLAKE2B 4424c9d286bdf410e328db263ff4201a269ec81443bf0cdbcc693cb9e3e7484a014ec68c0c30a97fe2aa5c19123ce1928e963ea53c25d3f4cca079cd8f97bd5d SHA512 3b89e6f7f1b6d1e919bd1665ff9f434c7bc396a43c031f852e4c4cec5fd1293563b16e3335d1ecd26abd996045e75d951006897a923470f14f07f1b95c71f9a7
+EBUILD nemo-4.0.2.ebuild 1966 BLAKE2B cc6f9016a31eb88a7d4c3c0146af3aa5920698ec70abcde5e5978e27c36752da0d450f4a98ad5803184b50aab6ec6f88a6fb7bb1ee6197fd3dc5b16bb5d2bdcd SHA512 7e4c2c94da9f509ece08f8582cafc771c1248884dace50f25b01bedaa717f5d994199863bcce4002915ed0a0e0020ca5b5780bed4e4759ba8f6edaa6d33c6434
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-4.0.2.ebuild b/gnome-extra/nemo/nemo-4.0.2.ebuild
new file mode 100644
index 000000000000..d956a188f799
--- /dev/null
+++ b/gnome-extra/nemo/nemo-4.0.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit meson eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit selinux tracker xmp"
+RESTRICT=test
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/xapps-1.4.0
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+
+src_prepare() {
+	gnome2_src_prepare
+}
+
+src_configure() {
+	meson_src_configure \
+		-Dexif=$(usex exif true false) \
+		-Dtracker=$(usex tracker true false) \
+		-Dxmp=$(usex xmp true false) \
+		-Dselinux=$(usex selinux true false)
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 00754fa5e1cf..5738d8a44545 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,11 +1,7 @@
 AUX nm-applet-1.8.10-cert-chooser.patch 1421 BLAKE2B 6c867f5cca1c3b67a27cdfc9a80da728be65f80a8619dcfa0d53f910884e56d7cc1e6c2aa4a2661079d29f3abd49257a0720d59c09d0ba8024e140dc086ce033 SHA512 79ac1445ee0885b63092f28d2fbfd74b6b926696d44ee0ff47d079adc293301c05b8984ad812c66d4b7cab34c32902faed467fee1a2f14af66d2c43914858ed6
 AUX nm-applet-1.8.10-vpn-crash.patch 4613 BLAKE2B 44dbc67736d2025f177de3c29961234c8f8f1f0002bd7a4275cdd2631e5a3961f011c73c9c1a9ee77b2471945d5ce83c5120b2b26e8395f5666338e64b067359 SHA512 e2a9bc66b13f84270ac9735315d197c1ab264c99e5941218df310ebaa40900490661dec5f5972734e75c89b6db27530fd6ef02ad91a61a20c0eb388cff0b42aa
 DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372
-DIST network-manager-applet-1.8.14.tar.xz 1513668 BLAKE2B a07baa11717632333b4957e6cc60b9ee8d9c656874e99337d5e5c9d115c99f10daee94b2a75f72991fa4a20d268122e73cf2ed74f41d29bbee7614965f0b9900 SHA512 e446a2e90faf17e672fa79a53280957dfd9a7a022293dfd578b4ebb71e821c2f387f8ec821c2dcd9a24d1e00e0bd32a4ac3c5d802b9a4fdd7f876c870f406eea
-DIST network-manager-applet-1.8.16.tar.xz 1521776 BLAKE2B 60d73846b365cc73eac2d5cc3c2d5ab8aa28d6fdc532db7eedcbf6b280db26a2c705829f9ce6c359690a9d6b44279215e7c34bf9d84dca749dd8535c09db4537 SHA512 d96b525c74095bf7912eef0081ee888450b13ba8799a5a0c82d0ac71d8b227b39336697ed7321f5d61829f75fa13971ee2a282fd3d6be71c419f23fd4b88ec48
 DIST network-manager-applet-1.8.18.tar.xz 1550448 BLAKE2B 93e0075b87c13f81d3551a62da2cfc8fa41f478043c1d19540aaa6fa3ae149ce1f08d931a8141473bb759e09fbb231bd29e9d1aec8f97fa670c059b83489d48e SHA512 4871d95f3260beb8c3207e5ec8e25437b3d01758afc3bfe7d877774b21a05f4523449ee32e4cff27c082fefef88fed01db718d2227d6896c3c9b85d09cee927b
 EBUILD nm-applet-1.8.10-r1.ebuild 1782 BLAKE2B d4f25b89b7005270718ac2c0ede3ee063a33f8b434b6033826b5ffe793d7be4d409c0227ccefe84f6479545c636799f22e775ba3f7b8b84cbc71fb80d986e91f SHA512 03855f3ffcf930d139197f33cf2a646dc17071d2634a65021949c2e4845e5244364672b235de56a09828ef162cd1320976481df3e7026cfc802535b1646a966d
-EBUILD nm-applet-1.8.14.ebuild 1623 BLAKE2B 0a7fc5818a79d0058c905433c9db8709f9737370f5b3193e6b6f41239dde19bbe06dd10af9503d46804c50d0e285f192f1a34eeef8a6665cb4e028f6d91324dd SHA512 f8b397039d65c93e7b682b3f6105e8b3cb958da199f6c9e58a131d35251096dde010c129ccaa3ccb66b186cae0a92eade06ac7a1a3164bb9be186628175c6f6d
-EBUILD nm-applet-1.8.16.ebuild 1625 BLAKE2B eb33199b33c95903c88f6e785f25f86778b6ef214a09a6bed46b4e19e6e0cc5083bf62a1e192a788908f02b6a11be2b1aa93026b0f480beb73ba838023eb77e3 SHA512 ef0bae005c7bc7267ad984f84931e0e84ed096326314d62eb56437695dbdb812b1610aed7670eea7c99d495d289afe9166207f732e4ec7597d11757cf77e89ff
-EBUILD nm-applet-1.8.18.ebuild 1628 BLAKE2B 8aaba65e02cc90ade9e5550930630f68e59043fc25cb394e451ae3106fb62dd5ea6ab29959d4ffd2a3048688ca402bc2c420d9a92e31f4d22e8dab581f45a5af SHA512 d28f4ca92eb64caa295d044657b70793b36fdaa2607c667f6792d9c90d1867532637054004e74641677a819ab3d6b60920dec702d0b83b6e304017f6f6fa5089
+EBUILD nm-applet-1.8.18.ebuild 1626 BLAKE2B 330bd42d3950feb6e2937bd483fe25d169fb32b8050bb80e21caf03323815eb27108b9765255f99d50ed4260cbe5a356c4efd84adfef07657400b846fe31b2ba SHA512 33d9cae3c3f5ba3161648c5dad974366f9f5c2590677dc58a8b8c5f8621d102b3ba1be6e414897264eefb84b35e8a3a9635836cfeeed956717d8a5b8c275e528
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.14.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.14.ebuild
deleted file mode 100644
index 7fea5acad5e3..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.14.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	ayatana? (
-		dev-libs/libappindicator:3
-		>=dev-libs/libdbusmenu-16.04.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	virtual/libgudev:=
-	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
-	local myconf=(
-		--with-appindicator=$(usex ayatana ubuntu no)
-		--disable-lto
-		--disable-ld-gc
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_enable introspection)
-		$(use_with gcr)
-		$(use_with modemmanager wwan)
-		$(use_with selinux)
-		$(use_with teamd team)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.16.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.16.ebuild
deleted file mode 100644
index 0b744571f329..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.16.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	ayatana? (
-		dev-libs/libappindicator:3
-		>=dev-libs/libdbusmenu-16.04.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	virtual/libgudev:=
-	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
-	local myconf=(
-		--with-appindicator=$(usex ayatana ubuntu no)
-		--disable-lto
-		--disable-ld-gc
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_enable introspection)
-		$(use_with gcr)
-		$(use_with modemmanager wwan)
-		$(use_with selinux)
-		$(use_with teamd team)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild
index 94a340777867..2a27396ee54d 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index b29000c674b6..57aecbd7d366 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,3 +1,5 @@
 DIST sushi-3.24.0.tar.xz 297332 BLAKE2B a01947627e9ca711f9f1d634f2791ee79e414bab38058ca4a8bfd822a2d277522fe99d66b3364f46662ee0fc1fa8a148f48ce8c434fd0d7bbb7ef1c159f2ea12 SHA512 b49e9c1ef1dc4c74ae06f6da9a2f428ed4ee3ec1ca3ba04c483ddb1bd976e6981466456d27a641048756a1ea0bf2fe033883059895e889950d0d0f340535b29b
+DIST sushi-3.30.0.tar.xz 296940 BLAKE2B ff8617aabab16d41c9b072f8cf9774e4f5ce59e0dada05dcad23ba6929005c963d86a1beb5c2a3adc5e8cbaf8a6ce769b48ff53f4979db9f1853bbed0f80fb2d SHA512 48d2b960c2ebe86cdfbd0043968acdd6864162368941b921f25e137e6aeb2a2513738ad4d8c6ef5d5c6d2863e6ace5d2819e0a5dfc487efd20a1914a7cbcc40e
 EBUILD sushi-3.24.0.ebuild 1397 BLAKE2B e70854e83c0ad23bc2c289eeef570624ad279636a05c2e19d62b0c0f103a439d7a183f8dd2148c78bd13d2631ddd25e804bf8aa8d782440d0528f8ae4c726bd7 SHA512 0dc8e816b550fc5ab58beeec4f379442adb23e9fbdb164551a4ab5551e604e3171abb4c0c5ee49f54ebf4ac3d7397d085fbc12006aa4693fe620e196351be130
+EBUILD sushi-3.30.0.ebuild 1417 BLAKE2B a001540a7312d17495835b3e2fcb294f589a1c8fd6bfafdc64f90b7576fc3c794e12ab5726426aed458eeee0c1455d26cf5f5ea8d799f4fdad6791fd460c8634 SHA512 c1cfbf96bc0fd85e763096a68ec64b33043b1c4845e4dde07ea6856eeae44785063afacf36de1e5467b94517ab6d7a29b6261b180cdde7d949d6dc01acbfb0d0
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.30.0.ebuild b/gnome-extra/sushi/sushi-3.30.0.ebuild
new file mode 100644
index 000000000000..de2d87e343dc
--- /dev/null
+++ b/gnome-extra/sushi/sushi-3.30.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://git.gnome.org/browse/sushi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="office"
+
+# Optional app-office/unoconv support (OOo to pdf)
+# freetype needed for font loader
+# gtk+[X] optionally needed for sushi_create_foreign_window(); when wayland is more widespread, might want to not force it
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.23[introspection]
+	>=dev-libs/gjs-1.40
+	>=dev-libs/glib-2.29.14:2
+	>=dev-libs/gobject-introspection-0.9.6:=
+	>=media-libs/clutter-1.11.4:1.0[introspection]
+	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[X,introspection]
+
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/clutter-gst:3.0[introspection]
+	media-libs/musicbrainz:5=
+	net-libs/webkit-gtk:4[introspection]
+	x11-libs/gtksourceview:3.0[introspection]
+
+	office? ( app-office/unoconv )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3.1.90
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 74ac371ae297..c07d60f25dd2 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-xsl-3.20.1.tar.xz 568400 BLAKE2B f61151777eee346d08ecee2903fcf34759581b782662658a6af68f6623e62f9773ef842fa430655871033f39f10aa50481543c4d88f94c6484709fcd3d3776a7 SHA512 7ea22c3180261917d1a277a9b5023f9b2b22346bc3f55cdb1c61c4ae8f78411da93058b55f99c25c9a1bedad21ffa6c3dc460e1ee98614a84a4efa2c2449baac
+DIST yelp-xsl-3.30.1.tar.xz 518444 BLAKE2B 013dc16b04129c714c1938a0cb02f9f833a5a234dc1414387350c01c6f7659e87b0aa6b40e063605b0e5858e2bbf5201410b892ad728086cbca117e4bb942d74 SHA512 34d3a7a95af72a6676db1da2e6bf0fe1dbb3a69b1a82cab2998e305a76dd140012af129c204531c9bb03c5e0593286a4d8833e68b401903e967005f422c6a54e
 EBUILD yelp-xsl-3.20.1.ebuild 591 BLAKE2B 7168a720b5fccd8e694b0b5c9ac78b3a7e1ca56b302efe52b01ad5b957d5a5ef54965b71e7b55c8900c4c03ec320a4f0fc1ba802b0fb3dd10dfc0534e7fd3198 SHA512 37205b98bebfd7eec5c1551e8d02e53ac48505dbd6acd869ff517dda29d9a2f2f6a099fefd06da09c36a466651fe31bc0d08ec84f6fd070e970c9a559181f1d8
+EBUILD yelp-xsl-3.30.1.ebuild 599 BLAKE2B b73568efa06fb2dbf17e578c2a2d9c131a5c0b8694ac1dda74c4e6a8eb7e9dcd67bbd303d6e855b209c4ebb0383c20d8a7b78538f248a4d61262530383947267 SHA512 aab22b161e231f2390f1cee598cfa12fc0535a12da172e1be8536eb29d224ef1d67461c02fe8dc3eb8b992d16b30439d7d1d13858d5b01829130d147576e541e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild
new file mode 100644
index 000000000000..cb9510deef39
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.30.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/itstool-1.2.0
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 22fc52ff438b..e13a6a2bd62f 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,4 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-3.22.0.tar.xz 1383500 BLAKE2B f3422c0e8370f42ce73a27d0336d6def61e8d43d9736946e65e579548cbcf9b52afacbdcaf0e8b8733dfe1dc0d0efd53ff6d73377c4e5bbaf2106b8cc42b10a7 SHA512 ba31c7801fc4642d9c4dcf34d4b8c02005f2ebfab4ecfe4e726685c5fb95f05311fc3a481f9b2d2e8b211395e4c932adba0e68b57d264cd1f6065402d9143d32
+DIST yelp-3.30.0.tar.xz 1393176 BLAKE2B a00277f7a2498d2a6c51c8375fc52293a40f111ab441bf00e25fbfa054914e4752a65b8fcb5eace74393c61431a0e5c9bcebe8b35dc8b00f96d3a3c362079f77 SHA512 fd6da1731e55bd796593f0ed4d566b380996d21ca0264033a5b6afaf0ba8d445a2b04a9fcbe0a1091f2244a6ee2c92814bbb86db8de59b2c230b746dbd0df564
 EBUILD yelp-3.22.0.ebuild 1192 BLAKE2B 84234d94a25ce188f6377cc5dec1c130fbb2bb9f2cfa3878f4ae058341554892c586505b45e21ebfc57ab6f69bf0dc601f5c0b63865f0e7adafbb2535c67c6e2 SHA512 4e05de732fd5beaab9c997caddd7abfe68af62b74a2bfade825bc28e39f7c67b35bbac4e169ce38a3d771bcd87fc8c5d91c609b80da3318da9bc600da906a47f
+EBUILD yelp-3.30.0.ebuild 1262 BLAKE2B 78dbc27a36385f6d1c64a6d4740e0e7c8b8fe7eb2ae32c78d0f1baca862dce29da244af90e6a3465ee4873ad3acdd05b7651c11232f8fe33cda0a195baa112a8 SHA512 eed35a6b622e77c3037412150aac4e133165d9e5b5ecfcd6d5d44e05ca41904bcc96989ba2e6eb0504b0cb73c9ad43db22c3f59d351bc542a098dbc73a77ffc3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.30.0.ebuild b/gnome-extra/yelp/yelp-3.30.0.ebuild
new file mode 100644
index 000000000000..28738ada777a
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.30.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.27.1
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=""
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 356d0b2f70a4..341eca691cff 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,3 @@
-DIST zenity-3.24.0.tar.xz 1085124 BLAKE2B 2be50461c8575b5322319e3b35a9c833ae87f2e35abfdb27bed61dbead1b31dc31d551c8973634a7a0f0abc178ee6c7a4bb24377632df7d7fcaf77780f7fd4d6 SHA512 b24291166221cc2dabeabfeab7ca00ca63ff21c12a4eb327cd35ac43f485b8d4a858dd717df1b35b8bd3fd89d0bb235609855c6d349b76879b0f77b4fedd4dd9
 DIST zenity-3.28.1.tar.xz 4458404 BLAKE2B e2ae199ab51dffffbe4bf01b21bbff588a4f71328b385bdd92f3228c6971b248d50c8f890c818ae2496f595cd1609dcb9f372bff13f3dfb653d179108074bdd2 SHA512 07cfef3dc17b3d321e6abfb15c7d035caad7c2cba938263920c503e67d35e9a1dc86b48255334e50b58f6998eb4c064cc24ebd71d02f278b21b568500daae0c0
-EBUILD zenity-3.24.0.ebuild 1108 BLAKE2B 32be4a94db30a9b9f4ed49607c096b9375041b360a10972a23b8441b4685082326375b3835cb8321367ddfde751fd2cc6fcebf8e6649618793da946603f35f3b SHA512 dafbd0107b9135b22a575d235dd6921928d2bdbde5dacd500798151255500343892978226b14a4c05359c52a55ed2b2ad67b3d8b948debfa49a06bebeaa3c47c
-EBUILD zenity-3.28.1.ebuild 1110 BLAKE2B 1905762638335c0cf2fc5b9032cc086491d62bac3bc01df803c63bd0f608467de1ecafc1fe4159d42349306ace338052533c7368337b1c086b273a473aeddff4 SHA512 17b9de028333cf7d86e52e892877aeb7c2fd356be73ccd349211bd56f9c0a55cf81b28eb8e7437a4fcb0f53c3adc38e761026c6022ac4abaf030ff087e9293eb
+EBUILD zenity-3.28.1.ebuild 1105 BLAKE2B 31a828356c7b44886cb121f5ae5183c191b34e31b65fa917574e0e81c9a22a81a8965a26684d2608eef36d20cc5255649814461888b30426987611f09e1338ae SHA512 2404c2a9e5d528ce53e2d941e58248da1b79dbc7dcaa61bc549ca2fe8d23e7099eabf4d668d7a4f4bdeb5e7caef5115b6ab7e6614d96f86278ad6d39376f693e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.24.0.ebuild b/gnome-extra/zenity/zenity-3.24.0.ebuild
deleted file mode 100644
index 3373cce2a49f..000000000000
--- a/gnome-extra/zenity/zenity-3.24.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3[X]
-	x11-libs/libX11
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable libnotify) \
-		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
diff --git a/gnome-extra/zenity/zenity-3.28.1.ebuild b/gnome-extra/zenity/zenity-3.28.1.ebuild
index b22c4741cf16..22cd106e0cf5 100644
--- a/gnome-extra/zenity/zenity-3.28.1.ebuild
+++ b/gnome-extra/zenity/zenity-3.28.1.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug libnotify webkit"
 
 # TODO: X11 dependency is automagically enabled
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /gnome-extra
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)