2016-10-01 01:09:49 UTC

40 files changed, 80 insertions, 80 deletions

diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.0.7 b/metadata/md5-cache/gnome-extra/cinnamon-3.0.7
index 16ef4f7ff4a6..72f6d0e60d6d 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.0.7
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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-2.4:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-2.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.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.0.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=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-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7] dev-python/gconf-python:2[python_targets_python2_7] dev-python/lxml[python_targets_python2_7] dev-python/pexpect[python_targets_python2_7] dev-python/pycairo[python_targets_python2_7] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyinotify[python_targets_python2_7] dev-python/pypam[python_targets_python2_7] dev-python/pillow[python_targets_python2_7] x11-themes/gnome-themes-standard[gtk] x11-themes/adwaita-icon-theme >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) python_targets_python2_7 || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.0.7.tar.gz -> cinnamon-3.0.7.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5f1116617ba1256f63f2feef1943cc57
+_md5_=fd02af954ff5432499f2c30bbf9f1693
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.0.1
index 93aa89e4831a..91d965c4c92d 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.0.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cinnamons's main interface to configure various aspects of the deskt
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+colord +cups debug input_devices_wacom systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=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 ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd sys-auth/consolekit ) 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] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.0.1.tar.gz -> cinnamon-control-center-3.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eda655d860c8563f701e911cabb27f35
+_md5_=1a31182ecf8b210256288b44e76e7c85
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.0.2
index cdea7832e787..9b97f29d0e1c 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.0.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+introspection systemd python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=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:= ) dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.0.2.tar.gz -> cinnamon-desktop-3.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7c02c7c4a37a35c6b3c77e7212132389
+_md5_=427dbefd02d18267ab1321af255622f0
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.0.2 b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.0.2
index 585b18a0dad0..eb007215ccaa 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.0.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=debug +introspection
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.0.2.tar.gz -> cinnamon-menus-3.0.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fec89ba9f6300316c1ca1475dd9d3b57
+_md5_=5c1e0a01009e365e01f1ebb7cd4d078e
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.0.1
index 73c3919e3390..7afb6c6d6b37 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.0.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=debug doc pam systemd python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=!~gnome-extra/cinnamon-1.8.8.1 !systemd? ( sys-auth/consolekit ) dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.0.1.tar.gz -> cinnamon-screensaver-3.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=db00c7e4092f37c669bffcff20e173e4
+_md5_=a28fc22e266d8063c3870fdcae843af6
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.0.1
index 98315dc1aebd..fb7b31dec0a2 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-3.0.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cinnamon session manager
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=doc ipv6 systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=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 ) !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/consolekit )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.0.1.tar.gz -> cinnamon-session-3.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2e383bbdc5d93e8e1665f3f0c23a7da0
+_md5_=9baf52f452facbecdc425803e2b48a8a
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.0.1
index de5e652215b7..e8a579862c03 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.0.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cinnamon's settings daemon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+colord cups input_devices_wacom smartcard systemd test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 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:= 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= >=sys-power/upower-0.9.11:= ) !systemd? ( sys-auth/consolekit:0= || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.0.1.tar.gz -> cinnamon-settings-daemon-3.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=918fd6b434da91740d364567de8f8ffa
+_md5_=fb46406a22eb4d4ade25d194a0b35c91
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.0.3 b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.0.3
index 9aec19a7562c..4e175742c7af 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.0.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.0.3
@@ -3,11 +3,11 @@ DESCRIPTION=Translation data for Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=linguas_af linguas_am linguas_an linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_be@latin linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_crh linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en@shaw linguas_en_AU linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fil linguas_fo linguas_fr linguas_fr_CA linguas_frp linguas_fy linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_ii linguas_is linguas_it linguas_ja linguas_jv linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_ksw linguas_ku linguas_ky linguas_la linguas_li linguas_lo linguas_lt linguas_lv linguas_mai linguas_mg linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_om linguas_or linguas_pa linguas_pap linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rue linguas_rw linguas_sa linguas_sc linguas_sco linguas_shn linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_tg linguas_th linguas_tl linguas_tlh linguas_tpi linguas_tr linguas_ts linguas_tt linguas_ug linguas_uk linguas_ur linguas_uz linguas_uz@cyrillic linguas_vi linguas_wa linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.0.3.tar.gz -> cinnamon-translations-3.0.3.tar.gz
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=l10n	e26ea0642846685782f1813642e7ff0f
-_md5_=68f9849f2823ed723c5fd0d0911ddedf
+_md5_=9a92433684573b6319d0da9664aef38e
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.0.1 b/metadata/md5-cache/gnome-extra/cjs-3.0.1
index 73d7a02b716f..92fcbd8b8b82 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.0.1
+++ b/metadata/md5-cache/gnome-extra/cjs-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+cairo examples gtk test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=dev-lang/spidermonkey:24 >=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 ) !<gnome-extra/cinnamon-2.4
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.0.1.tar.gz -> cjs-3.0.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0b407a07710be9377ae1396bf480047c
+_md5_=4a2ffb39be1de66f6fa47b4d3232fda3
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.20.5 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.20.5
index b218af3d2933..ecb254093c7f 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.20.5
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.20.5
@@ -4,7 +4,7 @@ DESCRIPTION=Evolution groupware backend
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.40:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=dev-libs/libgdata-0.15.1:= >=net-libs/webkit-gtk-2.4.9:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ SLOT=0/57
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.20/evolution-data-server-3.20.5.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:-
 _eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=03cae25f335c09afa72cf6462ca10008
+_md5_=f89ed28fbc899df87e812846ec651608
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.20.5 b/metadata/md5-cache/gnome-extra/evolution-ews-3.20.5
index 591b688dc42b..d04af362090e 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.20.5
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.20.5
@@ -4,11 +4,11 @@ DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.40:2 dev-libs/libical:0= >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.20.5:0= >=mail-client/evolution-3.20.5:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.20/evolution-ews-3.20.5.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bd2f696a3a106588b0f3dbc516aa9f77
+_md5_=84b181df96542174064647cb131725df
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.20.2 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.20.2
index daa9f9673f80..acba4228cd2d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.20.2
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.20.2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
 IUSE=smartcard usbredir
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.4:3 >=net-libs/gtk-vnc-0.4.4[gtk3] >=net-misc/spice-gtk-0.27[gtk3,smartcard?,usbredir?] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/fuse sys-fs/fuseiso sys-fs/mtools virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.20/gnome-boxes-3.20.2.tar.xz
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- pkg_setup:linux-info src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=65a7f02db21903676ab6cd86d307ac21
+_md5_=8a3c084b0fe587dc8e636b4bc9ab839f
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.20.2 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.20.2
index b6e12629bb3c..591bac7b1eaf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.20.2
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.20.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 >=net-libs/libs
 DESCRIPTION=A calculator application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.11.6:3 >=x11-libs/gtksourceview-3.15.1:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.20/gnome-calculator-3.20.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a4fa1cf85b8bce7cdb8dbcbfbf9c6d0a
+_md5_=caed0efad4fee216db207aac45a0f72e
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.20.4 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.20.4
index 021c146e47d4..e9b41d7d45e0 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-3.20.4
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-3.20.4
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.43.4:2 >=dev-libs/libical-1.0.1 >=gnome-extra/evolution
 DESCRIPTION=Manage your online calendars with simple and modern interface
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=dev-libs/libical-1.0.1 >=gnome-extra/evolution-data-server-3.17.1:= >=net-libs/gnome-online-accounts-3.2.0:= >=x11-libs/gtk+-3.19.1:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/3.20/gnome-calendar-3.20.4.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e31ffd9c58dc8ba33d3ee83814129a64
+_md5_=497c32ee7f2db5489ad1d810555ba374
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-characters-3.20.1
index 38e5dfa725ee..3e89836b10df 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.20.1
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.20.1
@@ -4,11 +4,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.20/gnome-characters-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=356d647039d6006c030957c891924922
+_md5_=168648a52eff07cadf8c529ed7ae4e5b
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.20.2 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.20.2
index 71b007488272..d10454d4a4d9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.20.2
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.20.2
@@ -3,11 +3,11 @@ DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweathe
 DESCRIPTION=Clocks application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.20/gnome-clocks-3.20.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f08c6e0b9d31f930d2fbefac8fc64dbd
+_md5_=c136f2b71b55ff41b8168db9f173bfb5
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.20.0
index a9fccddf6939..7be08fc2b82b 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.20.0
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=Color profile manager for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-color-manager
 IUSE=packagekit raw test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.20/gnome-color-manager-3.20.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:gnome2 src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d66dfd4924c6c03dbb953cc43f4feb50
+_md5_=b4956a821523f74cc505153bbfd51026
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.20.0
index a5337c43fa33..fff762250644 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.20.0
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME contact management application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
 IUSE=v4l
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.20/gnome-contacts-3.20.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=76da9aa83efbedb33ed84147f4d4207f
+_md5_=478b4388362f8044ca1c9e15c1de1d83
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.20.1
index 7bd535473c53..a137f2ae5c06 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.20.1
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.20.1
@@ -3,11 +3,11 @@ DEPEND=>=app-misc/tracker-1:=[miner-fs] >=app-text/evince-3.13.3[introspection]
 DESCRIPTION=A document manager application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/tracker-1:=[miner-fs] >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.19.1:3[introspection] x11-libs/pango[introspection] media-libs/clutter[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.20/gnome-documents-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cbfe7b10c025cb0234f7b7513f7a5bc4
+_md5_=0a9422101ad88f6716c441043f2c53a2
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.20.0
index 6b5cf0904a65..962839f95d60 100644
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.20.0
+++ b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.20.0
@@ -3,7 +3,7 @@ DEPEND=app-text/yelp-tools dev-util/itstool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Help a new user get started in GNOME
 EAPI=6
 HOMEPAGE=https://help.gnome.org/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=gnome-extra/gnome-user-docs
 RESTRICT=binchecks strip
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.20/gnome-getting-started-docs-3.20.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6a6feb77ab8c61f67717579d18a7fdb2
+_md5_=e9d49114766651acb3168582bf16acee
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-logs-3.20.1
index b02e8b03741e..4a868be7dfaf 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.20.1
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.20.1
@@ -4,11 +4,11 @@ DESCRIPTION=Log messages and event viewer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Logs
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.43.90:2 sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/3.20/gnome-logs-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:gnome2 src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=81ef2aa417d1b9bae6e2a3e1df4562a9
+_md5_=900f3237c4c5c8a4a9d36103c992d14f
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.20.0
index f00d8d77691f..21c43e3f0e37 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.20.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME power management service
 EAPI=6
 HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.20/gnome-power-manager-3.20.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f9033633ce1bec5d13944990dcb37dd5
+_md5_=e10b25aa66f03ff21fe1e1458d6acf99
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.20.1
index c85fb20c00e3..9b15d0e47d50 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.20.1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.20.1
@@ -4,11 +4,11 @@ DESCRIPTION=JavaScript extensions for GNOME Shell
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.20/gnome-shell-extensions-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=573f08c89f774b4cf5c7ee47f8376a53
+_md5_=f01cd37b1af93a08f47b95eb55eda369
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-28-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-28-r1
index 0047db0863c0..e0f7cb6621c3 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-28-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-28-r1
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Shows legacy tray icons on top
 EAPI=6
 HOMEPAGE=https://extensions.gnome.org/extension/495/topicons/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.10
 SLOT=0
 SRC_URI=http://94.247.144.115/repo/topicons/snapshot/topicons-28.tar.xz -> gnome-shell-extensions-topicons-28.tar.xz
 _eclass_exported_funcs=pkg_postinst:- src_unpack:vcs-snapshot src_prepare:- src_install:-
 _eclasses_=vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=f6bfca25eefc51f78b317043f62c0cf0
+_md5_=7ee1ba9dc0fc65c05cf7de3d5d59880d
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.20.0
index 87929c70bf07..8e358f254ee4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.20.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.20.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
 EAPI=6
 HOMEPAGE=http://frippery.org/extensions/index.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.20 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-3.20.0.tgz
 _eclass_exported_funcs=pkg_postinst:- src_install:-
-_md5_=fd2d59fd3621710089205e939f3a8e39
+_md5_=d29ff5ae51dfa6a5951f7aa1b6dbebc8
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.20.1
index 4e7ce84deaa4..896be9f88a9d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.20.1
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.20.1
@@ -4,11 +4,11 @@ DESCRIPTION=The Gnome System Monitor
 EAPI=6
 HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/
 IUSE=systemd X
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34: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 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.20/gnome-system-monitor-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=49d8c7186e2ef7f4b8ef99cb0c3e5960
+_md5_=b44b83979080acffa035c480fbdd7de7
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
index 61011c065649..3381f58b9db6 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
@@ -4,7 +4,7 @@ DESCRIPTION=Tool to customize GNOME 3 options
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.4 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.20/gnome-tweak-tool-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=123222cb4265d3de0b9ed05806ab374d
+_md5_=d487a260c384cca0ce6f8f447442276b
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.20.2 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.20.2
index 086efcb57493..79a93ea02261 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.20.2
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.20.2
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME end user documentation
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-docs/3.20/gnome-user-docs-3.20.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:- src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4e98855054f0edad083099e197a3f0ba
+_md5_=56817be6d84a76213eb510766cd3904e
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.2 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.2
index d71452e6606a..eda5f63fc46c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.2
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 m
 DESCRIPTION=Personal file sharing for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-share
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=65f6be9ad77e69bb7669ee6659eea287
+_md5_=0db2d75d028b965d08f725351cb5949d
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-3.20.2 b/metadata/md5-cache/gnome-extra/gnome-weather-3.20.2
index 9a903fd205da..abd204d11a05 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-3.20.2
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-3.20.2
@@ -4,11 +4,11 @@ DESCRIPTION=A weather application for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:gnome2 src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ae44ee92bd41707f97dd035068ec7a2a
+_md5_=15b9f584a695a2934c24a6513c924e90
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-9.0.0 b/metadata/md5-cache/gnome-extra/gucharmap-9.0.0
index 10adb3b6dafb..351702b4538b 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-9.0.0
+++ b/metadata/md5-cache/gnome-extra/gucharmap-9.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=debug +introspection test vala
-KEYWORDS=alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=app-i18n/unicode-data-9.0.0 >=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:= ) !<gnome-extra/gucharmap-3:0
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vala	764817a25b405b65269d8619e203a52f	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c36b9e8116e4c89534f0918872309f20
+_md5_=154fefd920f253fd35199a208de7a9b5
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.40 b/metadata/md5-cache/gnome-extra/libgsf-1.14.40
index fb2c0abe487b..a49954a2d60a 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.40
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.40
@@ -4,11 +4,11 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.40.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d821a9bff1bf4ff0ecbad0bc28a89915
+_md5_=bb4b5c317b57e133da2972bf6006b1d9
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.4 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.4
index 0eafd23ea991..30684c20153a 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.4
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=A nautilus extension for sending files to locations
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/nautilus-sendto/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.90.3:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.4.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a3c7e6736382d9ffbdc13d098de17aa5
+_md5_=8467bef577987b31f0a41741d93802ba
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.8.0 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.8.0
index 5fc662c48947..c5266fb63544 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.8.0
+++ b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.8.0
@@ -3,11 +3,11 @@ DEPEND=~app-misc/tracker-1.8.0 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90
 DESCRIPTION=Nautilus extension to tag files for Tracker
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~app-misc/tracker-1.8.0 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
 SLOT=0
 SRC_URI=mirror://gnome/sources/tracker/1.8/tracker-1.8.0.tar.xz
 _eclass_exported_funcs=pkg_setup:- src_prepare:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f3f14191929fcfd74b9b3ef1232eafe2
+_md5_=be9d3d2e5bc3f38fa2ab3e7f53f52d61
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.0.6 b/metadata/md5-cache/gnome-extra/nemo-3.0.6
index e5801f5b8839..bf268bdd86c4 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.0.6
+++ b/metadata/md5-cache/gnome-extra/nemo-3.0.6
@@ -4,7 +4,7 @@ DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=exif +introspection +nls packagekit tracker xmp test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
 PDEPEND=>=gnome-base/gvfs-0.1.2
 RDEPEND=>=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 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:= ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.0.6.tar.gz -> nemo-3.0.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:python-any-r1 src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c1c1c6816a00751ce3a55ce260920880
+_md5_=3e2391070d2a5c45b465c9b9faeda0a7
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.4.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.4.0
index f98797a42b17..14e1d4269b7e 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.4.0
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=GNOME applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=+introspection modemmanager teamd
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 PDEPEND=virtual/notification-daemon
 RDEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= modemmanager? ( net-misc/modemmanager ) teamd? ( >=dev-libs/jansson-2.3 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.4/network-manager-applet-1.4.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bef1c5649a4e75d3f2b29d227f44f2dc
+_md5_=b1df1cd07805fff43b9cdb603ecde748
diff --git a/metadata/md5-cache/gnome-extra/sushi-3.20.0 b/metadata/md5-cache/gnome-extra/sushi-3.20.0
index 1632e8dcd6ad..f368b0b16657 100644
--- a/metadata/md5-cache/gnome-extra/sushi-3.20.0
+++ b/metadata/md5-cache/gnome-extra/sushi-3.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/sushi
 IUSE=office
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.23[introspection] >=dev-libs/gjs-1.40 >=dev-libs/glib-2.29.14:2 >=dev-libs/gobject-introspection-0.9.6:= >=media-libs/clutter-1.11.4:1.0[introspection] >=media-libs/clutter-gtk-1.0.1:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=media-libs/harfbuzz-0.9.9:= media-libs/clutter-gst:3.0[introspection] media-libs/musicbrainz:5 net-libs/webkit-gtk:4[introspection] x11-libs/gtksourceview:3.0[introspection] x11-libs/libX11 office? ( app-office/unoconv ) >=gnome-base/nautilus-3.1.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/3.20/sushi-3.20.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=28a697fbc5158027d148285a6790ac5e
+_md5_=74925fab54995d2f9e2a40ec10f90aa8
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.20.1 b/metadata/md5-cache/gnome-extra/yelp-3.20.1
index 0db5bdfa22e1..13b85164beac 100644
--- a/metadata/md5-cache/gnome-extra/yelp-3.20.1
+++ b/metadata/md5-cache/gnome-extra/yelp-3.20.1
@@ -3,11 +3,11 @@ DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/gl
 DESCRIPTION=Help browser for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.12 >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/3.20/yelp-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3ec6d5c879fd36b799a2a15092eb5f69
+_md5_=fb98be4e9c5c717e64c3a1b91c9ddb63
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1
index c527436ed9f0..9d14216907e8 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.20.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/intltoo
 DESCRIPTION=XSL stylesheets for yelp
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7446f0c1a88fa4e0232e31558cdcfe4b
+_md5_=55d02b4d7bdc3eb80d0446aba0f7fdc1
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.20.0 b/metadata/md5-cache/gnome-extra/zenity-3.20.0
index 519767f94107..311ec027b581 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.20.0
+++ b/metadata/md5-cache/gnome-extra/zenity-3.20.0
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
 IUSE=debug libnotify test webkit
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.20/zenity-3.20.0.tar.xz
 _eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:-
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cef5d92c99b171b17cc86027b5f56093
+_md5_=1515a7b25c771f0a87c4b15280914eff