gentoo resync : 04.08.2018

35 files changed, 1145 insertions, 90 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 81c4a9ddc549..47142fe3179f 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 7e76de75aa63..4df58f149519 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,5 @@
 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
 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
 MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild
new file mode 100644
index 000000000000..1a8d61f02251
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 06d55183e05f..f2828f13e308 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD cinnamon-desktop-3.6.2.ebuild 1684 BLAKE2B a663d72bb18781e3e6ee22212d29bef6a49bde9fe434a78d5ceadc723cb975f48b04c1021f1390e6d676833ca9880091de4059ceb306778d3917e4dbe4d3d62f SHA512 1254cfe83cd36533bd8a398ea47b9bdeb95822768ada0e477fb1b810dc0b1ec73eef6fa0ff6b6aeb0b31f2c22f35ac82b8b4a7f8edcba6b56bd158c894b82e62
+EBUILD cinnamon-desktop-3.8.1.ebuild 1575 BLAKE2B 6e0d44dfbd5f3ba48cb9000e52af2dc57d02bb90a7dcdaa47be688a2798e56f30ffdd415d8ffb0ba1382be8197e384122ba0a19d15656db3deec786210e67560 SHA512 1830124b212ce6da7e8610412e83a39bead49d6773a41a52e2c4c412602aa3fca0d091fc2cae0133555780534120de09772aba620485eea1a7579688885d0539
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
new file mode 100644
index 000000000000..2124acb464a6
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 3b879affb623..4be035fdbbfb 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD cinnamon-menus-3.6.0.ebuild 869 BLAKE2B 605b700314515d29704c6a4d834c4d3a8911fb8d603743215adaec321e33a90995c117ee98e8e547460717295a61996ecf8248b67534e172e356d961a1b4c93c SHA512 fc67e347dc2eb02a2c641fbf137000e49758e6e7ec546f373779b0b18419702addc12e66d0ca39d25bb206b1c5938bab4822a3d9fa79083f24777b5747b6b290
+EBUILD cinnamon-menus-3.8.2.ebuild 871 BLAKE2B 052d9d7d79f0f45c8a40ad9eb8803cef75d2147435ed66b2cf07a19f0feab00f3cc32cf222f7643ea7631051f6fe5c38b48787dd30773694c44da03634d51593 SHA512 657908c263a9caeca19d9f2eb3b94136150355859ae271b1cd524e5596a438d9d0d279de3aa0139f959b6f13d92d3ec4eb9680c41f9ee396d800087904675a42
 MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild
new file mode 100644
index 000000000000..35270ece27e1
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 775b2869f252..9d847ea55bb2 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,3 +1,5 @@
 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
 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
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
new file mode 100644
index 000000000000..75c70f63c228
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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() {
+	python_fix_shebang screensavers
+	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 d144ce9be781..d0d69c3a6442 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,6 +1,10 @@
 AUX cinnamon-session-3.0.1-automagic.patch 1470 BLAKE2B 799b731979f9a5326d61ec130db092a6b52d10eb0f434302b49fa0996fc9b6c3073ff312bd5f84faf1b12936919209db6159a7ad235f765af78b622b06b700db SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971
 AUX cinnamon-session-3.6.1-elogind.patch 1948 BLAKE2B 616dde6cb6612126074524df8662fc30cf59c126a37cfa9d82b09c086d31f47af64d9f96210a8d430b9eb3aca7279b93ce38f31e4574274064d103dc2f142b97 SHA512 ad8c067514318c126aab6d72da7004a0c07964cb9cac8c3763ec39b07d222a9dd6425eb464f1f0047d55c61f8a335611bd46e1546e2f170b43959207ff98c75f
 AUX cinnamon-session-3.6.1-elogind2.patch 743 BLAKE2B 4827c2cc5c8bcb74b0a31dc81c4fd4a25ade00f3a22371627cc3bdb5e3fb4476f7b66954ab6101681bef04bd7e38531851f2e371e6dee32c6294fc6f6faa240c SHA512 03e7beeaf6a93aaedcbe070c6182d3fcc898bd8410a65c63a9c5dcce310e97a4a4654e88e91e7aa7d8c12eef12d8f02eba89d8e007842c27d04dc9165c642de3
+AUX cinnamon-session-3.8.0-elogind.patch 712 BLAKE2B dd1ce68b30e849a62dd563c3bd640639974763f4aae108ff379adf942289fdbda46367a13a9a640e11750ca978a0f28dc3c6cb17f309c7e7a44bc3b7c8769ea6 SHA512 b0f04b560cf76fa040ce838cd21e811b0e627187e7500e5bf7717f5b1ba242db0485feb986ba0e89e5daa044f0268047c9ff37b9a72c41cbda16975929db7178
+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
 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
 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
new file mode 100644
index 000000000000..1dd7ed6cc952
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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]
+	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-session/files/cinnamon-session-3.8.0-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
new file mode 100644
index 000000000000..7ae0fba56978
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
@@ -0,0 +1,26 @@
+From e9857299d098d6e62d866fa738cf53197e45c8e3 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 9 Jul 2018 13:26:51 +0200
+Subject: [PATCH] ELOGIND also needs this code that is wrapped in LOGIND
+ condtional
+
+---
+ cinnamon-session/csm-systemd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
+index dc2aa2e..039abd9 100644
+--- a/cinnamon-session/csm-systemd.c
++++ b/cinnamon-session/csm-systemd.c
+@@ -23,7 +23,7 @@
+ #include "config.h"
+ #include "csm-systemd.h"
+ 
+-#ifdef HAVE_LOGIND
++#if defined(HAVE_LOGIND) || defined(HAVE_ELOGIND)
+ 
+ #include <errno.h>
+ #include <string.h>
+-- 
+2.16.4
+
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
new file mode 100644
index 000000000000..935541cf2a5b
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
@@ -0,0 +1,25 @@
+From 10148b8831ba26c7991b4643cbb05d92445f4b61 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 9 Jul 2018 13:56:57 +0200
+Subject: [PATCH] elogind
+
+---
+ cinnamon-session/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
+index 1d0db5b..4be50e5 100644
+--- a/cinnamon-session/meson.build
++++ b/cinnamon-session/meson.build
+@@ -77,7 +77,7 @@ executable('cinnamon-session',
+     xext,
+     xrender,
+     xtest,
+-    # elogind,
++    elogind,
+   ],
+   link_with: [
+     libegg,
+-- 
+2.16.4
+
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 305bc3622bfc..9d0483580665 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,4 +1,7 @@
 AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8
+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
 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
 MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
new file mode 100644
index 000000000000..538687301a25
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
new file mode 100644
index 000000000000..c12f2730ceae
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
@@ -0,0 +1,57 @@
+From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Sat, 30 Jun 2018 22:35:52 +0200
+Subject: [PATCH] Make account service optional
+
+---
+ configure.ac                                | 6 ++++++
+ plugins/background/csd-background-manager.c | 4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af5d3a4..a30126e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -166,6 +166,12 @@ else
+ fi
+ AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
+ 
++AC_ARG_ENABLE(accountservice, AS_HELP_STRING([--disable-accountservice],[Disable accountservice]), enable_accountservice=$enableval)
++
++if test x$enable_accountservice = "xyes"; then
++	AC_DEFINE(HAVE_ACCOUNTSERVICE, 1, [define if accountservice is available])
++fi
++
+ dnl ---------------------------------------------------------------------------
+ dnl - common
+ dnl ---------------------------------------------------------------------------
+diff --git a/plugins/background/csd-background-manager.c b/plugins/background/csd-background-manager.c
+index 282094a..a692c6e 100644
+--- a/plugins/background/csd-background-manager.c
++++ b/plugins/background/csd-background-manager.c
+@@ -135,9 +135,9 @@ settings_change_event_cb (GSettings            *settings,
+ {
+         gnome_bg_load_from_preferences (manager->priv->bg,
+                                         manager->priv->settings);
+-
++#ifdef HAVE_ACCOUNTSERVICE
+         gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
+-
++#endif
+         return FALSE;
+ }
+
+diff --git a/plugins/background/csd-background-manager.c
+b/plugins/background/csd-background-manager.c
+index a692c6e..a99b478 100644
+--- a/plugins/background/csd-background-manager.c
++++ b/plugins/background/csd-background-manager.c
+@@ -186,8 +186,9 @@ setup_bg (CsdBackgroundManager *manager)
+         watch_bg_preferences (manager);
+         gnome_bg_load_from_preferences (manager->priv->bg,
+                                         manager->priv->settings);
+-
++#ifdef HAVE_ACCOUNTSERVICE
+         gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
++#endif
+ }
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 8e52522469d0..48118663b70c 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,4 +1,6 @@
 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
 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
 MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild
new file mode 100644
index 000000000000..8f055fc0aec4
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 d9e248510d9a..77a2eb748c33 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,7 +1,10 @@
 AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8d67f098a7ccde319589c330736a9624537ac2dcfbee75c8971cb6b88cb49ae36b380b0fe3024d55c54e127cc2cec0d21ade17f56b9ed9be6 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460
 AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995
 AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
+AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
 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
 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
new file mode 100644
index 000000000000..26e4c59984c4
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{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-3.6:0=[introspection]
+	>=gnome-extra/cinnamon-menus-3.6[introspection]
+	>=gnome-extra/cjs-3.8.0
+	>=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-3.8.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] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-3.8
+	>=gnome-extra/cinnamon-settings-daemon-3.8
+
+	>=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-3.8
+	>=gnome-extra/cinnamon-control-center-3.8
+	>=gnome-extra/cinnamon-screensaver-3.8
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-3.8 )
+"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
+	dev-util/gtk-doc
+	>=dev-util/intltool-0.4
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+		ewarn "open-source drivers."
+	fi
+}
diff --git a/gnome-extra/cinnamon/files/cinnamon-3.8.0-gnome-background-compatibility.patch b/gnome-extra/cinnamon/files/cinnamon-3.8.0-gnome-background-compatibility.patch
new file mode 100644
index 000000000000..6f802fee6585
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-3.8.0-gnome-background-compatibility.patch
@@ -0,0 +1,25 @@
+From 21710409c0ed8acfbad98131d1664006d32181bf Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Sat, 30 Jun 2018 20:24:55 +0200
+Subject: [PATCH] gnome-background-compatibility
+
+---
+ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+index 6e279ed..ec47983 100755
+--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+@@ -268,7 +268,7 @@ class Module:
+     def get_system_backgrounds(self):
+         picture_list = []
+         folder_list = []
+-        properties_dir = "/usr/share/cinnamon-background-properties"
++        properties_dir = "/usr/share/gnome-background-properties"
+         backgrounds = []
+         if os.path.exists(properties_dir):
+             for i in os.listdir(properties_dir):
+-- 
+2.16.4
+
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 6f1d3b633360..eec94da5f89a 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.8.0.ebuild b/gnome-extra/cjs/cjs-3.8.0.ebuild
new file mode 100644
index 000000000000..dfb627aff795
--- /dev/null
+++ b/gnome-extra/cjs/cjs-3.8.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
index 09d38e1c5eb7..6b5dd5494b3d 100644
--- a/gnome-extra/gnome-packagekit/Manifest
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-packagekit-3.22.1.tar.xz 1684420 BLAKE2B 30ce96fdec5fb1211d06fcc751ed0ac01e386364af6025051766b25ee6eadb4a926c3ff5ed74d27c67fc5774497fac20cde0248a6bd9ee24a77ae9cad7e0080d SHA512 f8f5046f53c095f199cf75452a5f0c2cc62a54cd5337b696a3885358573b44d94bcf44b168a4ea8cbd00b746d0274437a5fc9cb10f0a55e9eb9f2dbd2a8e4f18
 DIST gnome-packagekit-3.24.0.tar.xz 2174372 BLAKE2B fd6b94c1e2bd9e29c73754e3c1625d6acd4e1931a80c61c572d6f1a90a3c1814cafea1358e64f8cb1be0308d00146716a3a5058a732702b14c3d6a9a0cc98d4a SHA512 af3291b11ad279d050fcd970e1c98257b65da5f36146d8e5f1f255ef1b17e6f2caf8073ce16623da130edaf452860788aa20dd2de6a4bbf639aaf9d3bbd7c095
-EBUILD gnome-packagekit-3.22.1.ebuild 2277 BLAKE2B 14854b16c43bc1ebdc62fc58bcc7fa8add0ad63e975d874ce8e438ec264fc8384b298fd8fac17b399903fca14e6fa09e06136453cb75777e051bd1843496260b SHA512 850a7e248b6b93aa1714003fd2e7a9614b5982ed227331dd6ca4a74ad0e4d069393b7852b09baa5731c6754c67c6f6d106e7b7a1b2a2716fcc947c819a588609
 EBUILD gnome-packagekit-3.24.0.ebuild 2241 BLAKE2B 24984de13082b7b6adb336bab3400b297baabe1256d15a213b30c6147f8bbd84d4ef5b53038b4edb2d8a2decc9da7b3adeb6a0e715f8bbc030e0022aa3de7634 SHA512 5a701a9aec0294d81c126fb157f1bc89fd1dab84e94e33c1a9391669a8fdd02b6d05961a2bb03ce0b3fba907832353e31452cbf2ecbf4053031890545871ec83
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
deleted file mode 100644
index 0fc509b13a24..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd udev" # test
-
-# XXX: test, upstream managed to break gpk-self-test beyond repair
-# gdk-pixbuf used in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.15.3:3
-	>=x11-libs/libnotify-0.7.0:=
-	x11-libs/pango
-
-	>=app-admin/packagekit-base-0.9.1
-	>=media-libs/libcanberra-0.10[gtk3]
-	>=sys-apps/dbus-1.1.2
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	systemd? ( >=sys-apps/systemd-42 )
-	!systemd? ( sys-auth/consolekit )
-	udev? ( virtual/libgudev:= )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-
-# UPSTREAM:
-# see if tests can forget about display (use eclass for that ?)
-
-src_prepare() {
-	# * disable tests with graphical dialogs and that require packagekitd
-	#   to be run with the dummy backend and installed .ui files
-	# * disable tests that fails every time packagekit developers make a
-	#   tiny change to headers
-	# * gpk_test_markdown_func: no definition for that one
-	sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
-		-e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_error_func/d' \
-		-e '/g_test_add_func.*gpk_test_modal_dialog/d' \
-		-e '/g_test_add_func.*gpk_test_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_markdown_func/d' \
-		-i src/gpk-self-test.c || die
-
-	# XXX: g_autoptr requires explicit type support
-	sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
-		-i src/gpk-self-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--enable-iso-c \
-		--disable-tests \
-		$(use_enable systemd) \
-		$(use_enable udev gudev)
-		# $(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
new file mode 100644
index 000000000000..4cc0e38ee48e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-gsconnect-11.tar.gz 1015034 BLAKE2B 470f9247987bf1ec9c37e658276427fb06e5406bbd862e33498935f860b955fa69219dacdbc4ee40cffe7257d74a01ddf018e19a81b0849a8879d997720c11c9 SHA512 134d26b37668e2dcc9fb3e96196cde1b6e17531050d5c91b2b9853bb3ef76e660b230a5ab9c77ded742541a7c871ed50e4d2a2facea9cbb29cd3a546a0a476a4
+EBUILD gnome-shell-extension-gsconnect-11-r1.ebuild 1431 BLAKE2B e27863fe0a059ef1a4c7261eb447fc6ddca0719d3376b23c1d5c36a98101fae39ec6e572be1b163ce78bc532b2f88daa05605f7a74f21b64424869f3bed71f86 SHA512 fc92d2010f937f1a188702e74813fe971f2cec0171a00a711fe9cb4acc46406fdd69e18576521494af893f2fd568c520d0728227af16c9661108bc738999706e
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.ebuild
new file mode 100644
index 000000000000..d2c5002a034e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-11-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils meson readme.gentoo-r1
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.48
+	>=gnome-base/gnome-shell-3.24
+	gnome-base/nautilus[introspection]
+	net-fs/sshfs
+	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
+	|| ( media-libs/libcanberra media-libs/gsound )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+src_install() {
+	meson_src_install
+	# Rule for install is not complete, only ready for install-zip
+	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/schemas || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml b/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 0a0dc8c611e4..441f82463cb1 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
-EBUILD gnome-system-monitor-3.24.0.ebuild 974 BLAKE2B 2ff42e344500a9c746eb1d89dc9b8c9c742625d09d967806847f01001ce44a412c364a86be6b0c9106c83d7908ada98414c40de98ba177bba3a4cf9a696d93ae SHA512 faa193df18b0b1317500364a2d371c7bcbc56dc7d25bf3e82581f73f63a3cc0f68e1e9944949dc481c145132ee5df31a202ee2ac25676f021c09a702eeb403bb
+DIST gnome-system-monitor-3.26.0.tar.xz 941144 BLAKE2B bde11ed78b10140916121df49af36b04afc6d9cb35fc1fa4f240ab8c109b79bfce5175d0e91e7a80c6da5420e13ca2aa520e76db9b79ea08d5dab23fcd8a301a SHA512 c2593371d956a4c11ad9ac4afabc996c02d743f9ba443192b0d955ab42464a02ad3fe19398b9489d33d552fdfdc2fb615e85d4dcb9342b821cb0b590fd3c3043
+EBUILD gnome-system-monitor-3.24.0.ebuild 975 BLAKE2B e54a3ec90a6820910ea86690d8797ae353167d9ab3be0f94fa5fb47c473c8e70061b243117b3c5326f88300097ded67ad0ae0b0724be74da5d56e400413397ea SHA512 9dde6c983c74559e361f30e80c546ffa8a7a55b2453d0a08d5aacb022028a6782e4a74e6a064f8bd5b59d40d8ede5aaff5b45011ad5d0d6d1786774c785d4433
+EBUILD gnome-system-monitor-3.26.0.ebuild 977 BLAKE2B 4fd66cfcb7582a6d91512288c01eed155e183ca41da79239815c4becdfa5aad9e16aacd7b1e8f9417dc1edd8b62cf00e5cc12756c637baf132b21ce55653c447 SHA512 9cdd7b2cca74907fc5bd8fd33e32ef65ffd62042a2c572e2434dcb48cfc7cd6f95b4d783eab27ac4478156845c101c33b3089be16884f4031d16ca58cf9e157d
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
index a091aeed701c..ec9498bbda92 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2
 DESCRIPTION="The Gnome System Monitor"
 HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd X"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.26.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.26.0.ebuild
new file mode 100644
index 000000000000..cfd6c2f7bcb2
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.26.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	>=gnome-base/libgtop-2.37.2:2=
+	>=x11-libs/gtk+-3.22:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-libs/libxml2-2.0:2
+	>=gnome-base/librsvg-2.35:2
+	systemd? ( >=sys-apps/systemd-44:0= )
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.41.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# XXX: appdata is deprecated by appstream-glib, upstream must upgrade
+	gnome2_src_configure \
+		$(use_enable systemd) \
+		$(use_enable X broken-wnck) \
+		APPDATA_VALIDATE="$(type -P true)"
+}
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index dbebfeb259be..c3e16f7593bc 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,3 +1,5 @@
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
+DIST nemo-3.8.5.tar.gz 1424948 BLAKE2B fc773f7a1666d94beabfaab3b1e97c4a6f32cd61dbb2e5eefc57cb3fd577df780f5d220501d7dbc6c67955afb9a623d36d1631c8b3c5e201894529784ac1991c SHA512 8ae4eafdd056e7e33c722c96a82e8bb5b10617823397927a3247e27bde14a3083f4402cd7e7bfc6a4f7802fe8c7aed005fa912a9855b6accb36af3a7f63b3188
 EBUILD nemo-3.6.4.ebuild 2083 BLAKE2B a42237f3a60077c8c317c0bf986c3fa35b8850a5a76adee061c7dd036dc6f2a25623182cfe11b7aa44a6d0966575d36b853ca8828f0d1eb9e4c1742466b1f8ff SHA512 a0e21b561853d86f9dd5304112bd924b46993d163c86354e9937dba2105d830d465e872e3f5ad84b38692ea039647432b26ef4f0c9be643f92a5342c2b9eefcb
+EBUILD nemo-3.8.5-r1.ebuild 1969 BLAKE2B 51889a5ca1b76e4a460ed0ee5b22113fe4ab541e1be75a8a091ee9a3face1a621a452f1f58a93970957577918b0f28077fe054785f2e98f80f34d63f5385fbda SHA512 22be7cd23b05e32538d8e1b979e2d46970825773df03dae718fbff727fafaa39cf871082da9c5661c3ed4811b91bd0af79bdf570923ce1d5256de248a546f89b
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-3.8.5-r1.ebuild b/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
new file mode 100644
index 000000000000..d22c0fb12ac9
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit meson eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif +introspection +nls packagekit selinux tracker xmp"
+RESTRICT=test
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/xapps-1.0.4
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	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/zenity/Manifest b/gnome-extra/zenity/Manifest
index 1fabd78322e8..356d0b2f70a4 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.28.1.ebuild b/gnome-extra/zenity/zenity-3.28.1.ebuild
new file mode 100644
index 000000000000..b22c4741cf16
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.28.1.ebuild
@@ -0,0 +1,45 @@
+# 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!"
+}