gentoo resync : 03.11.2018

16 files changed, 103 insertions, 209 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 728f5444b47b..4f9b645cc9f7 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 441f82463cb1..5a1cad56a9b4 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
 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
+EBUILD gnome-system-monitor-3.24.0.ebuild 993 BLAKE2B 2a65ab0a7c2e6d88ccd846c3d331f42183f0432959e90be92e7a1b6997fd759eac6c160ae4575cfe489c4844453b112a5c8c6276285d8c6994bfbac3cb3383b6 SHA512 18cf4da5a143b31a4af11469af74459d4f27b2a2121bdf95df505d0c04d6610c628721a258297b13edb0676c7a20bceef5cf7f27d568bf1831b5dc85817c970a
+EBUILD gnome-system-monitor-3.26.0.ebuild 992 BLAKE2B cac3b8e4152abd9a99f1eaf54d5b5b731f394c56bf6b3855b844c3b5ac5aa0032249bde7d66bcba93442f035cad056ebf5b102ddb89603be3252ee1f04f3aff5 SHA512 06d4345550daf88ea0e3cddee272f7d20730e839ac07e877d4a745b105dbea2b041bdfe195f970fe950015014525fac99052b04aab197df543d0d22a71972231
 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 ec9498bbda92..e4ba34a5b53d 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
@@ -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
@@ -26,6 +26,7 @@ RDEPEND="
 # eautoreconf requires gnome-base/gnome-common
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-util/glib-utils
 	>=dev-util/intltool-0.41.0
 	virtual/pkgconfig
 "
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
index cfd6c2f7bcb2..a213595de60d 100644
--- 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
@@ -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
@@ -25,8 +25,9 @@ RDEPEND="
 "
 # eautoreconf requires gnome-base/gnome-common
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
+	dev-util/glib-utils
 	>=dev-util/intltool-0.41.0
+	dev-util/itstool
 	virtual/pkgconfig
 "
 
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index b3d6dded6b6d..4a451c41e8d2 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,12 +1,6 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-10.0.0.tar.xz 1034780 BLAKE2B 9ebcff1f182de52aa12c40de93c80d2942316fb718330872932034cd9bee66e41a667bd70e6d632e17accda66413b18bdf9addf6a892510d5798ad21fa8908de SHA512 e097e54cfd4e6a8fd47992d163128bc8e87c0c6aa81718f900d7367fa6d88a528815c7bb87bfcaddd145aaa8b1c8068fdf6da6fe2a1c90381ff555b43712f33a
 DIST gucharmap-10.0.3.tar.xz 1713960 BLAKE2B 0a0412c7a4d46c25112d9bb33d64e82b448e981a2ecb9a5ed5ce5e96657e5264e14262b15c4e5af6b3d023c20193a7471071c5d346f0d48e22583b07e92d51f7 SHA512 0815ca39311db4dc3ff5202f1303cad72bc204f4eef4d2ec83465123ff856eeb552a583666419ad4a3bf9d3ddcf294883fc8e24e32c30814916b41bc14a108fe
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-DIST gucharmap-9.0.2.tar.xz 1023120 BLAKE2B f0ea1b2e866abea180c062ea2559f6f26b80d38c66aac838ee2e6371ea4a09a14842a51e2e4e7d9ffb0e0bf052a7c6f21e92843c8f36eb6edc52a73063bef0f3 SHA512 33fa2989e263ba30bc430b8181009dd5d491dd2b453f6047369dc49dafb4f58be67dd9f1320b7005325236519a794eb4564fbd39a1d976133001f4f983ae1370
-DIST gucharmap-9.0.4.tar.xz 1029684 BLAKE2B f2af9c422abceb98783b6ea6a29241383cc6220410cd45a4c1fc04ce57fc51bc629fc4560d5ad852b19f1b85fc0276e68b423b2f6579e8f973794b2528b9cb7c SHA512 2d2ce94796cb40bcaf14930624ddd788af1c49d464be1fc5d4ab8112df14054ce1324c86eaf028921266494f9fbb41d29a7b40db810fb15280d470fd26be6df2
-EBUILD gucharmap-10.0.0.ebuild 1664 BLAKE2B 81d087632398b74ad6fb3eba9cfc1e8b663b054db3cfdf9611d2ceb34215e1ba80af4686def075b93b8e1b1d1255d57e586474475e83cd37778e05654b8140bb SHA512 0352bcd7dcbac69699c57c45080875821a4dfe07e6dcc8ae6ef24aa82042756c5409fd7e342d8e6244ca818a2abec8f2d80e7dffa1fbe24e4f24aac67180f417
-EBUILD gucharmap-10.0.3.ebuild 1656 BLAKE2B e7585a19b559cb2e01d10b6906e0420ca58839c11c09251f2da39cd6e7ff7abc68d7f0b1f327b410cfde93aa3c8ef95c28795d1ec01094ffaf6cdd2dfc66e218 SHA512 c2cdc8664586879a80e0003bfaf92bbfe28aef6f4c64aa4d9cd9ad32f11e07481528f6e4cd39bdff0f4f54c271014de0aca5d55de8e882faa7c0422275f8aa4e
-EBUILD gucharmap-3.0.1-r200.ebuild 1470 BLAKE2B 9f817d96745a0fbf907aec0b13d6be14a99c815af50846ae6ccbd4a84d826d7ff8635ff893a69a9e0be4f9d199977264eb34cf60c8f75b817f4f2d3df73fc6ad SHA512 254fec449e286c8df0f273f5cde96d1571baebc0384a8e5ac69e17808ce14f7a49fdabd44b0d5f584c7935a33c7eb395c34db2df315d4ba9ae155471499bda65
-EBUILD gucharmap-9.0.2.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
-EBUILD gucharmap-9.0.4.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
+EBUILD gucharmap-10.0.3.ebuild 1671 BLAKE2B d8c12bc00d5b338edbe768d815b0ba41837c997bf19e1c4f7a74819bd25d4e1f915c95d49b3910f3b334f7659a7f99862fda0a057188f33d364ad9a1439bc096 SHA512 679a8133e468d0925106087accb8e110fb43ca6377d96b7fa2ecbb4168f043f8ed09258c1461ce46a756d49d78879719a2876b44a0a0fca542c5143df837b526
+EBUILD gucharmap-3.0.1-r200.ebuild 1491 BLAKE2B 3ecdcc4e40b9c05ea876c1a25ff8f578144f33905c0ee86b3a384992c16e1169ee24ce6f376e0fdf892d47472a353ab3ecb5ed8e7528bff887be1728100b65ad SHA512 35fadc3a1efac5e157e1215a79b0f05cc1ad20ec1a7b38f6fa382ec6e4de450004a2c3b48a47059e6777b17bfc67bcb05e69a016fb32c7a76f6c5f4e667196ce
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
deleted file mode 100644
index 2fb7f3ac86c3..000000000000
--- a/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
index 80975bdc6b3d..036064ce2844 100644
--- a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-10.0.3.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
@@ -29,10 +29,11 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gucharmap-3:0
 "
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
 	dev-util/desktop-file-utils
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.40
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? (	app-text/docbook-xml-dtd:4.1.2 )
diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
index 14bb204f238c..5fa59ebf4eb6 100644
--- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
deleted file mode 100644
index edc765ed8bfe..000000000000
--- a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
deleted file mode 100644
index edc765ed8bfe..000000000000
--- a/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest
index 5cb9ddf22bcf..dba00124e1f4 100644
--- a/gnome-extra/mousetweaks/Manifest
+++ b/gnome-extra/mousetweaks/Manifest
@@ -1,3 +1,3 @@
 DIST mousetweaks-3.12.0.tar.xz 287236 BLAKE2B e0036131b3f6066b0fdb8dfb92531d1e1c1c1366c14f6016a8c41333892d85b6c7f11a754d82d0f3227b57b80d7bb72f3e0f0264c422fcda5451205ee3fc75a8 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0
-EBUILD mousetweaks-3.12.0.ebuild 613 BLAKE2B 76029c315fd57279884b55c9314bbaf63919a18026d6090d0b05ad548ef28b00d9d083dab77723f76d40b526db0dab25a29f8859262cef7dbe799c133c5b91e9 SHA512 eecf107a61829cec3dce73c205b6c143137f86226b139f1b8db85285a7b147ff576a69b800ba5b31038cbd4cd77e466a981f81b38334ce05fe395a789ec04ffd
+EBUILD mousetweaks-3.12.0.ebuild 631 BLAKE2B d3e7159d5a07024c349aec9952c8dd18278f1475f7e49ab6342d26432718511e493ce48c125c68cfda898e7cab152530634ac151b24361f6132cc8c94213dfb5 SHA512 aad69528d380b098c96bd853e723438e6aea1fd5071ebde527915271c0fd0c6a37d45d86e02fbebeb9839df89587feb0a6189cf76ae90d0b6575d37ae943754f
 MISC metadata.xml 992 BLAKE2B 4949c671cddff34432cb834515eb2a320e229b92d7d7978195497a027984e8d26545f12b2287a3655dcadd2fcf6f7d0a77a5b1d037af58a5d242b031203f27a0 SHA512 81582de18c045117b2b854561e628cc80ee942179a187787dbaefe835d0498139b05fe5486cbabdb1fbfe0c399be230c5c3cc2a7c18c5de8cf465642873b8f27
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
index 72ef40bdea12..2c6fb0eb99cb 100644
--- a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
+++ b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,5 +26,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
+	dev-util/glib-utils
 	virtual/pkgconfig
 "
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index c3e16f7593bc..fe02453f9823 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,5 +1,7 @@
 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
 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
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-3.8.6.ebuild b/gnome-extra/nemo/nemo-3.8.6.ebuild
new file mode 100644
index 000000000000..a974edbd04c9
--- /dev/null
+++ b/gnome-extra/nemo/nemo-3.8.6.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.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/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index ee6ede6b4c33..00754fa5e1cf 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -7,5 +7,5 @@ DIST network-manager-applet-1.8.18.tar.xz 1550448 BLAKE2B 93e0075b87c13f81d3551a
 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 1625 BLAKE2B eb33199b33c95903c88f6e785f25f86778b6ef214a09a6bed46b4e19e6e0cc5083bf62a1e192a788908f02b6a11be2b1aa93026b0f480beb73ba838023eb77e3 SHA512 ef0bae005c7bc7267ad984f84931e0e84ed096326314d62eb56437695dbdb812b1610aed7670eea7c99d495d289afe9166207f732e4ec7597d11757cf77e89ff
+EBUILD nm-applet-1.8.18.ebuild 1628 BLAKE2B 8aaba65e02cc90ade9e5550930630f68e59043fc25cb394e451ae3106fb62dd5ea6ab29959d4ffd2a3048688ca402bc2c420d9a92e31f4d22e8dab581f45a5af SHA512 d28f4ca92eb64caa295d044657b70793b36fdaa2607c667f6792d9c90d1867532637054004e74641677a819ab3d6b60920dec702d0b83b6e304017f6f6fa5089
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
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 0b744571f329..94a340777867 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.18.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 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18