2017-12-19 19:28:39 UTC

67 files changed, 134 insertions, 134 deletions

diff --git a/metadata/md5-cache/app-cdr/brasero-3.12.2 b/metadata/md5-cache/app-cdr/brasero-3.12.2
index 4d63be008af4..6bc0c72567d4 100644
--- a/metadata/md5-cache/app-cdr/brasero-3.12.2
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=CD/DVD burning application for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Brasero
 IUSE=+css +introspection +libburn mp3 nautilus packagekit playlist test tracker
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 PDEPEND=gnome-base/gvfs
 RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) mp3? ( media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-mad:1.0 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0/3.1
 SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7efc8c51b4051100e34affa65e84e617
+_md5_=88643b3adbb2cd097b46688bbeb1fbf5
diff --git a/metadata/md5-cache/app-editors/gedit-3.22.1 b/metadata/md5-cache/app-editors/gedit-3.22.1
index c41c427a6123..b0c52c78f8ba 100644
--- a/metadata/md5-cache/app-editors/gedit-3.22.1
+++ b/metadata/md5-cache/app-editors/gedit-3.22.1
@@ -4,11 +4,11 @@ DESCRIPTION=A text editor for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
 IUSE=+introspection +python spell vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.21.3:3[introspection?] >=x11-libs/gtksourceview-3.21.2:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/libpeas[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( >=app-text/gspell-0.2.5:0= ) x11-themes/adwaita-icon-theme
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.22/gedit-3.22.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71e52b3b44c39b7e32de0e98c78fa6f8
+_md5_=a7dcd8892694aaff05765ffcb8558958
diff --git a/metadata/md5-cache/app-misc/bijiben-3.24.2 b/metadata/md5-cache/app-misc/bijiben-3.24.2
index 5c3729ae923f..f2a0343dd559 100644
--- a/metadata/md5-cache/app-misc/bijiben-3.24.2
+++ b/metadata/md5-cache/app-misc/bijiben-3.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=Note editor designed to remain simple to use
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Bijiben
 IUSE=zeitgeist
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2 >=app-misc/tracker-1:= sys-apps/util-linux zeitgeist? ( gnome-extra/zeitgeist )
 SLOT=0
 SRC_URI=mirror://gnome/sources/bijiben/3.24/bijiben-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4578d39d8ea46914805b451739d132b
+_md5_=58e8c50a2fca154ee155a87f4a3f9ac0
diff --git a/metadata/md5-cache/app-office/dia2code-1.0.0 b/metadata/md5-cache/app-office/dia2code-1.0.0
index d848d547a222..78e7c3507bc5 100644
--- a/metadata/md5-cache/app-office/dia2code-1.0.0
+++ b/metadata/md5-cache/app-office/dia2code-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Convert UML diagrams produced with Dia to various source code flavou
 EAPI=6
 HOMEPAGE=http://dia2code.sourceforge.net/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=mirror://sourceforge/dia2code/dia2code-1.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0f10fb24a44d92892f38af9585acb69
+_md5_=8730590a0e78dbf464a6dd99f5c574bd
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.35 b/metadata/md5-cache/app-office/gnumeric-1.12.35
index 695b2c04752f..bf7be04e6286 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.35
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.35
@@ -4,7 +4,7 @@ DESCRIPTION=The GNOME Spreadsheet
 EAPI=6
 HOMEPAGE=http://www.gnumeric.org/
 IUSE=+introspection libgda perl python python_targets_python2_7
-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=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.28:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) libgda? ( gnome-extra/libgda:5[gtk] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.35.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d0de5a1f1a9ba6949ccabff0ac5df749
+_md5_=22ab3ae82f1b730c600f15bb7e68d43e
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1 b/metadata/md5-cache/app-text/enchant-1.6.1
index 7d375975f722..c759350ac8ce 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.1
+++ b/metadata/md5-cache/app-text/enchant-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=6
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell static-libs test zemberek
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) zemberek? ( dev-libs/dbus-glib ) zemberek? ( app-text/zemberek-server )
 REQUIRED_USE=|| ( hunspell aspell zemberek )
 SLOT=0
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4fe659c22305001f3737acf129152dea
+_md5_=6d8e99ab06611bde3cfb9d8c2cb6410e
diff --git a/metadata/md5-cache/app-text/gspell-1.4.2 b/metadata/md5-cache/app-text/gspell-1.4.2
index 09f6e16089ea..7cc810419796 100644
--- a/metadata/md5-cache/app-text/gspell-1.4.2
+++ b/metadata/md5-cache/app-text/gspell-1.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Spell check library for GTK+ applications
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
 IUSE=+introspection vala test
-KEYWORDS=~alpha amd64 ~arm ~ppc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gspell/1.4/gspell-1.4.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=991c48255b8929cd216a9bf67ae7d34c
+_md5_=4ba81237d44da9d4acd03bade5fc4027
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.9 b/metadata/md5-cache/app-text/gtkspell-3.0.9
index 3611da7f7e0b..189def1983f2 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.9
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Spell checking widget for GTK
 EAPI=6
 HOMEPAGE=http://gtkspell.sourceforge.net/
 IUSE=+introspection vala
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.9/gtkspell3-3.0.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cc2f75ebfaed07f399cb82347988d2c
+_md5_=cdf976f0635f6b2b9aa009c5821e008c
diff --git a/metadata/md5-cache/app-text/iso-codes-3.75 b/metadata/md5-cache/app-text/iso-codes-3.75
index 2ff8a21a00bf..b3fdc0f3c39c 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.75
+++ b/metadata/md5-cache/app-text/iso-codes-3.75
@@ -4,10 +4,10 @@ DESCRIPTION=ISO language, territory, currency, script codes and their translatio
 EAPI=6
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
 IUSE=linguas_af linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_byn linguas_ca linguas_crh linguas_cs linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_ga linguas_gez linguas_gl linguas_gu linguas_haw linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_kok linguas_ku linguas_lt linguas_lv linguas_mi linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nb linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_or linguas_pa linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_ti linguas_tig linguas_tk linguas_tl linguas_tr linguas_tt linguas_tt@iqtelif linguas_ug linguas_uk linguas_ve linguas_vi linguas_wa linguas_wal linguas_wo linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.75.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fc8d64c1bd9dbe8b375317255a09a1bc
+_md5_=1f0bce2f3d2aa63bdee304d68cbb57fc
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.22.2 b/metadata/md5-cache/dev-cpp/gtkmm-3.22.2
index a70c4b6b5e1c..543f270782de 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.22.2
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.22.2
@@ -4,11 +4,11 @@ DESCRIPTION=C++ interface for GTK+
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=aqua doc test wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.49.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.22.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=|| ( aqua wayland X )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=049a2ec782ded917e08d4ab381ffe0a8
+_md5_=a4e8a4c59e1709ba6385092953ebb5f9
diff --git a/metadata/md5-cache/dev-cpp/mm-common-0.9.11 b/metadata/md5-cache/dev-cpp/mm-common-0.9.11
index d016c30f992d..09009cf1fbb1 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-0.9.11
+++ b/metadata/md5-cache/dev-cpp/mm-common-0.9.11
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev
 DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
 EAPI=5
 HOMEPAGE=https://www.gtkmm.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/0.9/mm-common-0.9.11.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2080f873097a061bb8674ea3aaa6863
+_md5_=311aa4e5c2b9a898f8afdef20db4d707
diff --git a/metadata/md5-cache/dev-lang/vala-0.34.9 b/metadata/md5-cache/dev-lang/vala-0.34.9
index ae31db5972fa..d06bcbee3e53 100644
--- a/metadata/md5-cache/dev-lang/vala-0.34.9
+++ b/metadata/md5-cache/dev-lang/vala-0.34.9
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.34.9
 SLOT=0.34
 SRC_URI=mirror://gnome/sources/vala/0.34/vala-0.34.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ccea5ea422e033f89aa20731086063d
+_md5_=c763f06daf9d6bfeea787a1624e4b1a1
diff --git a/metadata/md5-cache/dev-libs/folks-0.11.4 b/metadata/md5-cache/dev-libs/folks-0.11.4
index f83666072db8..72d3f2c65cc2 100644
--- a/metadata/md5-cache/dev-libs/folks-0.11.4
+++ b/metadata/md5-cache/dev-libs/folks-0.11.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library for aggregating people from multiple sources
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Folks
 IUSE=bluetooth debug eds +telepathy test tracker utils zeitgeist test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/glib-2.40:2 dev-libs/dbus-glib >=dev-libs/gobject-introspection-1.30:= >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:0= sys-libs/readline:0= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] ) telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) net-im/telepathy-mission-control
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.11/folks-0.11.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4ac88c54acf7cd7e198dc883401045b
+_md5_=ba2a5b25e534e0a4dca5cde78241bd4b
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1 b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
index 0ea718e06bc1..a47e78427da1 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GLib-based library for accessing online service APIs using the GData
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
 IUSE=+crypt gnome-online-accounts +introspection static-libs test vala
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.9.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce781426e0a45e22b2ee5e0811a65876
+_md5_=1016892a1a85465dd123850f38f472b3
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.0 b/metadata/md5-cache/dev-libs/libgee-0.20.0
index 8463aca68028..ce92a15f252d 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.0
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=GObject-based interfaces and classes for commonly used data structur
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
 IUSE=+introspection
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh sparc ~x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05df3eb54cf2c80c7f3b7438404d0052
+_md5_=bf0d7fe13ff5d9d3fd3675bd21b955f7
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3 b/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3
index 7747fe08ad32..cd31f86a4d34 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-1.2.3
@@ -3,10 +3,10 @@ DEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20
 DESCRIPTION=Library for code common to Gnome games
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libgnome-games-support/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.2:3
 SLOT=1/2
 SRC_URI=mirror://gnome/sources/libgnome-games-support/1.2/libgnome-games-support-1.2.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fabc5bb01598c9cb051132bc4d7d508
+_md5_=1e017b3430368248694ccc986ba11c1f
diff --git a/metadata/md5-cache/dev-libs/libgudev-232 b/metadata/md5-cache/dev-libs/libgudev-232
index 1fadf62b5cf6..fc7c32f6e335 100644
--- a/metadata/md5-cache/dev-libs/libgudev-232
+++ b/metadata/md5-cache/dev-libs/libgudev-232
@@ -4,11 +4,11 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/libgudev/232/libgudev-232.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8197027f24576e5571f7ce5ee0d44885
+_md5_=776908a4c9d1d037b38fad6575e776cf
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.2.11 b/metadata/md5-cache/dev-libs/libgusb-0.2.11
index cb20cf86996a..b273c6a70eff 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.2.11
+++ b/metadata/md5-cache/dev-libs/libgusb-0.2.11
@@ -4,7 +4,7 @@ DESCRIPTION=GObject wrapper for libusb
 EAPI=6
 HOMEPAGE=https://github.com/hughsie/libgusb
 IUSE=+introspection static-libs vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.29:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.2.11.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b509a0755b4b6bf76dd03ae07aa1be95
+_md5_=5d905abe398701fcb3b2b4c8ad53052a
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.0 b/metadata/md5-cache/dev-libs/libpwquality-1.4.0
index d3688f14ddff..f6cbf052646d 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.0
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Library for password quality checking and generating random password
 EAPI=6
 HOMEPAGE=https://github.com/libpwquality/libpwquality
 IUSE=pam python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=sys-libs/cracklib-2.8:= pam? ( virtual/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.0/libpwquality-1.4.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=470a65827380ae8f4dd4e41f0d6f2a4f
+_md5_=bbbbd981667b3719ecfc6b3d6f350d97
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.6 b/metadata/md5-cache/dev-libs/libxml2-2.9.6
index 6e2c8e5946cf..8ec3aacd1cde 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.6
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.6
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.6.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3c2d3e2b129f36c9dc03e0faade8ac10
+_md5_=cb26e9223f86f9420888ab79f8289d85
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8
index 4bc8311ea62b..16592be3fb39 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.8
@@ -4,10 +4,10 @@ DESCRIPTION=Playlist parsing library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/totem-pl-parser/stable/
 IUSE=archive crypt +introspection +quvi test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/gmime:2.6 >=net-libs/libsoup-2.43:2.4 archive? ( >=app-arch/libarchive-3 ) crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) quvi? ( >=media-libs/libquvi-0.9.1:0= )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f55affa8326fd79a7e18607af85eb7c6
+_md5_=90afab21d0afaf27d3f9ffc0a3092a3e
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.34.9 b/metadata/md5-cache/dev-libs/vala-common-0.34.9
index 5ffd5b175c16..739105a556e6 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.34.9
+++ b/metadata/md5-cache/dev-libs/vala-common-0.34.9
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.34/vala-0.34.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d92228ef37d46a54301b4a04aded1066
+_md5_=6beddcb22c81402e324c9fc9d1ab4d58
diff --git a/metadata/md5-cache/dev-python/python-slip-0.6.5 b/metadata/md5-cache/dev-python/python-slip-0.6.5
index a017df922ac1..a4198759667e 100644
--- a/metadata/md5-cache/dev-python/python-slip-0.6.5
+++ b/metadata/md5-cache/dev-python/python-slip-0.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=Miscellaneous convenience, extension and workaround code for Python
 EAPI=5
 HOMEPAGE=https://github.com/nphilipp/python-slip
 IUSE=dbus selinux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-auth/polkit ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe2873b312a06569decaea1392a2f7ee
+_md5_=d5b9e094983b5bac517bd1c450699aa6
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.12 b/metadata/md5-cache/dev-util/d-feet-0.3.12
index 9f629c975fda..3d1ab05257bc 100644
--- a/metadata/md5-cache/dev-util/d-feet-0.3.12
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.12
@@ -4,11 +4,11 @@ DESCRIPTION=D-Feet is a powerful D-Bus debugger
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/DFeet
 IUSE=test +X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 >=dev-python/pygobject-3.3.91:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sys-apps/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c62f55295bf75ddf4350285d3861904
+_md5_=4c47f0d77de7736bd0e90f03d42641a0
diff --git a/metadata/md5-cache/dev-util/dogtail-0.9.10 b/metadata/md5-cache/dev-util/dogtail-0.9.10
index b0eb85b6a75b..a8c09e5ed6ba 100644
--- a/metadata/md5-cache/dev-util/dogtail-0.9.10
+++ b/metadata/md5-cache/dev-util/dogtail-0.9.10
@@ -4,11 +4,11 @@ DESCRIPTION=GUI test tool and automation framework using accessibility framework
 EAPI=6
 HOMEPAGE=https://gitlab.com/dogtail/dogtail/commits/master
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gobject-introspection dev-python/pyatspi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/libwnck:3[introspection] x11-base/xorg-server[xvfb] x11-apps/xinit python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=075599bff26fd1d4d33c86766de365d1
+_md5_=3fea16377ffe27c5cbcfb4254b179165
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
index f7bb79a16b6b..98794e1f5391 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.2
 DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~eva/distfiles/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f7879b2d36c968dc283ecbae6809186
+_md5_=77d93041b89f18098f2598b2305e0874
diff --git a/metadata/md5-cache/dev-util/meld-3.18.0 b/metadata/md5-cache/dev-util/meld-3.18.0
index 9d55252bb8f2..3108647d447d 100644
--- a/metadata/md5-cache/dev-util/meld-3.18.0
+++ b/metadata/md5-cache/dev-util/meld-3.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical diff and merge tool
 EAPI=6
 HOMEPAGE=http://meldmerge.org/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.50:2[dbus] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.14:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/meld/3.18/meld-3.18.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c545699d7ac94790fd87c5da606ac1d
+_md5_=03be3417ad628a18f0ff160a089827de
diff --git a/metadata/md5-cache/games-arcade/gnome-robots-3.22.2 b/metadata/md5-cache/games-arcade/gnome-robots-3.22.2
index 1dabdf772f5f..2b5281883093 100644
--- a/metadata/md5-cache/games-arcade/gnome-robots-3.22.2
+++ b/metadata/md5-cache/games-arcade/gnome-robots-3.22.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgnome-games-support:1 >=gnome-base/lib
 DESCRIPTION=Avoid the robots and make them crash into each other
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Robots
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.36.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab62ffb4053093f11ed35d9697c7d922
+_md5_=f737b4c522a4f00d90d1403585248ec8
diff --git a/metadata/md5-cache/games-board/four-in-a-row-3.22.2 b/metadata/md5-cache/games-board/four-in-a-row-3.22.2
index dfaff7bdfea9..9e9d505c6797 100644
--- a/metadata/md5-cache/games-board/four-in-a-row-3.22.2
+++ b/metadata/md5-cache/games-board/four-in-a-row-3.22.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[g
 DESCRIPTION=Make lines of the same color to win
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Four-in-a-row
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.13.2:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37bcd12e639e19db19c37c9e76f49a00
+_md5_=4becf07d4f3506bd2fe3d0bb550a2821
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.2 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.2
index 090b316a2b38..f254cc7faaeb 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.2
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.22.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-suppo
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Klotski
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.19.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a3b7606f360215c265c89e27da96bad
+_md5_=71cdcf80d632182cd96266d89bf3daff
diff --git a/metadata/md5-cache/games-puzzle/hitori-3.22.4 b/metadata/md5-cache/games-puzzle/hitori-3.22.4
index 23da98802809..e7f804d11d68 100644
--- a/metadata/md5-cache/games-puzzle/hitori-3.22.4
+++ b/metadata/md5-cache/games-puzzle/hitori-3.22.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4 app-te
 DESCRIPTION=Logic puzzle game for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Hitori
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a7635283eac9cd6d84bb52fc8ffd33b
+_md5_=91f2e2365aaa4095c9e4dc73a08b6971
diff --git a/metadata/md5-cache/gnome-base/dconf-0.26.1 b/metadata/md5-cache/gnome-base/dconf-0.26.1
index 4567ec1b8a89..a2045904d297 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.26.1
+++ b/metadata/md5-cache/gnome-base/dconf-0.26.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple low-level configuration system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Projects/dconf
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.26/dconf-0.26.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6873a0f64a5105a6fea651339c27d6f7
+_md5_=c70370b1ba8df040e25e3c8b63e3ced4
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
index d77934dbe0d2..8f53b847a3d3 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.20.1
@@ -4,11 +4,11 @@ DESCRIPTION=Password and keyring managing daemon
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
 IUSE=+caps pam selinux +ssh-agent test +filecaps test
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a19d1bade3e409a35170136a8847fc63
+_md5_=5587ff3be798bfc3de8cb854e18f69b1
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1
index 40039f40f427..8a1f6d94f6cd 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1
@@ -4,10 +4,10 @@ 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.11.4:=[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.22/gnome-contacts-3.22.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35a730da4d6c5e839fc1ef671daba3c8
+_md5_=983366c80a5c9a9e9a7f099e3151b742
diff --git a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.9 b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.9
index 4b42055e571e..7d6929d3ced9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.9
+++ b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.9
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-
 DESCRIPTION=Thumbnail generator for directories
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-directory-thumbnailer/0.1/gnome-directory-thumbnailer-0.1.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f82a3ff47e914b7bcb42505e3d0a083
+_md5_=c0ea603b3e426b590e77337ed7303bb8
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.22.5 b/metadata/md5-cache/gnome-extra/gnome-documents-3.22.5
index c8941003810d..aaa5eb1756d6 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.22.5
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.22.5
@@ -3,10 +3,10 @@ DEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[intro
 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-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.19.1:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bbcc2666758817a697099d7677095b90
+_md5_=b501e7a1f20286c8ea1733bf25d1e4e8
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-9.0.4 b/metadata/md5-cache/gnome-extra/gucharmap-9.0.4
index 4ad051364f32..27d98a4c835d 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-9.0.4
+++ b/metadata/md5-cache/gnome-extra/gucharmap-9.0.4
@@ -4,11 +4,11 @@ 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* >=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 )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7865298e33634b4d5e8fb8998620a5e0
+_md5_=d527c000209914e1b3c6f9a3ce82fba6
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5
index 40cc6715a36a..4455b1ac7257 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.5
@@ -4,10 +4,10 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~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.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ba63277c50f5dc029b3c54c1d788d52
+_md5_=ac63667a62db2fda039be843b541cf3e
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-explorer-0.2-r2 b/metadata/md5-cache/gnome-extra/zeitgeist-explorer-0.2-r2
index c6cd458edaf2..64ad0f1d082f 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-explorer-0.2-r2
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-explorer-0.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Monitor and inspect Zeitgeist's log at a low level - developer tool
 EAPI=5
 HOMEPAGE=https://launchpad.net/zeitgeist-explorer/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=gnome-extra/zeitgeist[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:3[introspection] 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/zeitgeist-explorer/0.x/0.2/+download/zeitgeist-explorer-0.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d554b6a5ed828f9d02e72e75796ff7d3
+_md5_=8108dd57827125b08dc7b0b311e5ba65
diff --git a/metadata/md5-cache/mail-client/balsa-2.5.3-r1 b/metadata/md5-cache/mail-client/balsa-2.5.3-r1
index dfda448b7b9c..ba2f07678e25 100644
--- a/metadata/md5-cache/mail-client/balsa-2.5.3-r1
+++ b/metadata/md5-cache/mail-client/balsa-2.5.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Email client for GNOME
 EAPI=6
 HOMEPAGE=http://pawsa.fedorapeople.org/balsa/
 IUSE=crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica sqlite webkit xface
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/gspell-1.2:0= >=dev-libs/glib-2.40.0:2 >=x11-libs/gtk+-3.10.0:3 dev-libs/gmime:2.6 >=net-libs/libesmtp-1.0.3:= net-mail/mailbase media-libs/libcanberra:=[gtk3] x11-themes/hicolor-icon-theme x11-themes/adwaita-icon-theme crypt? ( >=app-crypt/gpgme-1.2.0:= ) gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 ) gnome-keyring? ( app-crypt/libsecret ) sqlite? ( >=dev-db/sqlite-2.8:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) rubrica? ( dev-libs/libxml2:2 ) webkit? ( net-libs/webkit-gtk:4 ) xface? ( >=media-libs/compface-1.5.1:= )
 SLOT=0
 SRC_URI=http://pawsa.fedorapeople.org/balsa/balsa-2.5.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a40c5483348fca5a076601c3f65a76eb
+_md5_=efc984fe51f99abc038ecc1ec9c503c7
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.4.5 b/metadata/md5-cache/media-gfx/gthumb-3.4.5
index e5bec9f38406..b10340a9aa05 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.4.5
+++ b/metadata/md5-cache/media-gfx/gthumb-3.4.5
@@ -4,10 +4,10 @@ DESCRIPTION=Image viewer and browser for Gnome
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/gthumb
 IUSE=cdr debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36.0:2[dbus] >=x11-libs/gtk+-3.10.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0 ) json? ( >=dev-libs/json-glib-0.15.0 ) webkit? ( >=net-libs/webkit-gtk-1.10.0:4 ) lcms? ( >=media-libs/lcms-2.6:2 ) media-libs/libpng:0= sys-libs/zlib >=gnome-base/gsettings-desktop-schemas-0.1.4 jpeg? ( virtual/jpeg:0= ) tiff? ( media-libs/tiff:= ) !raw? ( media-gfx/dcraw )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.4/gthumb-3.4.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a36bcd065021fbf4988a807639f065b
+_md5_=4d7fbdbeac64355f42fa616ec17b2d4e
diff --git a/metadata/md5-cache/media-libs/clutter-gtk-1.8.4 b/metadata/md5-cache/media-libs/clutter-gtk-1.8.4
index 9198e57f8fd6..2c687f21fd55 100644
--- a/metadata/md5-cache/media-libs/clutter-gtk-1.8.4
+++ b/metadata/md5-cache/media-libs/clutter-gtk-1.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library for embedding a Clutter canvas (stage) in GTK+
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Clutter
 IUSE=X debug examples gtk +introspection wayland
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/gtk+-3.21.0:3[X=,introspection?,wayland=] >=media-libs/clutter-1.23.7:1.0[X=,gtk=,introspection?,wayland=] media-libs/cogl:1.0=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9ef36b568d477d7a519e596e47ec411
+_md5_=9e2f075f31cb29c43bf4b3c55142cdcc
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.4 b/metadata/md5-cache/media-libs/grilo-0.3.4
index d9a15bbb8af9..8dd0c92db368 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.4
+++ b/metadata/md5-cache/media-libs/grilo-0.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=gtk examples +introspection +network playlist test vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9:= ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
 REQUIRED_USE=test? ( introspection )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=daa5f07d86df04696e6127d7a18f1060
+_md5_=b8d47b22f2854f2f2a2dcfe40e845521
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.16 b/metadata/md5-cache/media-libs/libchamplain-0.12.16
index 7cbc18b43b51..edb078739713 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.16
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.16
@@ -4,11 +4,11 @@ DESCRIPTION=Clutter based world map renderer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libchamplain
 IUSE=debug +gtk +introspection vala
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/cogl:= >=net-libs/libsoup-2.42:2.4 >=x11-libs/cairo-1.4 x11-libs/gtk+:3 gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.16.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16e14034b48af88f3f89487cc005d36d
+_md5_=41ec353304901ee4d536de779d852aa9
diff --git a/metadata/md5-cache/media-libs/libmediaart-1.9.4 b/metadata/md5-cache/media-libs/libmediaart-1.9.4
index 0dd43a8923ca..e6a96199922d 100644
--- a/metadata/md5-cache/media-libs/libmediaart-1.9.4
+++ b/metadata/md5-cache/media-libs/libmediaart-1.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=Manages, extracts and handles media art caches
 EAPI=6
 HOMEPAGE=https://github.com/GNOME/libmediaart
 IUSE=gtk +introspection qt5 vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) qt5? ( dev-qt/qtgui:5 )
 REQUIRED_USE=?? ( gtk qt5 ) vala? ( introspection )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libmediaart/1.9/libmediaart-1.9.4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b1c7f74dcb7f266cb60875a295573ce
+_md5_=3538b69ddcb73bf2371a89e53e63db0e
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.1 b/metadata/md5-cache/media-sound/pulseaudio-11.1
index 8b987018b44a..71afc5717775 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-11.1
+++ b/metadata/md5-cache/media-sound/pulseaudio-11.1
@@ -4,7 +4,7 @@ DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) || ( ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) ( <media-libs/speex-1.2.0 >=media-libs/speex-1.2_rc1 ) ) gdbm? ( sys-libs/gdbm ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.1.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e3a9aba14a98693aa2867805aaa9c2e
+_md5_=31ba132055d5df2e165c9600b3f16d18
diff --git a/metadata/md5-cache/media-video/subtitleeditor-0.54.0 b/metadata/md5-cache/media-video/subtitleeditor-0.54.0
index 9663bb8d8724..65fe850dd7e9 100644
--- a/metadata/md5-cache/media-video/subtitleeditor-0.54.0
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.54.0
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+3 subtitle editing tool
 EAPI=6
 HOMEPAGE=https://kitone.github.io/subtitleeditor
 IUSE=debug nls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-text/enchant-1.4 app-text/iso-codes >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-cpp/gstreamermm-1.0:1.0= >=dev-cpp/libxmlpp-2.40:2.6 dev-libs/glib:2 >=dev-libs/libsigc++-2.6:2 media-libs/gst-plugins-base:1.0[X,pango] media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/kitone/subtitleeditor/releases/download/0.54.0/subtitleeditor-0.54.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5e3024aa9debb3d77b725665368f8c6
+_md5_=3fc69eb87fb3658315d9d3df1e04f5d5
diff --git a/metadata/md5-cache/net-dialup/moserial-3.0.11 b/metadata/md5-cache/net-dialup/moserial-3.0.11
index ca4d549de25c..e5bad5a30e3b 100644
--- a/metadata/md5-cache/net-dialup/moserial-3.0.11
+++ b/metadata/md5-cache/net-dialup/moserial-3.0.11
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.16:2[dbus] gnome-base/gsettings-desktop-schemas >=x11-l
 DESCRIPTION=A clean and friendly gtk-based serial terminal
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/moserial
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16:2[dbus] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.0.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/moserial/3.0/moserial-3.0.11.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca5ced7cbc45b223b2ef5ad198ffbc4d
+_md5_=df4d1f0ec33f575c38b5de9a302e6f00
diff --git a/metadata/md5-cache/net-im/empathy-3.12.14 b/metadata/md5-cache/net-im/empathy-3.12.14
index ea0481a1c9b1..9de7b21a4f8c 100644
--- a/metadata/md5-cache/net-im/empathy-3.12.14
+++ b/metadata/md5-cache/net-im/empathy-3.12.14
@@ -4,11 +4,11 @@ DESCRIPTION=Telepathy instant messaging and video/audio call client for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Empathy
 IUSE=debug +geolocation gnome gnome-online-accounts +map spell test +v4l test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1
 PDEPEND=>=net-im/telepathy-mission-control-5.14
 RDEPEND=>=dev-libs/glib-2.48:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.4:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 >=dev-libs/folks-0.9.5:=[telepathy] dev-libs/libgee:0.8= >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] >=net-libs/webkit-gtk-2.10:4 >=x11-libs/libnotify-0.7:= media-libs/gstreamer:1.0 >=media-libs/clutter-1.10.0:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 media-libs/clutter-gst:3.0 >=media-libs/cogl-1.14:1.0= net-libs/farstream:0.2= >=net-libs/telepathy-farstream-0.6.0:= >=net-libs/telepathy-glib-0.23.2 >=net-im/telepathy-logger-0.8.0:= app-crypt/gcr[gtk] dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas media-sound/pulseaudio[glib] net-libs/libsoup:2.4 x11-libs/libX11 geolocation? ( >=app-misc/geoclue-2.1:2.0 >=sci-geosciences/geocode-glib-3.10 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= ) map? ( >=media-libs/clutter-1.7.14:1.0 >=media-libs/clutter-gtk-0.90.3:1.0 >=media-libs/libchamplain-0.12.1:0.12[gtk] ) spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) v4l? ( media-plugins/gst-plugins-v4l2:1.0 >=media-video/cheese-3.4:= virtual/libgudev:= ) media-libs/gst-plugins-base:1.0 net-im/telepathy-connection-managers !<net-voip/telepathy-rakia-0.7 x11-themes/adwaita-icon-theme gnome? ( gnome-extra/gnome-contacts )
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=470a649b476f35260989951449cc0a95
+_md5_=d20d4857a667e1a59f08d3ef8518a0f2
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.22.7 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.22.7
index 380ac43b2464..6af40d02d45d 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.22.7
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.22.7
@@ -4,7 +4,7 @@ DESCRIPTION=GNOME framework for accessing online accounts
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 IUSE=debug gnome +introspection kerberos vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+
 PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
 RDEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 )
@@ -12,4 +12,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d5545cbafae4f0f4dcadbe8ff69a9ea
+_md5_=0403cb012fb0eef1edc447cbf629d23d
diff --git a/metadata/md5-cache/net-libs/libdmapsharing-2.9.39 b/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
index a431cf4a20c9..36f0a715fff7 100644
--- a/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
+++ b/metadata/md5-cache/net-libs/libdmapsharing-2.9.39
@@ -4,10 +4,10 @@ DESCRIPTION=A library that implements the DMAP family of protocols
 EAPI=6
 HOMEPAGE=http://www.flyn.org/projects/libdmapsharing
 IUSE=+introspection test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 x11-libs/gdk-pixbuf:2 >=net-dns/avahi-0.6[dbus] >=net-libs/libsoup-2.48.0:2.4 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=3.0/2
 SRC_URI=http://www.flyn.org/projects/libdmapsharing/libdmapsharing-2.9.39.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c34c350f974d36e482282e5628007ab8
+_md5_=91b2a5e83c5df1e387d4b03c7a4bd686
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1
index 1505b7cbea5e..a1d433e1759d 100644
--- a/metadata/md5-cache/net-libs/rest-0.8.1
+++ b/metadata/md5-cache/net-libs/rest-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Helper library for RESTful services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Librest
 IUSE=+introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd2c4e2fe976b7a28f4f0421f03698aa
+_md5_=7803ed123e87a42ef66c4e60b30787b0
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.1 b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
index 541e70235a51..fc693f44373e 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.5.1
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP web service mocking library
 EAPI=5
 HOMEPAGE=https://gitlab.com/uhttpmock/uhttpmock
 IUSE=+introspection vala debug
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6053f8b402870a0835a3631a3a07f02f
+_md5_=72412e56a50bdab6124968d86b53e0bf
diff --git a/metadata/md5-cache/net-misc/gupnp-tools-0.8.14 b/metadata/md5-cache/net-misc/gupnp-tools-0.8.14
index 9827b0aa28ea..ae42013dd8e2 100644
--- a/metadata/md5-cache/net-misc/gupnp-tools-0.8.14
+++ b/metadata/md5-cache/net-misc/gupnp-tools-0.8.14
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 >=net-libs/gssdp-0.13.3:0
 DESCRIPTION=Free replacements of Intel UPnP tools that use GUPnP
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 >=net-libs/gssdp-0.13.3:0= >=net-libs/gupnp-0.20.14:0= >=net-libs/gupnp-av-0.5.5:0= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3 >=x11-libs/gtksourceview-3.2:3.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a44b470d1c9903ae7f767d591c5acb3
+_md5_=6373f1d039eae245ce3ff80652c35d0c
diff --git a/metadata/md5-cache/net-misc/vinagre-3.22.0-r2 b/metadata/md5-cache/net-misc/vinagre-3.22.0-r2
index 1441e0770980..02ddee0739dd 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.22.0-r2
+++ b/metadata/md5-cache/net-misc/vinagre-3.22.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=VNC client for the GNOME desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Vinagre
 IUSE=rdp +ssh spice +telepathy zeroconf
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d48d3054d9464b10ada6cb9ce0e1428c
+_md5_=13f25014da465a89be28215c6b49a021
diff --git a/metadata/md5-cache/net-nntp/pan-0.142 b/metadata/md5-cache/net-nntp/pan-0.142
index d673ae1daec3..9bbece2c7b9a 100644
--- a/metadata/md5-cache/net-nntp/pan-0.142
+++ b/metadata/md5-cache/net-nntp/pan-0.142
@@ -4,10 +4,10 @@ DESCRIPTION=A newsreader for GNOME
 EAPI=6
 HOMEPAGE=http://pan.rebelbase.com/
 IUSE=dbus gnome-keyring libnotify spell ssl
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:2.6 >=sys-libs/zlib-1.2.0 >=x11-libs/gtk+-2.16:2 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3:0= )
 SLOT=0
 SRC_URI=http://pan.rebelbase.com/download/releases/0.142/source/pan-0.142.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c6caea289560c7195cdff1b8ec0988f7
+_md5_=a38b935b33b97764d480401c29b93676
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1
index b4551422de20..177c09ecc283 100644
--- a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1
+++ b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A link-local XMPP connection manager for Telepathy
 EAPI=6
 HOMEPAGE=https://telepathy.freedesktop.org/
 IUSE=gnutls test
-KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6931d7ae1123fa18aa0df8796a4b65fa
+_md5_=4c640adafe959fa72d723fa47ffe71fb
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.45 b/metadata/md5-cache/sys-apps/accountsservice-0.6.45
index 2bef321b9526..1e396e6b22e1 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.45
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.45
@@ -4,11 +4,11 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc elogind +introspection selinux systemd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.37.3:2 sys-auth/polkit elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) !systemd? ( !elogind? ( sys-auth/consolekit ) ) selinux? ( sec-policy/selinux-accountsd )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.45.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f13e53ae7c6955b955d05b30f4a0acf8
+_md5_=fec1d24d30ac233de5ca167a2b3010aa
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20170813 b/metadata/md5-cache/sys-apps/osinfo-db-20170813
index e1e81bf03f7e..03aaed78c6b7 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-20170813
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20170813
@@ -3,8 +3,8 @@ DEPEND=sys-apps/osinfo-db-tools
 DESCRIPTION=osinfo database files
 EAPI=6
 HOMEPAGE=http://libosinfo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20170813.tar.xz
-_md5_=c1504692e1bbbec7488ee967fbe3cb61
+_md5_=d1081f298afa2e810a2e070931efaaea
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2
index 2475425efda6..a01873937fce 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X debug +introspection jpeg jpeg2k tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.10.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a9f7f97b5be533bf5faec625e5622afb
+_md5_=58ff2a879107ff41d257a3f474d305b6
diff --git a/metadata/md5-cache/x11-libs/gksu-2.0.2-r2 b/metadata/md5-cache/x11-libs/gksu-2.0.2-r2
index 592f21f81e8a..5104d7c6ef86 100644
--- a/metadata/md5-cache/x11-libs/gksu-2.0.2-r2
+++ b/metadata/md5-cache/x11-libs/gksu-2.0.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A gtk+ frontend for libgksu
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/gksu/
 IUSE=gnome
-KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libgksu-2.0.8 >=x11-libs/gtk+-2.4:2 >=gnome-base/gconf-2 gnome? ( >=gnome-base/nautilus-2 x11-terms/gnome-terminal )
 SLOT=0
 SRC_URI=https://people.debian.org/~kov/gksu/gksu-2.0.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b2bc856309a3274198bd65375d83e16
+_md5_=0db63a378de8ae094e9c1bae4ce2e382
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.35 b/metadata/md5-cache/x11-libs/goffice-0.10.35
index 85e5d74d6599..0d0cf642ae63 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.10.35
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.35
@@ -4,10 +4,10 @@ DESCRIPTION=A library of document-centric objects and utilities
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/goffice/
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.8.7:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.35.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05bde50cf216eaa529a360c227df827c
+_md5_=723cc67870e02fe16fbc2dbd07d4320d
diff --git a/metadata/md5-cache/x11-libs/goocanvas-2.0.4 b/metadata/md5-cache/x11-libs/goocanvas-2.0.4
index 67e24f8d1a0d..519b82270a95 100644
--- a/metadata/md5-cache/x11-libs/goocanvas-2.0.4
+++ b/metadata/md5-cache/x11-libs/goocanvas-2.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Canvas widget for GTK+ using the cairo 2D library for drawing
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/GooCanvas
 IUSE=examples +introspection python python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=dev-libs/glib-2.28.0:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( 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-python/pygobject-2.90.4:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/goocanvas/2.0/goocanvas-2.0.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b02047e883c0699d83833dc09b959328
+_md5_=90caa3e7487bbf03878b4cf941e3b2ae
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.19 b/metadata/md5-cache/x11-libs/gtk+-3.22.19
index 122eb0d8dd4b..952bfc566afd 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.19
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.19
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.37.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.9 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.19.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=12e81591553411b01170148186d52a94
+_md5_=5f7470cc44702f674f551aceba7fac88
diff --git a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3 b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
index bf8827d6e5a1..871e4db62a49 100644
--- a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
+++ b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A library for integration of su into applications
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/gksu/
 IUSE=nls static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/libX11 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2:2= nls? ( >=sys-devel/gettext-0.14.1 ) app-admin/sudo
 SLOT=2
 SRC_URI=https://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=55110231a1388775e2294cc524ed2c82
+_md5_=e4da838a1d76989dacf9033390064b50
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.12 b/metadata/md5-cache/x11-libs/pango-1.40.12
index 61aaf77da7c9..651b7123fc54 100644
--- a/metadata/md5-cache/x11-libs/pango-1.40.12
+++ b/metadata/md5-cache/x11-libs/pango-1.40.12
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=http://www.pango.org/
 IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.40/pango-1.40.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f58ffa1369da26e0aac214063bc67ce4
+_md5_=e6ef1dc151e23d567d43f2b347510748
diff --git a/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3 b/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
index b4ac35ed7815..7951381e22ba 100644
--- a/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
+++ b/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=GTK-2.0 Theme Switcher
 EAPI=6
 HOMEPAGE=http://plasmasturm.org/programs/gtk-chtheme/
-KEYWORDS=amd64 ~arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://plasmasturm.org/programs/gtk-chtheme/gtk-chtheme-0.3.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=79c449e113767e80b7d50cb8106fac37
+_md5_=674c1844bf67d5f4d583992a7e00022e