diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 44082d2ee4f3..8d8b45a4d8ee 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1 +1,2 @@
 DIST btrbk-0.23.3.tar.xz 69388 SHA256 779636116261e3e0fe64ec986e39be594c04454d87be8005115c8577f62b1725 SHA512 d9fc29b8e2a6e191be93c7845c7f1f99ab60fb4ec910d8b60947ef902b7fdaf789bc73a4884bdd6060f1b180cafaacd5fa8f93dc29624dfea8a2890618ce4012 WHIRLPOOL 4cc9aa102c46feccfb0b90e65d03dd53bed07d78e5a9ddd2afeccfe21fb29f9a2aeba8389771ee7c203598858fb94d59c0d19b73ce1fa29b3772e916bbf4f23b
+DIST btrbk-0.24.0.tar.xz 72308 SHA256 032671c2905005d91a87b85acf8daec05df09bfad9e191092610094fb9a65906 SHA512 fbe180743743ead1241968765b5ae6eff37b2925bee8379443568c126426f2098d280a3f62d13e5f5b63f967ac9889ad9331d73f354d0cd441c907ba92258267 WHIRLPOOL 19052093dcec40d4a8bd5593538f6ec44ea2bbaf6a846f966cebb1f1ff76b9c94700a0bad6f16f33258f92fa05180efc2ba770f02db5553e755beb21b6761ed9
diff --git a/app-backup/btrbk/btrbk-0.24.0.ebuild b/app-backup/btrbk/btrbk-0.24.0.ebuild
new file mode 100644
index 000000000000..20374d41c460
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.24.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+pv"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	pv? ( sys-apps/pv )
+	>=sys-fs/btrfs-progs-3.18.2"
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
+}
diff --git a/dev-lang/php/php-5.6.28.ebuild b/dev-lang/php/php-5.6.28.ebuild
index 3a2ccfdd415b..abb5fe185134 100644
--- a/dev-lang/php/php-5.6.28.ebuild
+++ b/dev-lang/php/php-5.6.28.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20160209.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20160209.ebuild
index 7cd709753306..e183b3e21aac 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20160209.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20160209.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="|| ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/libevdev/libevdev-1.5.2.ebuild b/dev-libs/libevdev/libevdev-1.5.2.ebuild
index 7258a2621951..99038bc19040 100644
--- a/dev-libs/libevdev/libevdev-1.5.2.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.2.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 RESTRICT="test" # Tests need to run as root.
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libinput/libinput-1.3.3.ebuild b/dev-libs/libinput/libinput-1.3.3.ebuild
index 2fc3550f39a6..3d8a64414694 100644
--- a/dev-libs/libinput/libinput-1.3.3.ebuild
+++ b/dev-libs/libinput/libinput-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.4.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.4.ebuild
index 5e04caf17388..2f72eefa090b 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.4.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.4.ebuild
@@ -18,10 +18,10 @@ HOMEPAGE="https://wayland.freedesktop.org/"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="alpha amd64 arm hppa ia64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/wayland-1.11.0.ebuild b/dev-libs/wayland/wayland-1.11.0.ebuild
index 4e83ffb3258c..31a07cb180ec 100644
--- a/dev-libs/wayland/wayland-1.11.0.ebuild
+++ b/dev-libs/wayland/wayland-1.11.0.ebuild
@@ -18,10 +18,10 @@ HOMEPAGE="https://wayland.freedesktop.org/"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="alpha amd64 arm hppa ia64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.4.0.ebuild b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.4.0.ebuild
new file mode 100644
index 000000000000..b15d7c48012b
--- /dev/null
+++ b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MONSIEURP
+MODULE_VERSION=0.004000
+
+inherit perl-module
+
+DESCRIPTION="Readily merge Pull Requests from the Gentoo Github repository"
+HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-perl/Module-Build-Tiny
+	dev-perl/File-Which
+	dev-vcs/git
+	${RDEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Gentoo-App-Pram/Manifest b/dev-perl/Gentoo-App-Pram/Manifest
index 7ee760279818..bb4d4c05f4cf 100644
--- a/dev-perl/Gentoo-App-Pram/Manifest
+++ b/dev-perl/Gentoo-App-Pram/Manifest
@@ -1 +1,2 @@
 DIST Gentoo-App-Pram-0.003000.tar.gz 11035 SHA256 c7731bc329204844f8fe5be6ca60d478bc619a3b071c29fc8fe3ec000f4dfbea SHA512 beebd27fa63f45308cfe9e43a392f33157556bd427a350d16b13d4c953f09d14737260226e1804ef10d597437cbb57301c7ea7595c2a947889563b7bc5142310 WHIRLPOOL 5abbc0d6871f64d180a3c6d462b866a9f6ca7ac6689339e56922b5d519c310a702034c8990e5868b7b27c869fe44ebb9f6270fe3f50a57b5ea1fb368dbaecfb0
+DIST Gentoo-App-Pram-0.004000.tar.gz 10992 SHA256 47de2c596f7ca43a8cf60d4d075d81ebd9b87f9cf73a74bd5d368145a28bee30 SHA512 2ed50f524702a729a0f7bfc88ee6569e7706151586d1ca63b275868a6584684a1a9c8c58b63e2dd5e0ed98fa8b0395579975adedc031236fd8915cf195e88453 WHIRLPOOL 12df8300deec0d33f531da0628af133626144ece6782f22b6983de51cded0d7d50769dcffb5212dd8b9dff87031ffccaf14b574232affbd0ba952f3d8d4e89d0
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 127a145c52f4..ed9b9904183d 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1 +1,2 @@
 DIST gh-0.14.0.gem 15360 SHA256 a243023cbd972df27799b3949a59efeae284d4189155681fb6bbcfdfab34f548 SHA512 05f5c520698c7424efeb1da7d166463c61d003085053e35534ad3fdbaf2282ee025f1a7336b585805051dd0e93974d0c437fcbed77c64db36ee52032984cf33a WHIRLPOOL 8f29664d04b7c8dbe8ffd730bfc4a4bafce29d1f37d0f7b880e5c6b852535b0c0c5393e74ded4b92044535f1a0aeb8aa2d8a6b34fbeac4de7d9f2e4b6fad02a4
+DIST gh-0.14.0.tar.gz 64205 SHA256 ddc973a2835ca2eaddaf3663413c7f3f1da6188104630cddfbab4a2b8f4d0b68 SHA512 8fd4c7bac702c57d98ee509d35dbbc81291f45977bb0e2c3b1f06e2cc3d8635d0656adafa5569ef6b3f9d6acbc563f8db7c69b43cf177dd379335d673f5ef781 WHIRLPOOL 164621c8121e0d5a9d31c39cd37f69f73bd34d71409e143ecca99df7085e1ff82e530714a2ba5e0c12f22adbc16e49c7067572e8664632a9f19638fce16ed7d8
diff --git a/dev-ruby/gh/gh-0.14.0-r1.ebuild b/dev-ruby/gh/gh-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..d572aef480da
--- /dev/null
+++ b/dev-ruby/gh/gh-0.14.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="multi-layer client for the github api v3"
+HOMEPAGE="https://github.com/travis-ci/gh"
+SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/webmock
+"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	dev-ruby/backports
+	>dev-ruby/faraday-0.8
+	>dev-ruby/multi_json-1.0
+	>=dev-ruby/net-http-persistent-2.7
+	dev-ruby/net-http-pipeline
+"
diff --git a/dev-ruby/net-http-pipeline/files/net-http-pipeline-accept-encoding.patch b/dev-ruby/net-http-pipeline/files/net-http-pipeline-accept-encoding.patch
new file mode 100644
index 000000000000..3adfdf28afdc
--- /dev/null
+++ b/dev-ruby/net-http-pipeline/files/net-http-pipeline-accept-encoding.patch
@@ -0,0 +1,18 @@
+--- test/test_net_http_pipeline.rb.old	2016-11-17 07:58:57.284997283 +0100
++++ test/test_net_http_pipeline.rb	2016-11-17 07:58:50.345168508 +0100
+@@ -96,6 +96,7 @@
+   def http_get
+     get = []
+     get << 'GET / HTTP/1.1'
++    get << 'Accept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
+     get << 'Accept: */*'
+     get << 'User-Agent: Ruby' if RUBY_VERSION > '1.9'
+     get.push nil, nil
+@@ -106,6 +107,7 @@
+   def http_post
+     get = []
+     get << 'POST / HTTP/1.1'
++    get << 'Accept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
+     get << 'Accept: */*'
+     get << 'User-Agent: Ruby' if RUBY_VERSION > '1.9'
+     get.push nil, nil
diff --git a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild
index f9cfa202eab6..fe348b5ee472 100644
--- a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild
+++ b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 inherit ruby-fakegem
@@ -16,6 +16,8 @@ SLOT="1"
 KEYWORDS="~amd64"
 IUSE=""
 
+RUBY_PATCHES=( ${PN}-accept-encoding.patch )
+
 ruby_add_bdepend "
 	dev-ruby/hoe
 	test? ( dev-ruby/minitest )
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index ef5f47627b7a..535c70fb8aa6 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,3 +1,4 @@
 DIST spring-1.6.4.tar.gz 39370 SHA256 d7584ecb01fb980451c12d65bbb0175c7b15fb3bf8c117058145de5ecc8c349b SHA512 9dffdcef750bd25028761da8e69c44ae3eace843dff9f81d5566085d3a8c7f944f4c99b6d455078ff564b7135116ae38dcf1aaf6dcc127ac351eae85e15dc143 WHIRLPOOL b7fd0e1520b77e1dc150f270e1cb222915ab98322b9ec0f75242fbfeceec7bd6155262a2fdeee8cf8c5651e9b03e1ce441159042c877675ddc3c4e07fbb2e1cb
 DIST spring-1.7.1.tar.gz 41162 SHA256 36f422666a20cd9ae930993f14056e9072e350a24025a26cc5ec59c76725ec33 SHA512 bf561ae5c9bb5e9f6af640c42bedd0e4992713b90c42e984491d77002c729ffa51723b7f691d14443531243150e37f8bfb67cca1f06aefd4c76548f66728103f WHIRLPOOL f934c5484d27a1d54eaf305d604f006d7ef2797b6209de1e6e4802e6ebdddc85f59c6891b5bafde4878d0c8d99f6d5b94738f987320976f7cf49a23769d24924
 DIST spring-1.7.2.tar.gz 41340 SHA256 652c12950a04b3f342428137b7167bf579b73cb04c7b72e48fa2eacb8047a5b5 SHA512 737bdd3597eeef2c2a832a4060c626f83fe2bc3d6941421c8451408bbbb6392cfe91f408d9e5cceadfcda03d62a589b6758da6d9c029f5336fca5130e6b6857e WHIRLPOOL a00867a08b99d6207063ef8dabc69a488308ad72e8a6986409ccd4f185cd8e6f3b665bef352bce53db9ca1098a7e8fd5fdd6bb76c321b6934ce7d9b5b9a1e962
+DIST spring-2.0.0.tar.gz 41972 SHA256 5bc0d1c7a05654cad6821da66b3e224a839b8ed44dba0fadd0d6d596238e0990 SHA512 8e26ebc33289341c5716002d575eb52b004a7e0f3c5bc657f8afabac2f596f03630cb8be172d8a00d7f68e9b7cda373cc0c3fef404b9082c6dae2375398b1f5d WHIRLPOOL 8c32d4773bf4a0429eb0d6ebf643e7de44152348897fabcf1a607911502069f9136193a10bb6dbc5d4495e29105279e127a1d8b62c5b6b40130e7f6d0599f15c
diff --git a/dev-ruby/spring/spring-2.0.0.ebuild b/dev-ruby/spring/spring-2.0.0.ebuild
new file mode 100644
index 000000000000..7ba33245850a
--- /dev/null
+++ b/dev-ruby/spring/spring-2.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
index 1f3b8e378032..913cdccf001f 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
 
 RESTRICT="!regex? ( test )"
diff --git a/dev-util/bakefile/files/bakefile-0.2.6-enlarge-buffers.patch b/dev-util/bakefile/files/bakefile-0.2.6-enlarge-buffers.patch
deleted file mode 100644
index c0af7bb47bc8..000000000000
--- a/dev-util/bakefile/files/bakefile-0.2.6-enlarge-buffers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ./bakefile-0.2.6.orig/src/bottlenecks.c ./bakefile-0.2.6/src/bottlenecks.c
---- ./bakefile-0.2.6.orig/src/bottlenecks.c	2009-03-26 20:34:42.000000000 +0100
-+++ ./bakefile-0.2.6/src/bottlenecks.c	2009-07-21 22:36:18.111411153 +0200
-@@ -37,7 +37,7 @@
- /* ------------------------------------------------------------------------ */
- 
- #define TEXTBUF_COUNT                8
--#define TEXTBUF_SIZE            102400
-+#define TEXTBUF_SIZE            120000
- 
- static char *textbuf[TEXTBUF_COUNT] = 
-         {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
diff --git a/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch b/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
deleted file mode 100644
index 12dfe315e2d0..000000000000
--- a/dev-util/codeblocks/files/codeblocks-10.05-gcc47.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- a/src/include/scripting/bindings/sc_base_types.h
-+++ b/src/include/scripting/bindings/sc_base_types.h
-@@ -33,6 +33,7 @@ DECLARE_INSTANCE_TYPE(wxPoint);
- DECLARE_INSTANCE_TYPE(wxSize);
- DECLARE_INSTANCE_TYPE(wxString);
- 
-+using SqPlus::GetTypeName;
- // C::B primitives and types
- DECLARE_INSTANCE_TYPE(ConfigManager);
- DECLARE_INSTANCE_TYPE(EditorManager);
-@@ -59,6 +60,7 @@ namespace SqPlus \
-     inline T Get(TypeWrapper<T>,HSQUIRRELVM v,int idx) { SQInteger i; SQPLUS_CHECK_GET(sq_getinteger(v,idx,&i)); return (T)i; } \
- }
- 
-+using SqPlus::Push;
- DECLARE_ENUM_TYPE(wxPathFormat);
- DECLARE_ENUM_TYPE(wxPathNormalize);
- DECLARE_ENUM_TYPE(PrintColourMode);
---- /dev/null
-+++ b/src/include/scripting/squirrel/sqmem.h
-@@ -0,0 +1,8 @@
-+/*	see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
---- a/src/include/scripting/squirrel/sqstate.h
-+++ b/src/include/scripting/squirrel/sqstate.h
-@@ -136,8 +136,4 @@ extern SQObjectPtr _one_;
- extern SQObjectPtr _minusone_;
- 
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
---- a/src/include/scripting/squirrel/squtils.h
-+++ b/src/include/scripting/squirrel/squtils.h
-@@ -2,6 +2,7 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+#include "sqmem.h"
- #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));
---- a/src/plugins/contrib/help_plugin/defs.h
-+++ b/src/plugins/contrib/help_plugin/defs.h
-@@ -289,7 +289,7 @@ class QMap : public std::map<Key, T>
- 
-             if (i.second == false && overwrite)
-             {
--                find(k)->second = t;
-+                this->find(k)->second = t;
-             }
- 
-             return i.first;
-@@ -297,7 +297,7 @@ class QMap : public std::map<Key, T>
- 
-         int remove(const Key &k)
-         {
--            return erase(k);
-+            return this->erase(k);
-         }
- };
- 
---- a/src/plugins/contrib/help_plugin/man2html.cpp
-+++ b/src/plugins/contrib/help_plugin/man2html.cpp
-@@ -123,7 +123,7 @@
- 
- #include <ctype.h>
- 
--//#include <unistd.h>
-+#include <unistd.h>
- #include <string.h>
- 
- #include <stdio.h>
---- a/src/plugins/debuggergdb/gdb_driver.cpp
-+++ b/src/plugins/debuggergdb/gdb_driver.cpp
-@@ -72,6 +72,7 @@ static wxRegEx reChildPid3(_T("Thread[ \t]+[xA-Fa-f0-9-]+[ \t]+\\(LWP ([0-9]+)\\
- 
- 
- // scripting support
-+using SqPlus::Push;
- DECLARE_INSTANCE_TYPE(GDB_driver);
- 
- GDB_driver::GDB_driver(DebuggerGDB* plugin)
diff --git a/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch b/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
deleted file mode 100644
index af95ac2ca2b2..000000000000
--- a/dev-util/codeblocks/files/codeblocks-10.05-wxChartCtrl-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-codeblocks crashes when a wxChartCtrl is added with wxSmith
-
-https://bugs.gentoo.org/show_bug.cgi?id=372837
-https://developer.berlios.de/bugs/?func=detailbug&bug_id=18182&group_id=5358
-
-
---- a/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
-+++ b/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
-@@ -156,7 +156,13 @@ void wxChartWindow::DrawHLines(
-         }
-         
-         wxChartSizes *sizes = GetSizes();
--        
-+
-+	// sizes may be NULL, in this case do nothing 
-+	// not sure if this is the right way to do things 
-+	//  gw.fossdev@gmail.com 
-+	if (!sizes) 
-+		return; 
-+
-         hp->SetPen( *wxBLACK_DASHED_PEN );
-         
-         double current = lower;
-@@ -188,6 +194,10 @@ ChartValue wxChartWindow::GetVirtualWidth() const
-     int iNodes = static_cast<int>(ceil( GetVirtualMaxX() ));
-     wxChartSizes *sizes = GetSizes();
-     
-+    /// sizes may be NULL, in this case return a fixes value 
-+    if (!sizes) 
-+	    return 1; 
-+    
-     ChartValue x = 0;
- 
-     for ( int iNode = 0; iNode <= iNodes; ++ iNode )
diff --git a/games-arcade/savagewheels/files/savagewheels-1.6.0-cmakelists.txt.patch b/games-arcade/savagewheels/files/savagewheels-1.6.0-cmakelists.txt.patch
deleted file mode 100644
index eef00f9b7bfc..000000000000
--- a/games-arcade/savagewheels/files/savagewheels-1.6.0-cmakelists.txt.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- savagewheels-1.6.0/CMakeLists.txt.old	2016-04-02 16:45:40.416146450 -0700
-+++ savagewheels-1.6.0/CMakeLists.txt	2016-04-02 16:57:14.930931857 -0700
-@@ -9,22 +9,33 @@ set(APP_VER_PATCH "0")
- 
- ### check for required libs
- find_package(SDL REQUIRED)
- 
- ### Install targets (see: http://www.cmake.org/Wiki/CMake_RPATH_handling)
--if (NOT INSTALL_DIR)
--    set(INSTALL_DIR "./")
-+if (UNIX)
-+	include (GNUInstallDirs)
-+else()
-+	if (NOT INSTALL_DIR)
-+		set(INSTALL_DIR "./")
-+	endif()
-+	set(CMAKE_INSTALL_BINDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_SBINDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_LIBEXECDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_SYSCONFDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_SHAREDSTATEDIR	"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_LOCALSTATEDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_LIBDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_INCLUDEDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_OLDINCLUDEDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_DATAROOTDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_DATADIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_INFODIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_LOCALEDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_MANDIR		"${INSTALL_DIR}")
-+	set(CMAKE_INSTALL_DOCDIR		"${INSTALL_DIR}")
- endif()
- 
--# when building, don't use the install RPATH already
--# (but later on when installing)
--SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
--
--# add the automatically determined parts of the RPATH
--SET(CMAKE_INSTALL_RPATH "${INSTALL_DIR}/")
--SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--
- ### sources
- include_directories(src/)
- include_directories(tinyxml/)
- 
- set(
-@@ -113,11 +124,11 @@ if (SOUND STREQUAL "NO")
-     message(STATUS "Found SOUND=NO option. Compiling without sound support!")
- elseif(SOUND STREQUAL "FMOD")
-     # FModEx API
- 
- 	# check if path to FMod is defined
--	if(NOT DEFINED ${FMOD_PATH})
-+	if(NOT DEFINED FMOD_PATH)
- 		set(FMOD_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libs/fmod/api")
- 	endif()
- 
-     add_definitions(-I${FMOD_PATH}/inc)
-     link_directories(${FMOD_PATH}/lib)
-@@ -164,17 +175,19 @@ elseif(SOUND STREQUAL "FMOD")
- 	else()
- 		message(STATUS "Found FModEx lib at ${FMOD_LIBRARY}. Found FModEx DLL at ${FMOD_LIBRARY_SO_PATH}.")
- 		
- 		add_definitions(-DWITH_FMOD)
- 		
--		add_custom_command(TARGET savagewheels POST_BUILD
--			COMMAND ${CMAKE_COMMAND} -E copy_if_different 
--			${FMOD_LIBRARY_SO_PATH} 
--			$<TARGET_FILE_DIR:savagewheels>)
--			
--		INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${FMOD_SO_NAME}" 
--		    DESTINATION ${INSTALL_DIR})
-+		if (WIN32)
-+			add_custom_command(TARGET savagewheels POST_BUILD
-+				COMMAND "${CMAKE_COMMAND}" -E copy_if_different
-+				"${FMOD_LIBRARY_SO_PATH}"
-+				"$<TARGET_FILE_DIR:savagewheels>")
-+
-+			INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${FMOD_SO_NAME}"
-+				DESTINATION "${INSTALL_DIR}")
-+		endif()
- 	endif()
- 
- else()
-     # SDL_mixer API
-     find_package(SDL_mixer REQUIRED)
-@@ -234,19 +247,36 @@ endif()
- ### Configure compile time header file 
- configure_file (
-   "${PROJECT_SOURCE_DIR}/Config.h.in"
-   "${PROJECT_SOURCE_DIR}/src/Config.h")
-   
--INSTALL(TARGETS savagewheels RUNTIME DESTINATION ${INSTALL_DIR})
--INSTALL(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/run.sh" DESTINATION ${INSTALL_DIR})
-+
-+INSTALL(TARGETS savagewheels RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}")
-+if (WIN32 AND NOT UNIX)
-+	INSTALL(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/run.sh" DESTINATION "${INSTALL_DIR}")
-+else()
-+	configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/savagewheels.in"
-+		"${CMAKE_CURRENT_BINARY_DIR}/savagewheels.sh"
-+		@ONLY)
-+	INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/savagewheels.sh"
-+		DESTINATION "${CMAKE_INSTALL_BINDIR}" RENAME savagewheels)
-+endif()
-+
- INSTALL(FILES
-     "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
-     "${CMAKE_CURRENT_SOURCE_DIR}/HISTORY"
-     "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
-+    "${CMAKE_CURRENT_SOURCE_DIR}/bin/LICENSE.mikmod.txt"
-+    "${CMAKE_CURRENT_SOURCE_DIR}/bin/Readme.html"
-+    "${CMAKE_CURRENT_SOURCE_DIR}/bin/README-SDL_mixer.txt"
-+    "${CMAKE_CURRENT_SOURCE_DIR}/bin/README-SDL.txt"
--    DESTINATION ${INSTALL_DIR})
-+	DESTINATION "${CMAKE_INSTALL_DOCDIR}")
--INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/"
--    DESTINATION ${INSTALL_DIR}
-+INSTALL(FILES
-+    "${CMAKE_CURRENT_SOURCE_DIR}/bin/bindings.xml"
-+        DESTINATION "${CMAKE_INSTALL_DATADIR}")
-+INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/help"
-+    DESTINATION "${CMAKE_INSTALL_DOCDIR}/help"
-     PATTERN "debug.html" EXCLUDE
-     PATTERN "pref" EXCLUDE)
-     
- ### build a CPack driven installer package
- include (InstallRequiredSystemLibraries)
diff --git a/games-arcade/savagewheels/files/savagewheels-1.6.0-linux_dirs.patch b/games-arcade/savagewheels/files/savagewheels-1.6.0-linux_dirs.patch
deleted file mode 100644
index 13ca8019ff9f..000000000000
--- a/games-arcade/savagewheels/files/savagewheels-1.6.0-linux_dirs.patch
+++ /dev/null
@@ -1,359 +0,0 @@
---- savagewheels-1.6.0/src/Main.cpp.old	2016-04-14 21:18:38.115071742 -0700
-+++ savagewheels-1.6.0/src/Main.cpp	2016-04-14 22:01:42.375422000 -0700
-@@ -43,10 +43,17 @@
-  * Alpha Release: 29.06.2003
-  */
- 
- #include "Main.h"
- 
-+const char *sys_datadir;
-+const char *usr_cfgdir;
-+const char *usr_datadir;
-+
-+char *ART_FILE;
-+char *BINDINGS_FILE;
-+
- int main( int argc, char *argv[] )
- {
- 	bool hardware_support = true;
- 	/*
- 	 * Start the game in a window by default.
-@@ -57,16 +64,92 @@ int main( int argc, char *argv[] )
- 	 * Linux Note: Running the game in fullscreen would sometimes crash the gfx manager.
- 	 * This is probably due to some video drivers. I was so far able to reproduce it on
- 	 * ATI Mobility type of video cards.
- 	 */
- 	bool fullscreen = false;
-+	String tmp;
- 
- #ifdef LINUX_BUILD
-+	sys_datadir = getenv("SAVAGEWHEELS_SYS_DATADIR");
-+	if (sys_datadir == NULL)
-+	{
-+	    fprintf(stderr, "SAVAGEWHEELS_SYS_DATADIR not set.\n");
-+	    return 1;
-+	}
-+	sys_datadir = strdup(sys_datadir);
-+
-+	usr_cfgdir = getenv("SAVAGEWHEELS_USR_CONFDIR");
-+	if (usr_cfgdir == NULL)
-+	{
-+	    fprintf(stderr, "SAVAGEWHEELS_USR_CONFDIR not set.\n");
-+	    return 1;
-+	}
-+	usr_cfgdir = strdup(usr_cfgdir);
-+
-+	usr_datadir = getenv("SAVAGEWHEELS_USR_DATADIR");
-+	if (usr_datadir == NULL)
-+	{
-+	    fprintf(stderr, "SAVAGEWHEELS_USR_DATADIR not set.\n");
-+	    return 1;
-+	}
-+	usr_datadir = strdup(usr_datadir);
-+
-+	if (sys_datadir == NULL || usr_cfgdir == NULL || usr_datadir == NULL)
-+	{
-+	    fprintf(stderr, "Insufficient memory.  Execution aborted.\n");
-+	    return 1;
-+	}
-+
- 	setenv("SDL_VIDEO_CENTERED", "1", 1);
- #else
-+	sys_datadir = usr_cfgdir = usr_datadir = "./";
- 	_putenv("SDL_VIDEO_CENTERED=1");
- #endif
-+	int len;
-+	len = snprintf(NULL, 0, "%s/graphics/gfxdata.kdf", sys_datadir);
-+	if (len < 0)
-+	{
-+		fprintf(stderr,
-+			"Unable to store '%s/graphics/gfxdata.kdf': %s\n",
-+			sys_datadir, strerror(errno));
-+		return 1;
-+	}
-+	if (len == INT_MAX)
-+	{
-+		fprintf(stderr, "Unable to store '%s/graphics/gfxdata.kdf': "
-+			"Path too log\n", sys_datadir);
-+		return 1;
-+	}
-+	ART_FILE = new (std::nothrow) char[len + 1];
-+	if (ART_FILE == NULL)
-+	{
-+		fprintf(stderr, "Insufficent memory.  Execution aborted.\n");
-+		return 1;
-+	}
-+	sprintf(ART_FILE, "%s/graphics/gfxdata.kdf", sys_datadir);
-+
-+	len = snprintf(NULL, 0, "%s/bindings.xml", usr_cfgdir);
-+	if (len < 0)
-+	{
-+		fprintf(stderr,
-+			"Unable to store '%s/bindings.xml': %s\n", usr_cfgdir,
-+			strerror(errno));
-+		return 1;
-+	}
-+	if (len == INT_MAX)
-+	{
-+		fprintf(stderr, "Unable to store '%s/bindings.xml': "
-+			"Path too log\n", usr_cfgdir);
-+		return 1;
-+	}
-+	BINDINGS_FILE = new (std::nothrow) char[len + 1];
-+	if (BINDINGS_FILE == NULL)
-+	{
-+		fprintf(stderr, "Insufficent memory.  Execution aborted.\n");
-+		return 1;
-+	}
-+	sprintf(BINDINGS_FILE, "%s/bindings.xml", usr_cfgdir);
- 
- 	if (argc > 1) {
- 		for (int i = 1; i < argc; i++) {
- 			if (!strncmp(argv[i], "-wnd", 4)) {
- 				fullscreen = false;
-@@ -104,11 +187,12 @@
- 	
- 	/*
- 	 * Load & Start Game
- 	 */
- 	  
--	OpenLog("debug.html");
-+	tmp = String(usr_datadir).append("/debug.html");
-+	OpenLog(tmp.c_str());
- 	
- 	CGame game;
- 	game.Execute(fullscreen, hardware_support);
- 	game.Close();
- 
---- savagewheels-1.6.0/src/Main.h.old	2016-04-14 21:20:27.443522441 -0700
-+++ savagewheels-1.6.0/src/Main.h	2016-04-14 21:56:22.449964486 -0700
-@@ -35,10 +35,11 @@
- #include <cstdlib>
- #include <cmath>
- #include <cstdarg>
- #include <cassert>
- #include <exception>
-+#include <cerrno>
- 
- #include <ctime>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/timeb.h>
-@@ -84,12 +85,10 @@
- 
- // --- version
- #include "Config.h"
- 
- // --- global game defines
--#define ART_FILE	"graphics/gfxdata.kdf"
--#define BINDINGS_FILE	"bindings.xml"
- #define LOAD_OK         (-1)
- #define LOAD_FAILED     (0)
- #define HRESULT(x)	( (x) == NULL : LOAD_OK ? LOAD_FAILED )
- #define NLPTR_SURF	0 //((SDL_Surface *)NULL)
- 
-@@ -100,10 +99,16 @@
- #endif
- 
- typedef std::string			String;
- typedef std::ostringstream	OutputSStream;
- 
-+extern const char *sys_datadir;
-+extern const char *usr_cfgdir;
-+extern const char *usr_datadir;
-+
-+extern char *ART_FILE;
-+extern char *BINDINGS_FILE;
- //#include "pstdint.h" // portable types
- #include "Utils.h"
- #include "CKdf.h"
- #include "CSdl.h"
- #include "CSwv_module.h"
---- savagewheels-1.6.0/src/Utils.cpp.old	2016-04-15 19:28:21.757879157 -0700
-+++ savagewheels-1.6.0/src/Utils.cpp	2016-04-15 19:28:28.478786779 -0700
-@@ -261,11 +261,11 @@ inline String GetFormattedTime()
- bool OpenLog ( const char* filename )
- {
-     String time( GetFormattedTime() );
- 
-     // open debug file
--    debug_file.open ( "debug.html", std::ios::out ); //ios::ate );
-+    debug_file.open ( filename, std::ios::out ); //ios::ate );
-     if ( ! debug_file.good() )
-       return false;
- 
-     debug_file << "<html><head><title>Savage Wheels Log File</title></head><body><h1>Savage Wheels V" << VER_MAJ << "." << VER_MIN << " - Log File</h1>";
-     debug_file << "<hr/><pre>";
---- savagewheels-1.6.0/src/CGame.cpp.old	2016-04-15 20:43:37.479330001 -0700
-+++ savagewheels-1.6.0/src/CGame.cpp	2016-04-15 21:04:48.044721904 -0700
-@@ -116,10 +116,11 @@ void CGame::Close()
- ///////////////////////////////////////////////////////////////////////
- bool CGame::LoadGame()
- {
- 	char buf[255];
- 	int  i = 0;
-+	String tmp (sys_datadir);
- 
- 	AppendToLog( LOG_DASH );
- 	AppendToLog("Loading Game...");
- 
- 	// global screen rect
-@@ -161,11 +162,14 @@ bool CGame::LoadGame()
- 	srand( (unsigned)SDL_GetTicks() );
- 
- 	UpdateSplash();  // UPDATESPLASH... 
- 
- 	// search for vehicles
--	if ( Swv.SearchAndLoad( "autos" ) != SWV_SUCCESS ) return false;
-+	tmp.resize(strlen(sys_datadir));
-+	tmp.append("/autos");
-+	if ( Swv.SearchAndLoad( tmp.c_str() ) != SWV_SUCCESS )
-+		return false;
- 
- 	// check for vehicle number
- 	if ( Swv.GetVehicles() < 4 ) 
- 	{
- 		AppendToLog( "Not enough vehicles in the /auto dir!" );
---- savagewheels-1.6.0/src/CSdl.cpp.old	2016-04-16 16:00:56.600502348 -0700
-+++ savagewheels-1.6.0/src/CSdl.cpp	2016-04-16 16:01:16.152226435 -0700
-@@ -1298,13 +1298,10 @@
- 	return NULL;
- #else
- 	
- 	SDL_Surface *sdl_surf = NULL;
- 
--	char filename_buf[255];
--	sprintf( filename_buf, "../%s", filename );
--
- 	if ( ( sdl_surf = SDL_LoadBMP( filename_buf )) == NULL )
- 	{
- 		LOG("...failed to load graphics from : " << filename_buf );
- 		return NULL;
- 	}
---- savagewheels-1.6.0/src/CSounds.cpp.old	2016-04-16 16:06:43.887600441 -0700
-+++ savagewheels-1.6.0/src/CSounds.cpp	2016-04-16 16:17:44.729332218 -0700
-@@ -46,22 +46,39 @@
- // Name: Initialize()
- // Desc: Load all ingame sounds
- //////////////////////////////////////////////////////////////////////
- bool CSounds::Initialize( CSdl *pSdl )
- {
--	ASSERT( _sdl != NULL );
-+	ASSERT( pSdl != NULL );
- 	this->_sdl = pSdl;
- 
- #if defined(WITH_FMOD) || defined(WITH_SDLMIXER)
-+	String tmp (sys_datadir);
- 
--#define LOAD_SOUND( container, name, buffered ) if ( (sounds[container] = _sdl->LoadSound( name, buffered )) == -1 ) { \
--	LOG( "Failed to load " << name << " ! "); \
--	return false; }
-+#define LOAD_SOUND( container, name, buffered)					\
-+	do {									\
-+		tmp.append("/").append(name);					\
-+		sounds[container] =						\
-+			_sdl->LoadSound( tmp.c_str(), buffered );		\
-+		if ( sounds[container] == -1 ) {				\
-+			LOG( "Failed to load " << name << " ! " );		\
-+			return false;						\
-+		}								\
-+		tmp.resize(strlen(sys_datadir));				\
-+	} while(0)
- 
--#define LOAD_MUSIC( container, name ) if ( (music[container] = _sdl->LoadSound( name, false, true )) == -1 ) { \
--	LOG( "Failed to load music " << name << " ! "); \
--	return false; }
-+#define LOAD_MUSIC( container, name)						\
-+	do {									\
-+		tmp.append("/").append(name);					\
-+		music[container] =						\
-+			_sdl->LoadSound( tmp.c_str(), false, true );		\
-+		if ( music[container] == -1 ) {					\
-+			LOG( "Failed to load music " << name << " ! " );	\
-+			return false;						\
-+		}								\
-+		tmp.resize(strlen(sys_datadir));				\
-+	} while(0)
- 
- 	LOAD_SOUND( SND_CRASHLIGHT1, "sound/crash3.wav", true );
- 	LOAD_SOUND( SND_CRASHLIGHT2, "sound/crash2.wav", true );
- 	LOAD_SOUND( SND_CRASHLIGHT3, "sound/crash1.wav", true );
- 	LOAD_SOUND( SND_EXPLOSION1, "sound/exp.wav", true );
---- savagewheels-1.6.0/src/CSwv_module.cpp.old	2016-04-16 20:58:04.366973388 -0700
-+++ savagewheels-1.6.0/src/CSwv_module.cpp	2016-04-16 20:58:13.026851358 -0700
-@@ -204,12 +204,10 @@ int CSwv_module::Load( char *filename, S
- // 		DBG("pos: " << swv_file->pfiles[i].pos
- // 				<< " size (KB): " << swv_file->pfiles[i].length
- // 				<< " name: " << swv_file->pfiles[i].filename);
- //	}
- 	
--	// set module filename
--	sprintf( swv_file->filename, "%s", filename );
- 
- 	if ( fp != NULL )
- 	  fclose( fp );
- 
- 	return SWV_SUCCESS;
---- savagewheels-1.6.0/src/CSdl.cpp.old	2016-04-16 21:02:07.680544534 -0700
-+++ savagewheels-1.6.0/src/CSdl.cpp	2016-04-16 21:06:59.400432874 -0700
-@@ -1336,12 +1339,25 @@ SDL_Surface* CSdl::LoadBitmap( const cha
- SDL_Surface* CSdl::LoadBitmap( const char *filename, int32_t file_offset, Uint32 file_size, Uint32 color_key, Uint16 alpha_value )
- {
- 	SDL_Surface  *sdl_surf	= NULL;						// temp surface
- 	FILE		 *fp		= NULL;						// file pointer
- 	SDL_RWops	 *sdl_rw	= NULL;						// sdl_read_write_operations
-+	String tmp;
- 
--	if ( ( fp = fopen( filename, "rb")) == NULL ) 
-+#ifdef LINUX_BUILD
-+	if ( filename[0] != '/' )
-+	{
-+	    tmp = String(sys_datadir).append("/autos/").append(filename);
-+	}
-+	else
-+	{
-+		tmp = String(filename);
-+	}
-+#else
-+	tmp = String(filename);
-+#endif
-+	if ( ( fp = fopen( tmp.c_str(), "rb")) == NULL ) 
- 	{
- 		LOG("...failed to open file : " << filename );
- 		return NULL;
- 	}
- 
---- savagewheels-1.6.0/src/CMainMenu.cpp.old	2016-04-16 22:13:23.442523534 -0700
-+++ savagewheels-1.6.0/src/CMainMenu.cpp	2016-04-16 22:13:17.701605381 -0700
-@@ -1121,12 +1121,13 @@ void CMainMenu::SaveSettings()
- 	if ( _game == NULL )
- 	  return;
- 
- 	FILE *fp = NULL;
- 	char  header[3] = { 'S', 'W', 'P' };
-+	String strPref(String(usr_cfgdir) + "/pref");
- 
--	if ( ( fp = fopen( "pref", "wb" ) ) == NULL )
-+	if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
- 	{
- 		AppendToLog( "Error writing to /pref file !" );
- 		return;
- 	}
- 
---- savagewheels-1.6.0/src/CMainMenu.cpp.old	2016-04-17 07:38:09.417653268 -0700
-+++ savagewheels-1.6.0/src/CMainMenu.cpp	2016-04-17 07:38:24.277437113 -0700
-@@ -1168,12 +1167,13 @@ void CMainMenu::SaveSettings()
- void CMainMenu::LoadSettings()
- {
- 	FILE  *fp = NULL;
- 	char  header[3];
- 	bool  success = true;
-+	String strPref(String(usr_cfgdir) + "/pref");
- 
--	if ( ( fp = fopen( "pref", "rb" ) ) == NULL )
-+	if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
- 	{
- 		AppendToLog( "Error opening /pref file !" );
- 		success = false;
- 	}
- 
diff --git a/games-emulation/dolphin/files/dolphin-5.0-dynamic-llvm-detect.patch b/games-emulation/dolphin/files/dolphin-5.0-dynamic-llvm-detect.patch
deleted file mode 100644
index 798ec56a4fac..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0-dynamic-llvm-detect.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1515497ab88dc2452ed0db20a4610663cd04ff21 Mon Sep 17 00:00:00 2001
-From: comex <comexk@gmail.com>
-Date: Tue, 7 Jul 2015 07:49:46 -0400
-Subject: [PATCH] Make the LLVM detect script verify that the dynamic library actually exists.
-
-For some dumb reason, llvm-config doesn't provide the flags to link
-against the dynamic library copy of LLVM (as opposed to static), so the
-script has to guess the library name.  However, in some installations
-(such as mine), there is no dynamic copy, which caused Dolphin to fail
-to link.  Change the script to do a link test.  If it fails, one option
-would be to fall back on static linking, but I just have it fail to
-detect LLVM, because statically linking Dolphin against LLVM is really
-not a great idea - huge binary, long link time.
----
- CMakeTests/FindLLVM.cmake | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeTests/FindLLVM.cmake b/CMakeTests/FindLLVM.cmake
-index 7fe664f..cfcfaed 100644
---- a/CMakeTests/FindLLVM.cmake
-+++ b/CMakeTests/FindLLVM.cmake
-@@ -1,6 +1,9 @@
- # This file only exists because LLVM's cmake files are broken.
- # This affects both LLVM 3.4 and 3.5.
- # Hopefully when they fix their cmake system we don't need this garbage.
-+
-+include(CheckLibraryExists)
-+
- list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config")
- list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.5")
- list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.4")
-@@ -11,13 +14,16 @@ foreach(LLVM_CONFIG_NAME ${LLVM_CONFIG_EXECUTABLES})
- 		execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_PACKAGE_VERSION
- 			OUTPUT_STRIP_TRAILING_WHITESPACE )
- 		if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "3.3")
--			set(LLVM_FOUND 1)
- 			execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
- 				OUTPUT_STRIP_TRAILING_WHITESPACE )
- 			execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS
- 				OUTPUT_STRIP_TRAILING_WHITESPACE )
--			set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}")
--			break()
-+			check_library_exists(LLVM-${LLVM_PACKAGE_VERSION} LLVMVerifyFunction "${LLVM_LDFLAGS}" HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
-+			if (HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
-+				set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}")
-+				set(LLVM_FOUND 1)
-+				break()
-+			endif()
- 		endif()
- 	endif()
- endforeach()
--- 
-2.6.2
-
diff --git a/games-emulation/dolphin/files/dolphin-5.0-miniupnpc-abi-14.patch b/games-emulation/dolphin/files/dolphin-5.0-miniupnpc-abi-14.patch
deleted file mode 100644
index ecb6abba8e12..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0-miniupnpc-abi-14.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 8c5744bca705a0895bd51c966a30171ee2bab43a Mon Sep 17 00:00:00 2001
-From: Marisa Kirisame <marisa@sayachan.org>
-Date: Tue, 29 Sep 2015 23:10:31 +0200
-Subject: [PATCH] miniupnpc API version 14 changed the upnpDiscover functions,
- adding an argument for TTL (should default to 2) this enables support for
- that should the build system have that specific version installed, the
- miniupnpc bundled in the project is unchanged
-
----
- CMakeLists.txt                     |  5 ++++-
- CMakeTests/FindMiniupnpc.cmake     | 39 +++++++++++++++++++++++++++++++++-----
- Source/Core/Core/NetPlayServer.cpp |  4 ++++
- 3 files changed, 42 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 291efee..7ac0679 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -690,9 +690,12 @@ if(USE_UPNP)
- 	if(NOT APPLE AND NOT ANDROID)
- 		include(FindMiniupnpc)
- 	endif()
--	if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+	if(MINIUPNP_FOUND AND (MINIUPNPC_VERSION_1_7_OR_HIGHER OR MINIUPNPC_VERSION_API14_OR_HIGHER))
- 		message("Using shared miniupnpc")
- 		include_directories(${MINIUPNP_INCLUDE_DIR})
-+		if (MINIUPNPC_VERSION_API14_OR_HIGHER)
-+			add_definitions(-DUPNPDISCOVER_HAS_TTL)
-+		endif()
- 	else()
- 		message("Using static miniupnpc from Externals")
- 		add_subdirectory(Externals/miniupnpc)
-diff --git a/CMakeTests/FindMiniupnpc.cmake b/CMakeTests/FindMiniupnpc.cmake
-index bb1048c..5301d40 100644
---- a/CMakeTests/FindMiniupnpc.cmake
-+++ b/CMakeTests/FindMiniupnpc.cmake
-@@ -58,6 +58,30 @@ if (MINIUPNP_FOUND)
- 	#include <stdio.h>
- 	int main()
- 	{
-+	struct UPNPDev *devlist = NULL;
-+	int upnp_delay = 5000;
-+	const char *upnp_multicastif = NULL;
-+	const char *upnp_minissdpdsock = NULL;
-+	int upnp_sameport = 0;
-+	int upnp_ipv6 = 0;
-+	unsigned char upnp_ttl = 2;
-+	int upnp_error = 0;
-+	devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
-+
-+	return 0;
-+	}"
-+	MINIUPNPC_VERSION_API14_OR_HIGHER)
-+
-+IF (NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
-+	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
-+	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
-+	check_cxx_source_runs("
-+	#include <miniwget.h>
-+	#include <miniupnpc.h>
-+	#include <upnpcommands.h>
-+	#include <stdio.h>
-+	int main()
-+	{
- 	static struct UPNPUrls urls;
- 	static struct IGDdatas data;
- 
-@@ -66,8 +90,9 @@ if (MINIUPNP_FOUND)
- 	return 0;
- 	}"
- 	MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+   ENDIF()
- 
--IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
- 	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
- 	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
- 	check_cxx_source_runs("
-@@ -91,7 +116,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
- 	MINIUPNPC_VERSION_PRE1_7)
-    ENDIF()
- 
--   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
- 	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
- 	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
- 	   check_cxx_source_runs("
-@@ -116,7 +141,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
- 
-    ENDIF()
- 
--   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
- 	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
- 	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
- 	   check_cxx_source_runs("
-@@ -136,7 +161,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
- 	   MINIUPNPC_VERSION_1_5_OR_HIGHER)
- 	ENDIF()
- 
--	IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+	IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
- 		set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
- 		set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
- 		check_cxx_source_runs("
-@@ -167,10 +192,14 @@ IF(MINIUPNPC_VERSION_PRE1_7)
- 	message(STATUS "Found miniupnpc version is pre v1.7")
- ENDIF()
- 
--IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
-+IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
- 	message(STATUS "Found miniupnpc version is v1.7 or higher")
- ENDIF()
- 
-+IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+	message(STATUS "Found miniupnpc version is v1.9 API version 14 or higher")
-+ENDIF()
-+
- else ()
- 	message (STATUS "Could not find miniupnp")
- endif ()
-diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
-index 7ed283a..27b46c9 100644
---- a/Source/Core/Core/NetPlayServer.cpp
-+++ b/Source/Core/Core/NetPlayServer.cpp
-@@ -904,7 +904,11 @@ bool NetPlayServer::initUPnP()
- 	memset(&m_upnp_data, 0, sizeof(IGDdatas));
- 
- 	// Find all UPnP devices
-+#ifdef UPNPDISCOVER_HAS_TTL
-+	UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &upnperror);
-+#else
- 	UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror);
-+#endif
- 	if (!devlist)
- 	{
- 		WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");
diff --git a/games-emulation/dolphin/files/dolphin-emu-3.5-gcc-4.8.patch b/games-emulation/dolphin/files/dolphin-emu-3.5-gcc-4.8.patch
deleted file mode 100644
index 98b128f90542..000000000000
--- a/games-emulation/dolphin/files/dolphin-emu-3.5-gcc-4.8.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- Externals/Bochs_disasm/PowerPCDisasm.cpp	2013-05-04 10:01:04.218490222 +0200
-+++ Externals/Bochs_disasm/PowerPCDisasm.cpp	2013-05-04 10:01:19.159459773 +0200
-@@ -580,7 +580,7 @@
- 		if (me < mb) 
- 			mask = ~mask;
- 		//rotate the mask so it can be applied to source reg
--		return _rotl(mask, 32 - r);
-+		return __rotl(mask, 32 - r);
- 	}
- 
- 
---- Source/Core/Common/Src/CommonFuncs.h	2013-05-04 10:01:04.139490384 +0200
-+++ Source/Core/Common/Src/CommonFuncs.h	2013-05-04 10:02:18.181339068 +0200
-@@ -65,7 +65,7 @@
- 	#endif
- 	#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
- 
--inline u32 _rotl(u32 x, int shift) {
-+inline u32 __rotl(u32 x, int shift) {
-     shift &= 31;
-     if (!shift) return x;
-     return (x << shift) | (x >> (32 - shift));
-@@ -76,7 +76,7 @@
- 	return (x << n) | (x >> (64 - n));
- }
- 
--inline u32 _rotr(u32 x, int shift) {
-+inline u32 __rotr(u32 x, int shift) {
-     shift &= 31;
-     if (!shift) return x;
-     return (x >> shift) | (x << (32 - shift));
---- Source/Core/Common/Src/Hash.cpp	2013-05-04 10:01:04.140490382 +0200
-+++ Source/Core/Common/Src/Hash.cpp	2013-05-04 10:01:19.161459756 +0200
-@@ -362,15 +362,15 @@
- inline void bmix32(u32 & h1, u32 & h2, u32 & k1, u32 & k2, u32 & c1, u32 & c2)
- {
- 	k1 *= c1; 
--	k1  = _rotl(k1,11); 
-+	k1  = __rotl(k1,11); 
- 	k1 *= c2;
- 	h1 ^= k1;
- 	h1 += h2;
- 
--	h2 = _rotl(h2,17);
-+	h2 = __rotl(h2,17);
- 
- 	k2 *= c2; 
--	k2  = _rotl(k2,11);
-+	k2  = __rotl(k2,11);
- 	k2 *= c1;
- 	h2 ^= k2;
- 	h2 += h1;
---- Source/Core/Core/Src/ARDecrypt.cpp	2013-05-04 10:01:04.193490273 +0200
-+++ Source/Core/Core/Src/ARDecrypt.cpp	2013-05-04 10:01:19.161459756 +0200
-@@ -270,26 +270,26 @@
- {
- 	u32 tmp;
- 
--	*val = _rotl(*val,4);
-+	*val = __rotl(*val,4);
- 
- 	tmp = ((*addr^*val)&0xF0F0F0F0);
- 	*addr ^= tmp;
--	*val = _rotr((*val^tmp),0x14);
-+	*val = __rotr((*val^tmp),0x14);
- 
- 	tmp = ((*addr^*val)&0xFFFF0000);
- 	*addr ^= tmp;
--	*val = _rotr((*val^tmp),0x12);
-+	*val = __rotr((*val^tmp),0x12);
- 
- 	tmp = ((*addr^*val)&0x33333333);
- 	*addr ^= tmp;
--	*val = _rotr((*val^tmp),6);
-+	*val = __rotr((*val^tmp),6);
- 
- 	tmp = ((*addr^*val)&0x00FF00FF);
- 	*addr ^= tmp;
--	*val = _rotl((*val^tmp),9);
-+	*val = __rotl((*val^tmp),9);
- 
- 	tmp = ((*addr^*val)&0xAAAAAAAA);
--	*addr = _rotl((*addr^tmp),1);
-+	*addr = __rotl((*addr^tmp),1);
- 	*val ^= tmp;
- }
- 
-@@ -297,27 +297,27 @@
- {
- 	u32 tmp;
- 
--	*val = _rotr(*val,1);
-+	*val = __rotr(*val,1);
- 
- 	tmp = ((*addr^*val)&0xAAAAAAAA);
- 	*val ^= tmp;
--	*addr = _rotr((*addr^tmp),9);
-+	*addr = __rotr((*addr^tmp),9);
- 
- 	tmp = ((*addr^*val)&0x00FF00FF);
- 	*val ^= tmp;
--	*addr = _rotl((*addr^tmp),6);
-+	*addr = __rotl((*addr^tmp),6);
- 
- 	tmp = ((*addr^*val)&0x33333333);
- 	*val ^= tmp;
--	*addr = _rotl((*addr^tmp),0x12);
-+	*addr = __rotl((*addr^tmp),0x12);
- 
- 	tmp = ((*addr^*val)&0xFFFF0000);
- 	*val ^= tmp;
--	*addr = _rotl((*addr^tmp),0x14);
-+	*addr = __rotl((*addr^tmp),0x14);
- 
- 	tmp = ((*addr^*val)&0xF0F0F0F0);
- 	*val ^= tmp;
--	*addr = _rotr((*addr^tmp),4);
-+	*addr = __rotr((*addr^tmp),4);
- }
- 
- void decryptcode(u32 *seeds, u32 *code)
-@@ -330,11 +330,11 @@
- 	unscramble1(&addr,&val);
- 	while (i < 32)
- 	{
--		tmp = (_rotr(val,4)^seeds[i++]);
-+		tmp = (__rotr(val,4)^seeds[i++]);
- 		tmp2 = (val^seeds[i++]);
- 		addr ^= (table6[tmp&0x3F]^table4[(tmp>>8)&0x3F]^table2[(tmp>>16)&0x3F]^table0[(tmp>>24)&0x3F]^table7[tmp2&0x3F]^table5[(tmp2>>8)&0x3F]^table3[(tmp2>>16)&0x3F]^table1[(tmp2>>24)&0x3F]);
- 
--		tmp = (_rotr(addr,4)^seeds[i++]);
-+		tmp = (__rotr(addr,4)^seeds[i++]);
- 		tmp2 = (addr^seeds[i++]);
- 		val ^= (table6[tmp&0x3F]^table4[(tmp>>8)&0x3F]^table2[(tmp>>16)&0x3F]^table0[(tmp>>24)&0x3F]^table7[tmp2&0x3F]^table5[(tmp2>>8)&0x3F]^table3[(tmp2>>16)&0x3F]^table1[(tmp2>>24)&0x3F]);
- 	}
---- Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp	2013-05-04 10:01:04.187490286 +0200
-+++ Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp	2013-05-04 10:01:19.162459748 +0200
-@@ -194,21 +194,21 @@
- void Interpreter::rlwimix(UGeckoInstruction _inst)
- {
- 	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
--	m_GPR[_inst.RA] = (m_GPR[_inst.RA] & ~mask) | (_rotl(m_GPR[_inst.RS],_inst.SH) & mask);
-+	m_GPR[_inst.RA] = (m_GPR[_inst.RA] & ~mask) | (__rotl(m_GPR[_inst.RS],_inst.SH) & mask);
- 	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
- }
- 
- void Interpreter::rlwinmx(UGeckoInstruction _inst)
- {
- 	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
--	m_GPR[_inst.RA] = _rotl(m_GPR[_inst.RS],_inst.SH) & mask;
-+	m_GPR[_inst.RA] = __rotl(m_GPR[_inst.RS],_inst.SH) & mask;
- 	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
- }
- 
- void Interpreter::rlwnmx(UGeckoInstruction _inst)
- {
- 	u32 mask = Helper_Mask(_inst.MB,_inst.ME);
--	m_GPR[_inst.RA] = _rotl(m_GPR[_inst.RS], m_GPR[_inst.RB] & 0x1F) & mask;
-+	m_GPR[_inst.RA] = __rotl(m_GPR[_inst.RS], m_GPR[_inst.RB] & 0x1F) & mask;
- 
- 	if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
- }
---- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp	2013-05-04 10:01:04.185490290 +0200
-+++ Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp	2013-05-04 10:01:19.190459657 +0200
-@@ -1672,7 +1672,7 @@
- 	{
- 		unsigned result = (int)gpr.R(s).offset;
- 		if (inst.SH != 0)
--			result = _rotl(result, inst.SH);
-+			result = __rotl(result, inst.SH);
- 		result &= Helper_Mask(inst.MB, inst.ME);
- 		gpr.SetImmediate32(a, result);
- 		if (inst.Rc)
-@@ -1739,7 +1739,7 @@
- 	if (gpr.R(a).IsImm() && gpr.R(s).IsImm())
- 	{
- 		u32 mask = Helper_Mask(inst.MB,inst.ME);
--		gpr.SetImmediate32(a, ((u32)gpr.R(a).offset & ~mask) | (_rotl((u32)gpr.R(s).offset,inst.SH) & mask));
-+		gpr.SetImmediate32(a, ((u32)gpr.R(a).offset & ~mask) | (__rotl((u32)gpr.R(s).offset,inst.SH) & mask));
- 		if (inst.Rc)
- 		{
- 			ComputeRC(gpr.R(a));
-@@ -1824,7 +1824,7 @@
- 	u32 mask = Helper_Mask(inst.MB, inst.ME);
- 	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
- 	{
--		gpr.SetImmediate32(a, _rotl((u32)gpr.R(s).offset, (u32)gpr.R(b).offset & 0x1F) & mask);
-+		gpr.SetImmediate32(a, __rotl((u32)gpr.R(s).offset, (u32)gpr.R(b).offset & 0x1F) & mask);
- 		if (inst.Rc)
- 		{
- 			ComputeRC(gpr.R(a));
---- Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp	2013-05-04 10:01:04.188490284 +0200
-+++ Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp	2013-05-04 10:01:19.191459655 +0200
-@@ -248,7 +248,7 @@
- 		return 0;
- 	case Rol:
- 		if (isImm(*getOp2(I))) {
--			return _rotl(ComputeKnownZeroBits(getOp1(I)),
-+			return __rotl(ComputeKnownZeroBits(getOp1(I)),
- 			             GetImmValue(getOp2(I)));
- 		}
- 	default:
-@@ -844,7 +844,7 @@
- InstLoc IRBuilder::FoldRol(InstLoc Op1, InstLoc Op2) {
- 	if (isImm(*Op2)) {
- 		if (isImm(*Op1))
--			return EmitIntConst(_rotl(GetImmValue(Op1),
-+			return EmitIntConst(__rotl(GetImmValue(Op1),
- 					          GetImmValue(Op2)));
- 		if (!(GetImmValue(Op2) & 31)) return Op1;
- 	}
diff --git a/kde-frameworks/plasma/files/plasma-5.26.0-activationTogglesExpanded.patch b/kde-frameworks/plasma/files/plasma-5.26.0-activationTogglesExpanded.patch
new file mode 100644
index 000000000000..f32f2b426f4c
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.26.0-activationTogglesExpanded.patch
@@ -0,0 +1,124 @@
+commit 65706d3878d556c7a1eac18984ec41b1a1d96d56
+Author: Roman Gilg <subdiff@gmail.com>
+Date:   Wed Oct 19 18:51:15 2016 +0200
+
+    New bool to use activated signal as toggle of expanded
+    
+    The launcher applets couldn't be closed with Meta alone and on Wayland
+    in general by any global shortcut, since we used for that the focusOutEvent
+    triggered only on X and only on global shortcuts (on default Alt+F1).
+    
+    This patch introduces the new bool activationTogglesExpanded, which allowes
+    QML applets to decide if they wish to use the activated signal also to end
+    their expanded state.
+    
+    The default value is false, in order to not break any legacy applets.
+    
+    REVIEW: 129204
+    BUG: 367685
+
+diff --git a/src/plasmaquick/appletquickitem.cpp b/src/plasmaquick/appletquickitem.cpp
+index ce2b82a..e2fd40e 100644
+--- a/src/plasmaquick/appletquickitem.cpp
++++ b/src/plasmaquick/appletquickitem.cpp
+@@ -48,7 +48,8 @@ AppletQuickItemPrivate::AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickIte
+       switchWidth(-1),
+       switchHeight(-1),
+       applet(a),
+-      expanded(false)
++      expanded(false),
++      activationTogglesExpanded(false)
+ {
+ }
+ 
+@@ -727,6 +728,20 @@ void AppletQuickItem::setExpanded(bool expanded)
+     emit expandedChanged(expanded);
+ }
+ 
++bool AppletQuickItem::isActivationTogglesExpanded() const
++{
++    return d->activationTogglesExpanded;
++}
++
++void AppletQuickItem::setActivationTogglesExpanded(bool activationTogglesExpanded)
++{
++    if (d->activationTogglesExpanded == activationTogglesExpanded) {
++        return;
++    }
++    d->activationTogglesExpanded = activationTogglesExpanded;
++    emit activationTogglesExpandedChanged(activationTogglesExpanded);
++}
++
+ ////////////Internals
+ 
+ KDeclarative::QmlObject *AppletQuickItem::qmlObject()
+diff --git a/src/plasmaquick/appletquickitem.h b/src/plasmaquick/appletquickitem.h
+index 943e227..7df364d 100644
+--- a/src/plasmaquick/appletquickitem.h
++++ b/src/plasmaquick/appletquickitem.h
+@@ -81,6 +81,12 @@ class PLASMAQUICK_EXPORT AppletQuickItem : public QQuickItem
+     Q_PROPERTY(bool expanded WRITE setExpanded READ isExpanded NOTIFY expandedChanged)
+ 
+     /**
++     * True when the applet wants the activation signal act in toggle mode, i.e. while being expanded
++     * the signal shrinks the applet to its not exanded state instead of reexpanding it.
++     */
++    Q_PROPERTY(bool activationTogglesExpanded WRITE setActivationTogglesExpanded READ isActivationTogglesExpanded NOTIFY activationTogglesExpandedChanged)
++
++    /**
+      * the applet root QML item: sometimes is the same as fullRepresentationItem
+      * if a fullrepresentation was not declared explicitly
+      */
+@@ -126,6 +132,9 @@ public:
+     bool isExpanded() const;
+     void setExpanded(bool expanded);
+ 
++    bool isActivationTogglesExpanded() const;
++    void setActivationTogglesExpanded(bool activationTogglesExpanded);
++
+ ////NEEDED BY QML TO CREATE ATTACHED PROPERTIES
+     static AppletQuickItem *qmlAttachedProperties(QObject *object);
+ 
+@@ -135,6 +144,7 @@ Q_SIGNALS:
+     void switchHeightChanged(int height);
+ 
+     void expandedChanged(bool expanded);
++    void activationTogglesExpandedChanged(bool activationTogglesExpanded);
+ 
+     void compactRepresentationChanged(QQmlComponent *compactRepresentation);
+     void fullRepresentationChanged(QQmlComponent *fullRepresentation);
+diff --git a/src/plasmaquick/private/appletquickitem_p.h b/src/plasmaquick/private/appletquickitem_p.h
+index 1436935..ffd2bf2 100644
+--- a/src/plasmaquick/private/appletquickitem_p.h
++++ b/src/plasmaquick/private/appletquickitem_p.h
+@@ -104,6 +104,7 @@ public:
+     Plasma::Package containmentPackage;
+ 
+     bool expanded : 1;
++    bool activationTogglesExpanded : 1;
+ 
+     static QHash<QObject *, AppletQuickItem *> s_rootObjects;
+ };
+diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp
+index 1cd6934..f24bc51 100644
+--- a/src/scriptengines/qml/plasmoid/appletinterface.cpp
++++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp
+@@ -142,11 +142,16 @@ void AppletInterface::init()
+     emit busyChanged();
+ 
+     applet()->updateConstraints(Plasma::Types::UiReadyConstraint);
++
+     connect(applet(), &Plasma::Applet::activated,
+     [ = ]() {
+-        setExpanded(true);
++        // in case the applet doesn't want to get shrinked on reactivation,
++        // we always expand it again (only in order to conform with legacy behaviour)
++        bool activate = !( isExpanded() && isActivationTogglesExpanded() );
++
++        setExpanded(activate);
+         if (QQuickItem *i = qobject_cast<QQuickItem *>(fullRepresentationItem())) {
+-            i->setFocus(true, Qt::ShortcutFocusReason);
++            i->setFocus(activate, Qt::ShortcutFocusReason);
+         }
+     });
+ 
diff --git a/kde-frameworks/plasma/plasma-5.27.0.ebuild b/kde-frameworks/plasma/plasma-5.26.0-r1.ebuild
similarity index 95%
rename from kde-frameworks/plasma/plasma-5.27.0.ebuild
rename to kde-frameworks/plasma/plasma-5.26.0-r1.ebuild
index c0ad25e496d3..7d457212e975 100644
--- a/kde-frameworks/plasma/plasma-5.27.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.26.0-r1.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.26.0-activationTogglesExpanded.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package egl EGL)
diff --git a/kde-frameworks/plasma/plasma-5.27.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.27.0-r1.ebuild
new file mode 100644
index 000000000000..7d457212e975
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.27.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles2 X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	egl? ( media-libs/mesa[egl] )
+	!gles2? ( virtual/opengl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	X? ( x11-proto/xproto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-15.08.3-r1:5
+	!<kde-plasma/kdeplasma-addons-5.4.3-r1:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.26.0-activationTogglesExpanded.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
index 9b238b68b698..2d4f7eca0b32 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
@@ -1,441 +1,23 @@
-From 3f859c3dbdded68cc96d4c695ff27d15c387da09 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Mon, 10 Oct 2016 16:30:24 +0200
-Subject: [PATCH] Port to new plasma-framework API
-
-Reduces unnecessary castings.
-Ports away the WindowedWidgets runner from KService
-
-REVIEW: 129101
----
- applets/systemtray/systemtray.cpp                  | 30 +++++++-------
- .../shellprivate/widgetexplorer/widgetexplorer.cpp | 14 +++----
- plasma-windowed/plasmawindowedcorona.cpp           |  2 +-
- runners/windowedwidgets/windowedwidgetsrunner.cpp  | 46 ++++++++++------------
- runners/windowedwidgets/windowedwidgetsrunner.h    |  2 +-
- shell/alternativeshelper.cpp                       |  6 +--
- shell/containmentconfigview.cpp                    |  2 +-
- shell/scripting/containment.cpp                    |  4 +-
- shell/scripting/widget.cpp                         |  2 +-
- shell/shellcorona.cpp                              | 15 +++----
- 10 files changed, 60 insertions(+), 63 deletions(-)
-
-diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
-index e1cd610..ecc23a4 100644
---- a/applets/systemtray/systemtray.cpp
-+++ b/applets/systemtray/systemtray.cpp
-@@ -99,19 +99,19 @@ void SystemTray::init()
- {
-     Containment::init();
- 
--    for (const auto &info: Plasma::PluginLoader::self()->listAppletInfo(QString())) {
--        if (!info.isValid() || info.property(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
-+    for (const auto &info: Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
-+        if (!info.isValid() || info.value(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
-             continue;
-         }
--        m_systrayApplets[info.pluginName()] = info;
-+        m_systrayApplets[info.pluginId()] = KPluginInfo(info);
- 
--        if (info.isPluginEnabledByDefault()) {
--            m_defaultPlasmoids += info.pluginName();
-+        if (info.isEnabledByDefault()) {
-+            m_defaultPlasmoids += info.pluginId();
-         }
--        const QString dbusactivation = info.property(QStringLiteral("X-Plasma-DBusActivationService")).toString();
-+        const QString dbusactivation = info.value(QStringLiteral("X-Plasma-DBusActivationService"));
-         if (!dbusactivation.isEmpty()) {
--            qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginName() << dbusactivation;
--            m_dbusActivatableTasks[info.pluginName()] = dbusactivation;
-+            qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginId() << dbusactivation;
-+            m_dbusActivatableTasks[info.pluginId()] = dbusactivation;
-         }
-     }
- }
-@@ -119,12 +119,12 @@ void SystemTray::init()
- void SystemTray::newTask(const QString &task)
- {
-     foreach (Plasma::Applet *applet, applets()) {
--        if (!applet->pluginInfo().isValid()) {
-+        if (!applet->pluginMetaData().isValid()) {
-             continue;
-         }
- 
-         //only allow one instance per applet
--        if (task == applet->pluginInfo().pluginName()) {
-+        if (task == applet->pluginMetaData().pluginId()) {
-             //Applet::destroy doesn't delete the applet from Containment::applets in the same event
-             //potentially a dbus activated service being restarted can be added in this time.
-             if (!applet->destroyed()) {
-@@ -156,7 +156,7 @@ void SystemTray::newTask(const QString &task)
- void SystemTray::cleanupTask(const QString &task)
- {
-     foreach (Plasma::Applet *applet, applets()) {
--        if (!applet->pluginInfo().isValid() || task == applet->pluginInfo().pluginName()) {
-+        if (!applet->pluginMetaData().isValid() || task == applet->pluginMetaData().pluginId()) {
-             //we are *not* cleaning the config here, because since is one
-             //of those automatically loaded/unloaded by dbus, we want to recycle
-             //the config the next time it's loaded, in case the user configured something here
-@@ -255,11 +255,11 @@ Q_INVOKABLE QString SystemTray::plasmoidCategory(QQuickItem *appletInterface) co
-     }
- 
-     Plasma::Applet *applet = appletInterface->property("_plasma_applet").value<Plasma::Applet*>();
--    if (!applet || !applet->pluginInfo().isValid()) {
-+    if (!applet || !applet->pluginMetaData().isValid()) {
-         return "UnknownCategory";
-     }
- 
--    const QString cat = applet->pluginInfo().property(QStringLiteral("X-Plasma-NotificationAreaCategory")).toString();
-+    const QString cat = applet->pluginMetaData().value(QStringLiteral("X-Plasma-NotificationAreaCategory"));
- 
-     if (cat.isEmpty()) {
-         return "UnknownCategory";
-@@ -385,11 +385,11 @@ void SystemTray::restorePlasmoids()
-     foreach (Plasma::Applet *applet, applets()) {
-         //Here it should always be valid.
-         //for some reason it not always is.
--        if (!applet->pluginInfo().isValid()) {
-+        if (!applet->pluginMetaData().isValid()) {
-             applet->config().parent().deleteGroup();
-             applet->deleteLater();
-         } else {
--            const QString task = applet->pluginInfo().pluginName();
-+            const QString task = applet->pluginMetaData().pluginId();
-             if (!m_allowedPlasmoids.contains(task)) {
-                 //in those cases we do delete the applet config completely
-                 //as they were explicitly disabled by the user
-diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
-index c2b38a8..b445897 100644
---- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
-+++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
-@@ -249,14 +249,14 @@ void WidgetExplorerPrivate::addContainment(Containment *containment)
-     QObject::connect(containment, SIGNAL(appletRemoved(Plasma::Applet*)), q, SLOT(appletRemoved(Plasma::Applet*)));
- 
-     foreach (Applet *applet, containment->applets()) {
--        if (applet->pluginInfo().isValid()) {
-+        if (applet->pluginMetaData().isValid()) {
-             Containment *childContainment = applet->property("containment").value<Containment*>();
-             if (childContainment) {
-                 addContainment(childContainment);
-             }
--            runningApplets[applet->pluginInfo().pluginName()]++;
-+            runningApplets[applet->pluginMetaData().pluginId()]++;
-         } else {
--            qDebug() << "Invalid plugininfo. :(";
-+            qDebug() << "Invalid plugin metadata. :(";
-         }
-     }
- }
-@@ -268,10 +268,10 @@ void WidgetExplorerPrivate::containmentDestroyed()
- 
- void WidgetExplorerPrivate::appletAdded(Plasma::Applet *applet)
- {
--    if (!applet->pluginInfo().isValid()) {
-+    if (!applet->pluginMetaData().isValid()) {
-         return;
-     }
--    QString name = applet->pluginInfo().pluginName();
-+    QString name = applet->pluginMetaData().pluginId();
- 
-     runningApplets[name]++;
-     appletNames.insert(applet, name);
-@@ -471,9 +471,9 @@ void WidgetExplorer::uninstall(const QString &pluginName)
-             const auto &applets = c->applets();
- 
-             foreach (Applet *applet, applets) {
--                const auto &appletInfo = applet->pluginInfo();
-+                const auto &appletInfo = applet->pluginMetaData();
- 
--                if (appletInfo.isValid() && appletInfo.pluginName() == pluginName) {
-+                if (appletInfo.isValid() && appletInfo.pluginId() == pluginName) {
-                     applet->destroy();
-                 }
-             }
-diff --git a/plasma-windowed/plasmawindowedcorona.cpp b/plasma-windowed/plasmawindowedcorona.cpp
-index fbacbf8..b68d270 100644
---- a/plasma-windowed/plasmawindowedcorona.cpp
-+++ b/plasma-windowed/plasmawindowedcorona.cpp
-@@ -51,7 +51,7 @@ void PlasmaWindowedCorona::loadApplet(const QString &applet, const QVariantList
- 
-     //forbid more instances per applet (todo: activate the correpsponding already loaded applet)
-     for (Plasma::Applet *a : cont->applets()) {
--        if (a->pluginInfo().pluginName() == applet) {
-+        if (a->pluginMetaData().pluginId() == applet) {
-             return;
-         }
-     }
+commit 238ec3ee671bcf6716348122bebefb20c25d1101
+Author: David Edmundson <kde@davidedmundson.co.uk>
+Date:   Thu, 17 Nov 2016 10:53:48 +0000
+
+    [Windowed Widgets Runner] Don't access invalid KPluginInfo
+    
+    BUG: 372017
+    FIXED-IN: 5.8.4
+    
 diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-index 5ccbd27..7f093a7 100644
+index 5ccbd27..f86159a 100644
 --- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
 +++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-@@ -60,24 +60,22 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
- 
-    QList<Plasma::QueryMatch> matches;
- 
--    foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
--        KService::Ptr service = info.service();
--
--        if (((service->name().contains(term, Qt::CaseInsensitive) ||
--             service->genericName().contains(term, Qt::CaseInsensitive) ||
--             service->comment().contains(term, Qt::CaseInsensitive)) ||
--             service->categories().contains(term, Qt::CaseInsensitive) ||
-+    foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
-+        if (((md.name().contains(term, Qt::CaseInsensitive) ||
-+             md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
-+             md.description().contains(term, Qt::CaseInsensitive)) ||
-+             md.category().contains(term, Qt::CaseInsensitive) ||
-              term.startsWith(i18nc("Note this is a KRunner keyword", "mobile applications"))) &&
--             !info.property(QStringLiteral("NoDisplay")).toBool()) {
-+             !md.rawData().value(QStringLiteral("NoDisplay")).toBool()) {
- 
--            QVariant val = info.property(QStringLiteral("X-Plasma-StandAloneApp"));
-+            QVariant val = md.value(QStringLiteral("X-Plasma-StandAloneApp"));
-             if (!val.isValid() || !val.toBool()) {
-                 continue;
-             }
- 
-             Plasma::QueryMatch match(this);
--            setupMatch(service, match);
--            if (service->name().compare(term, Qt::CaseInsensitive) == 0) {
-+            setupMatch(md, match);
-+            if (md.name().compare(term, Qt::CaseInsensitive) == 0) {
-                 match.setType(Plasma::QueryMatch::ExactMatch);
-                 match.setRelevance(1);
-             } else {
-@@ -85,8 +83,6 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
-                 match.setRelevance(0.7);
-             }
-             matches << match;
--
--            qDebug() << service;
-         }
-     }
- 
-@@ -100,27 +96,27 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
- void WindowedWidgetsRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
- {
-     Q_UNUSED(context);
--    KService::Ptr service = KService::serviceByStorageId(match.data().toString());
--    if (service) {
--        QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << service->property(QStringLiteral("X-KDE-PluginInfo-Name"), QVariant::String).toString());
-+    KPluginMetaData md(match.data().toString());
-+    if (md.isValid()) {
-+        QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << md.pluginId());
-     }
- }
- 
--void WindowedWidgetsRunner::setupMatch(const KService::Ptr &service, Plasma::QueryMatch &match)
-+void WindowedWidgetsRunner::setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &match)
- {
--    const QString name = service->name();
-+    const QString name = md.pluginId();
- 
-     match.setText(name);
--    match.setData(service->storageId());
-+    match.setData(md.metaDataFileName());
- 
--    if (!service->genericName().isEmpty() && service->genericName() != name) {
--        match.setSubtext(service->genericName());
--    } else if (!service->comment().isEmpty()) {
--        match.setSubtext(service->comment());
-+    if (!md.name().isEmpty() && md.name() != name) {
-+        match.setSubtext(md.name());
-+    } else if (!md.description().isEmpty()) {
-+        match.setSubtext(md.description());
-     }
- 
--    if (!service->icon().isEmpty()) {
--        match.setIconName(service->icon());
-+    if (!md.iconName().isEmpty()) {
-+        match.setIconName(md.iconName());
-     }
- }
- 
-diff --git a/runners/windowedwidgets/windowedwidgetsrunner.h b/runners/windowedwidgets/windowedwidgetsrunner.h
-index 2294965..fbc8006 100644
---- a/runners/windowedwidgets/windowedwidgetsrunner.h
-+++ b/runners/windowedwidgets/windowedwidgetsrunner.h
-@@ -48,7 +48,7 @@ protected Q_SLOTS:
- 
- 
- protected:
--    void setupMatch(const KService::Ptr &service, Plasma::QueryMatch &action);
-+    void setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &action);
- };
- 
- #endif
-diff --git a/shell/alternativeshelper.cpp b/shell/alternativeshelper.cpp
-index d0f5dfd..6d76307 100644
---- a/shell/alternativeshelper.cpp
-+++ b/shell/alternativeshelper.cpp
-@@ -38,12 +38,12 @@ AlternativesHelper::~AlternativesHelper()
- 
- QStringList AlternativesHelper::appletProvides() const
- {
--    return m_applet->pluginInfo().property(QStringLiteral("X-Plasma-Provides")).toStringList();
-+    return KPluginMetaData::readStringList(m_applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
- }
+@@ -60,6 +60,9 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
  
- QString AlternativesHelper::currentPlugin() const
- {
--    return m_applet->pluginInfo().pluginName();
-+    return m_applet->pluginMetaData().pluginId();
- }
- 
- QQuickItem *AlternativesHelper::applet() const
-@@ -53,7 +53,7 @@ QQuickItem *AlternativesHelper::applet() const
- 
- void AlternativesHelper::loadAlternative(const QString &plugin)
- {
--    if (plugin == m_applet->pluginInfo().pluginName() || m_applet->isContainment()) {
-+    if (plugin == m_applet->pluginMetaData().pluginId() || m_applet->isContainment()) {
-         return;
-     }
- 
-diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
-index cec067e..4c9d146 100644
---- a/shell/containmentconfigview.cpp
-+++ b/shell/containmentconfigview.cpp
-@@ -104,7 +104,7 @@ QAbstractItemModel *ContainmentConfigView::currentContainmentActionsModel()
- 
- QString ContainmentConfigView::containmentPlugin() const
- {
--    return m_containment->pluginInfo().pluginName();
-+    return m_containment->pluginMetaData().pluginId();
- }
- 
- void ContainmentConfigView::setContainmentPlugin(const QString &plugin)
-diff --git a/shell/scripting/containment.cpp b/shell/scripting/containment.cpp
-index 6040e62..96e2009 100644
---- a/shell/scripting/containment.cpp
-+++ b/shell/scripting/containment.cpp
-@@ -248,7 +248,7 @@ QScriptValue Containment::widgets(QScriptContext *context, QScriptEngine *engine
-     int count = 0;
- 
-     foreach (Plasma::Applet *widget, c->d->containment.data()->applets()) {
--        if (widgetType.isEmpty() || widget->pluginInfo().pluginName() == widgetType) {
-+        if (widgetType.isEmpty() || widget->pluginMetaData().pluginId() == widgetType) {
-             widgets.setProperty(count, env->wrap(widget));
-             ++count;
-         }
-@@ -273,7 +273,7 @@ QString Containment::type() const
-         return QString();
-     }
- 
--    return d->containment.data()->pluginInfo().pluginName();
-+    return d->containment.data()->pluginMetaData().pluginId();
- }
- 
- void Containment::remove()
-diff --git a/shell/scripting/widget.cpp b/shell/scripting/widget.cpp
-index a651c2a..b58822b 100644
---- a/shell/scripting/widget.cpp
-+++ b/shell/scripting/widget.cpp
-@@ -65,7 +65,7 @@ uint Widget::id() const
- QString Widget::type() const
- {
-     if (d->applet) {
--        return d->applet.data()->pluginInfo().pluginName();
-+        return d->applet.data()->pluginMetaData().pluginId();
-     }
- 
-     return QString();
-diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
-index 33259da..598fdb0 100644
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -406,7 +406,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
-                 || cont->location() == Plasma::Types::BottomEdge
-                 || cont->location() == Plasma::Types::LeftEdge
-                 || cont->location() == Plasma::Types::RightEdge) &&
--            cont->pluginInfo().pluginName() != QStringLiteral("org.kde.plasma.private.systemtray");
-+            cont->pluginMetaData().pluginId() != QStringLiteral("org.kde.plasma.private.systemtray");
-     };
- 
-     auto isDesktop = [] (Plasma::Containment *cont) {
-@@ -493,7 +493,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
- 
-                 KConfigGroup appletConfig = applet->config();
- 
--                appletJson.insert("plugin", applet->pluginInfo().pluginName());
-+                appletJson.insert("plugin", applet->pluginMetaData().pluginId());
-                 appletJson.insert("config", dumpconfigGroupJS(appletConfig));
- 
-                 appletsJsonArray << appletJson;
-@@ -560,7 +560,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
-             QJsonObject appletJson;
- 
-             appletJson.insert("title",      applet->title());
--            appletJson.insert("plugin",     applet->pluginInfo().pluginName());
-+            appletJson.insert("plugin",     applet->pluginMetaData().pluginId());
- 
-             appletJson.insert("geometry.x",      geometry.x() / gridUnit);
-             appletJson.insert("geometry.y",      geometry.y() / gridUnit);
-@@ -1238,11 +1238,11 @@ void ShellCorona::handleContainmentAdded(Plasma::Containment *c)
- 
- void ShellCorona::executeSetupPlasmoidScript(Plasma::Containment *containment, Plasma::Applet *applet)
- {
--    if (!applet->pluginInfo().isValid() || !containment->pluginInfo().isValid()) {
-+    if (!applet->pluginMetaData().isValid() || !containment->pluginMetaData().isValid()) {
-         return;
-     }
- 
--    const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginInfo().pluginName() + ".js");
-+    const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginMetaData().pluginId() + ".js");
- 
-     if (scriptFile.isEmpty()) {
-         return;
-@@ -1541,7 +1541,7 @@ Plasma::Containment *ShellCorona::setContainmentTypeForScreen(int screen, const
-     //if creation failed or invalid plugin, give up
-     if (!newContainment) {
-         return oldContainment;
--    } else if (!newContainment->pluginInfo().isValid()) {
-+    } else if (!newContainment->pluginMetaData().isValid()) {
-         newContainment->deleteLater();
-         return oldContainment;
-     }
-@@ -1975,7 +1975,8 @@ void ShellCorona::activateLauncherMenu()
-     for (auto it = m_panelViews.constBegin(), end = m_panelViews.constEnd(); it != end; ++it) {
-         const auto applets = it.key()->applets();
-         for (auto applet : applets) {
--            if (applet->pluginInfo().property("X-Plasma-Provides").toStringList().contains(QStringLiteral("org.kde.plasma.launchermenu"))) {
-+            const auto provides = KPluginMetaData::readStringList(applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
-+            if (provides.contains(QLatin1String("org.kde.plasma.launchermenu"))) {
-                 if (!applet->globalShortcut().isEmpty()) {
-                     emit applet->activated();
-                     return;
--- 
-2.7.3
-
-From 59b2d1effcee8d449cbbcd237ba8cebaeb4dd949 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Mon, 14 Nov 2016 15:23:00 +0100
-Subject: [PATCH] [Windowed Widgets Runner] Don't access invalid
- KPluginMetaData
-
-BUG: 372017
-FIXED-IN: 5.8.4
-
-Differential Revision: https://phabricator.kde.org/D3356
----
- runners/windowedwidgets/windowedwidgetsrunner.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-index 7f093a7..706b1bb 100644
---- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
-+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-@@ -61,6 +61,10 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
-    QList<Plasma::QueryMatch> matches;
- 
-     foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
-+        if (!md.isValid()) {
+     foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
+         KService::Ptr service = info.service();
++        if (!service || !service->isValid()) {
 +            continue;
 +        }
-+
-         if (((md.name().contains(term, Qt::CaseInsensitive) ||
-              md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
-              md.description().contains(term, Qt::CaseInsensitive)) ||
--- 
-2.7.3
-
+ 
+         if (((service->name().contains(term, Qt::CaseInsensitive) ||
+              service->genericName().contains(term, Qt::CaseInsensitive) ||
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r2.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r3.ebuild
diff --git a/media-libs/mesa/mesa-11.2.2.ebuild b/media-libs/mesa/mesa-11.2.2.ebuild
index 9b3b1420590e..4c8fe8eebde0 100644
--- a/media-libs/mesa/mesa-11.2.2.ebuild
+++ b/media-libs/mesa/mesa-11.2.2.ebuild
@@ -25,10 +25,10 @@ HOMEPAGE="http://mesa3d.sourceforge.net/"
 
 if [[ $PV == 9999 ]]; then
 	SRC_URI=""
-	KEYWORDS="alpha amd64 arm hppa ia64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc x86"
 else
 	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild
index 2a0ad39fb42e..0aa91e5a0534 100644
--- a/media-libs/mesa/mesa-12.0.1.ebuild
+++ b/media-libs/mesa/mesa-12.0.1.ebuild
@@ -25,10 +25,10 @@ HOMEPAGE="http://mesa3d.sourceforge.net/"
 
 if [[ $PV == 9999 ]]; then
 	SRC_URI=""
-	KEYWORDS="alpha amd64 hppa ia64 x86"
+	KEYWORDS="alpha amd64 hppa ia64 ppc x86"
 else
 	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
new file mode 100644
index 000000000000..7a396b3b735c
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
@@ -0,0 +1,54 @@
+--- a/docs/CMakeLists.txt	2013-01-08 03:19:23.649162615 +0400
++++ b/docs/CMakeLists.txt	2013-01-08 03:22:29.647329174 +0400
+@@ -81,7 +81,7 @@
+ ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
+ 
+ add_custom_target(doc ALL
+-    COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
++    COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+     DEPENDS
+         OpenColorIO
+         PyOpenColorIO
+@@ -93,20 +93,18 @@
+     COMMENT "Building html docs"
+     SOURCES ${DOCFILES})
+ 
+-# note: ExternalProject will not build when added to a add_custom_target this
+-# works around this problem. This seems to be fixed in the cmake ^HEAD
+-add_dependencies(doc Sphinx) 
+-
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
++        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html
+         PATTERN .* EXCLUDE
+ )
+ 
++if(OCIO_BUILD_PDF_DOCS)
++
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+     
+     add_custom_target(latex
+-        COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
++        COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+         DEPENDS
+             OpenColorIO
+             ${CMAKE_BINARY_DIR}/docs/conf.py
+@@ -116,7 +114,6 @@
+             ${RSTDOC_OUTPUT}
+         COMMENT "Building latex doc"
+         SOURCES ${DOCFILES})
+-    add_dependencies(latex Sphinx)
+     
+     add_custom_target(pdf ALL
+         COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
+@@ -126,6 +123,8 @@
+     add_dependencies(pdf latex)
+     
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
+-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
++            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/)
+     
+ endif()
++
++endif()
diff --git a/media-tv/kodi/kodi-16.0.ebuild b/media-tv/kodi/kodi-16.0.ebuild
index 47aac929ac75..faa7ec2919b6 100644
--- a/media-tv/kodi/kodi-16.0.ebuild
+++ b/media-tv/kodi/kodi-16.0.ebuild
@@ -178,7 +178,29 @@ src_prepare() {
 	multijob_finish
 	elibtoolize
 
-	if [[ ${PV} == "9999" ]] || use java ; then #558798
+	# Cross-compiler support
+	# We need JsonSchemaBuilder and TexturePacker binaries for the host system
+	# Later we need libsquish for the target system
+	if tc-is-cross-compiler ; then
+		mkdir "${WORKDIR}"/${CBUILD} || die
+		pushd "${WORKDIR}"/${CBUILD} >/dev/null || die
+		einfo "Building host tools"
+		cp -a "$S"/{tools,xbmc} ./ || die
+		local tools=( JsonSchemaBuilder )
+		use texturepacker && tools+=( TexturePacker )
+		for tool in "${tools[@]}" ; do
+			tc-env_build emake -C tools/depends/native/$tool
+			mkdir "$S"/tools/depends/native/$tool/bin || die
+			ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die
+		done
+		popd >/dev/null || die
+
+		emake -f codegenerator.mk
+
+		# Binary kodi.bin links against libsquish,
+		# so we need libsquish compiled for the target system
+		emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX)
+	elif [[ ${PV} == "9999" ]] || use java ; then #558798
 		tc-env_build emake -f codegenerator.mk
 	fi
 
diff --git a/media-tv/kodi/kodi-16.1.ebuild b/media-tv/kodi/kodi-16.1.ebuild
index 0195f28f329f..0f9bb40de86d 100644
--- a/media-tv/kodi/kodi-16.1.ebuild
+++ b/media-tv/kodi/kodi-16.1.ebuild
@@ -182,7 +182,29 @@ src_prepare() {
 	multijob_finish
 	elibtoolize
 
-	if [[ ${PV} == "9999" ]] || use java ; then #558798
+	# Cross-compiler support
+	# We need JsonSchemaBuilder and TexturePacker binaries for the host system
+	# Later we need libsquish for the target system
+	if tc-is-cross-compiler ; then
+		mkdir "${WORKDIR}"/${CBUILD} || die
+		pushd "${WORKDIR}"/${CBUILD} >/dev/null || die
+		einfo "Building host tools"
+		cp -a "$S"/{tools,xbmc} ./ || die
+		local tools=( JsonSchemaBuilder )
+		use texturepacker && tools+=( TexturePacker )
+		for tool in "${tools[@]}" ; do
+			tc-env_build emake -C tools/depends/native/$tool
+			mkdir "$S"/tools/depends/native/$tool/bin || die
+			ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die
+		done
+		popd >/dev/null || die
+
+		emake -f codegenerator.mk
+
+		# Binary kodi.bin links against libsquish,
+		# so we need libsquish compiled for the target system
+		emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX)
+	elif [[ ${PV} == "9999" ]] || use java ; then #558798
 		tc-env_build emake -f codegenerator.mk
 	fi
 
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 58bc54227394..462bb8b6d630 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -183,7 +183,29 @@ src_prepare() {
 	multijob_finish
 	elibtoolize
 
-	if [[ ${PV} == "9999" ]] || use java ; then #558798
+	# Cross-compiler support
+	# We need JsonSchemaBuilder and TexturePacker binaries for the host system
+	# Later we need libsquish for the target system
+	if tc-is-cross-compiler ; then
+		mkdir "${WORKDIR}"/${CBUILD} || die
+		pushd "${WORKDIR}"/${CBUILD} >/dev/null || die
+		einfo "Building host tools"
+		cp -a "$S"/{tools,xbmc} ./ || die
+		local tools=( JsonSchemaBuilder )
+		use texturepacker && tools+=( TexturePacker )
+		for tool in "${tools[@]}" ; do
+			tc-env_build emake -C tools/depends/native/$tool
+			mkdir "$S"/tools/depends/native/$tool/bin || die
+			ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die
+		done
+		popd >/dev/null || die
+
+		emake -f codegenerator.mk
+
+		# Binary kodi.bin links against libsquish,
+		# so we need libsquish compiled for the target system
+		emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX)
+	elif [[ ${PV} == "9999" ]] || use java ; then #558798
 		tc-env_build emake -f codegenerator.mk
 	fi
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e0d0907c4072..4970b7270741 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2016 07:13:23 +0000
+Thu, 17 Nov 2016 12:43:13 +0000
diff --git a/metadata/glsa/glsa-201611-10.xml b/metadata/glsa/glsa-201611-10.xml
new file mode 100644
index 000000000000..86d1fc1c58bb
--- /dev/null
+++ b/metadata/glsa/glsa-201611-10.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201611-10">
+  <title>libuv: Privilege escalation</title>
+  <synopsis>A vulnerability in libuv could lead to privilege escalation.</synopsis>
+  <product type="ebuild"></product>
+  <announced>November 17, 2016</announced>
+  <revised>November 17, 2016: 1</revised>
+  <bug>540826</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="dev-libs/libuv" auto="yes" arch="*">
+      <unaffected range="ge">1.4.2</unaffected>
+      <vulnerable range="lt">1.4.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libuv is a multi-platform support library with a focus on asynchronous
+      I/O.
+    </p>
+  </background>
+  <description>
+    <p>It was discovered that libuv does not call setgroups before calling
+      setuid/setgid.  If this is not called, then even though the uid has been
+      dropped, there may still be groups associated that permit superuser
+      privileges.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Context-dependent attackers could escalate privileges via unspecified
+      vectors.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libuv users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --verbose --oneshot "&gt;=dev-libs/libuv-1.4.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-0278">CVE-2015-0278</uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 17 Nov 2016 08:33:56 +0000">b-man</metadata>
+  <metadata tag="submitter" timestamp="Thu, 17 Nov 2016 10:08:59 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e0d0907c4072..4970b7270741 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2016 07:13:23 +0000
+Thu, 17 Nov 2016 12:43:13 +0000
diff --git a/metadata/md5-cache/app-backup/btrbk-0.24.0 b/metadata/md5-cache/app-backup/btrbk-0.24.0
new file mode 100644
index 000000000000..65c19d9bcdc5
--- /dev/null
+++ b/metadata/md5-cache/app-backup/btrbk-0.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
+EAPI=6
+HOMEPAGE=https://digint.ch/btrbk/
+IUSE=+pv
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
+SLOT=0
+SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.24.0.tar.xz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=f4a0e2f629c4caf139939fe2f980493d
diff --git a/metadata/md5-cache/dev-lang/php-5.6.28 b/metadata/md5-cache/dev-lang/php-5.6.28
index e9e1277c45eb..8365854f1d33 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.28
+++ b/metadata/md5-cache/dev-lang/php-5.6.28
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=http://php.net/
 IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.6
 SRC_URI=http://php.net/distributions/php-5.6.28.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=555382d29ed9b020b16d4c73408d5f34
+_md5_=09a8277db2943fc9fdd22be2ea2469e6
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20160209 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20160209
index 5e852a808274..e102588db4d2 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20160209
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20160209
@@ -3,10 +3,10 @@ DEPEND=>=sys-devel/clang-3.7 >=sys-devel/llvm-3.7 || ( >=dev-lang/python-2.7.5-r
 DESCRIPTION=OpenCL C library
 EAPI=5
 HOMEPAGE=http://libclc.llvm.org/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( MIT BSD )
 RDEPEND=>=sys-devel/clang-3.7 >=sys-devel/llvm-3.7
 SLOT=0
 SRC_URI=mirror://gentoo/libclc-0.2.0_pre20160209.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6720055c138a9696014e97127b2683ef
+_md5_=d296f99ae5dba2645530e39bc5e890ec
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.5.2 b/metadata/md5-cache/dev-libs/libevdev-1.5.2
index e0d319620175..e86d7277a3dd 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.5.2
+++ b/metadata/md5-cache/dev-libs/libevdev-1.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=Handler library for evdev events
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.5.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=09f84c70f483aab6b375ef9097164593
+_md5_=ab4ee5a77cc1e53628f3c7c544fedd76
diff --git a/metadata/md5-cache/dev-libs/libinput-1.3.3 b/metadata/md5-cache/dev-libs/libinput-1.3.3
index c36c55d44bd9..844bb2da7e89 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.3.3
+++ b/metadata/md5-cache/dev-libs/libinput-1.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
 IUSE=input_devices_wacom test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.12 ) >=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.3.3.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338
-_md5_=ffb36332d885e51fc74bb4be1833e9f2
+_md5_=b04ce71570b1e0734625df4ee87173b2
diff --git a/metadata/md5-cache/dev-libs/wayland-1.11.0 b/metadata/md5-cache/dev-libs/wayland-1.11.0
index 1135245f6342..54017e767410 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.11.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wayland protocol libraries
 EAPI=5
 HOMEPAGE=https://wayland.freedesktop.org/
 IUSE=doc 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 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libffi-3.0.13-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(-)?] dev-libs/libxml2:=
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-1.11.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c2e0f95a12c9c7cf27d3b5c0aff5ba02
+_md5_=591dae5ff985804c51e5bec0b105f3de
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.4 b/metadata/md5-cache/dev-libs/wayland-protocols-1.4
index 45d7e59aecda..6de7f636232c 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.4
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Wayland protocol files
 EAPI=5
 HOMEPAGE=https://wayland.freedesktop.org/
 IUSE=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 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.4.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3667290d1496e6f560910bf2e4bb799a
+_md5_=10be65bb27361bc2e8a892af83abf45c
diff --git a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.4.0 b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.4.0
new file mode 100644
index 000000000000..435c8d9ddf5d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Module-Build-Tiny dev-perl/File-Which dev-vcs/git dev-lang/perl:=[-build(-)]
+DESCRIPTION=Readily merge Pull Requests from the Gentoo Github repository
+EAPI=5
+HOMEPAGE=https://github.com/monsieurp/Gentoo-App-Pram
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.004000.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
+_md5_=e4ca8e487b9134a938c4ef37e6d6505b
diff --git a/metadata/md5-cache/dev-ruby/gh-0.14.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.14.0-r1
new file mode 100644
index 000000000000..1f3ff747e3a9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gh-0.14.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-ruby/webmock[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=multi-layer client for the github api v3
+EAPI=5
+HOMEPAGE=https://github.com/travis-ci/gh
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=https://github.com/travis-ci/gh/archive/v0.14.0.tar.gz -> gh-0.14.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b3d529e830d449c5b825b14ed0fe66b3
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
index 51a7f1651b16..0beb9054166b 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-ruby/hoe[ruby_targets_ruby20] test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby20? ( dev-ruby/hoe[ruby_targets_ruby20] test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=An HTTP/1.1 pipelining implementation atop Net::HTTP
 EAPI=5
 HOMEPAGE=http://docs.seattlerb.org/net-http-pipeline/
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/net-http-pipeline-1.0.1.gem
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=356ad9663d8e6e674d64911e6b4cfc82
+_md5_=cdce813a0ec6a2df9db2177956bbd805
diff --git a/metadata/md5-cache/dev-ruby/spring-2.0.0 b/metadata/md5-cache/dev-ruby/spring-2.0.0
new file mode 100644
index 000000000000..cb79c24f2407
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/spring-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bundler[ruby_targets_ruby20] dev-ruby/activesupport[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Rails application preloader
+EAPI=5
+HOMEPAGE=https://github.com/rails/spring
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=1.1
+SRC_URI=https://github.com/rails/spring/archive/v2.0.0.tar.gz -> spring-2.0.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	e7d26f9077ef49f07eaa5d0c7758fe7b	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3859ec9a82e1d010814b3ad6cd42ea53
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
index d39c375add98..45af5cd13607 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Scheme interpreter
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= emacs? ( virtual/emacs ) readline? ( sys-libs/readline:0= )
 RESTRICT=!regex? ( test )
 SLOT=12/8
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=62ece283af534954a561c6c43e416786
+_md5_=4f85e88232826be90b95d852cfd0419f
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.26.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.26.0-r1
new file mode 100644
index 000000000000..fb5a97de2f95
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.26.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.26:5 >=kde-frameworks/karchive-5.26:5 >=kde-frameworks/kconfig-5.26:5 >=kde-frameworks/kconfigwidgets-5.26:5 >=kde-frameworks/kcoreaddons-5.26:5 >=kde-frameworks/kdeclarative-5.26:5 >=kde-frameworks/kglobalaccel-5.26:5 >=kde-frameworks/kguiaddons-5.26:5 >=kde-frameworks/ki18n-5.26:5 >=kde-frameworks/kiconthemes-5.26:5 >=kde-frameworks/kio-5.26:5 >=kde-frameworks/knotifications-5.26:5 >=kde-frameworks/kpackage-5.26:5 >=kde-frameworks/kservice-5.26:5 >=kde-frameworks/kwindowsystem-5.26:5 >=kde-frameworks/kxmlgui-5.26:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[gles2=] >=dev-qt/qtquickcontrols-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 egl? ( media-libs/mesa[egl] ) !gles2? ( virtual/opengl ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.26:5 X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma framework
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=egl gles2 X test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.26:5 >=kde-frameworks/karchive-5.26:5 >=kde-frameworks/kconfig-5.26:5 >=kde-frameworks/kconfigwidgets-5.26:5 >=kde-frameworks/kcoreaddons-5.26:5 >=kde-frameworks/kdeclarative-5.26:5 >=kde-frameworks/kglobalaccel-5.26:5 >=kde-frameworks/kguiaddons-5.26:5 >=kde-frameworks/ki18n-5.26:5 >=kde-frameworks/kiconthemes-5.26:5 >=kde-frameworks/kio-5.26:5 >=kde-frameworks/knotifications-5.26:5 >=kde-frameworks/kpackage-5.26:5 >=kde-frameworks/kservice-5.26:5 >=kde-frameworks/kwindowsystem-5.26:5 >=kde-frameworks/kxmlgui-5.26:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[gles2=] >=dev-qt/qtquickcontrols-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 egl? ( media-libs/mesa[egl] ) !gles2? ( virtual/opengl ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libxcb ) !<kde-apps/kapptemplate-15.08.3-r1:5 !<kde-plasma/kdeplasma-addons-5.4.3-r1:5 >=kde-frameworks/kf-env-3 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+RESTRICT=test
+SLOT=5/5.26
+SRC_URI=mirror://kde/stable/frameworks/5.26/plasma-framework-5.26.0.tar.xz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	b80ab2c131e6011994cf3b553fc21f63	kde5-functions	391cd05771548da2a3942eb1992669b1	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7bef02f7a066ef800ff725a6118bac57
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.27.0 b/metadata/md5-cache/kde-frameworks/plasma-5.27.0-r1
similarity index 98%
rename from metadata/md5-cache/kde-frameworks/plasma-5.27.0
rename to metadata/md5-cache/kde-frameworks/plasma-5.27.0-r1
index e2662b9d1c4b..442182655d97 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.27.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.27.0-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5/5.27
 SRC_URI=mirror://kde/stable/frameworks/5.27/plasma-framework-5.27.0.tar.xz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	b80ab2c131e6011994cf3b553fc21f63	kde5-functions	391cd05771548da2a3942eb1992669b1	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=627ee2e737f063bd5f47a7e8877bdd7f
+_md5_=7bef02f7a066ef800ff725a6118bac57
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.3-r2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.8.3-r3
similarity index 100%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-5.8.3-r2
rename to metadata/md5-cache/kde-plasma/plasma-workspace-5.8.3-r3
diff --git a/metadata/md5-cache/media-libs/mesa-11.2.2 b/metadata/md5-cache/media-libs/mesa-11.2.2
index 21dc1d041b45..779910e5d08f 100644
--- a/metadata/md5-cache/media-libs/mesa-11.2.2
+++ b/metadata/md5-cache/media-libs/mesa-11.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vc4 video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD 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 ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/expat-2.1.0-r3:=[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/libxshmfence-1.1:=[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-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.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/libxcb-1.9.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/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(-)?] llvm? ( !kernel_FreeBSD? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) !video_cards_r600? ( video_cards_radeon? ( virtual/libelf: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(-)?] ) ) ) >=sys-devel/llvm-3.6.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc !kernel_FreeBSD? ( virtual/libelf: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(-)?] ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.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(-)?] ) vaapi? ( >=x11-libs/libva-1.6.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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/libdrm-2.4.67[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.67[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/11.2.2/mesa-11.2.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=0c1252218a363ffe5d812cd602d4df62
+_md5_=48351092af42d94a37fb00189b714180
diff --git a/metadata/md5-cache/media-libs/mesa-12.0.1 b/metadata/md5-cache/media-libs/mesa-12.0.1
index 29042cb57bda..d90554c59231 100644
--- a/metadata/md5-cache/media-libs/mesa-12.0.1
+++ b/metadata/md5-cache/media-libs/mesa-12.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vc4 video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi valgrind vdpau wayland xvmc xa kernel_FreeBSD 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 ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/expat-2.1.0-r3:=[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/libxshmfence-1.1:=[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-1.1.4-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(-)?] >=x11-libs/libXext-1.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(-)?] >=x11-libs/libXxf86vm-1.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/libxcb-1.9.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/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(-)?] llvm? ( !kernel_FreeBSD? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) !video_cards_r600? ( video_cards_radeon? ( virtual/libelf: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(-)?] ) ) ) >=sys-devel/llvm-3.6.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc !kernel_FreeBSD? ( virtual/libelf: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(-)?] ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.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(-)?] ) vaapi? ( >=x11-libs/libva-1.6.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[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(-)?] ) wayland? ( >=dev-libs/wayland-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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/libdrm-2.4.67[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.67[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.67[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.67[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/12.0.1/mesa-12.0.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=fa071ecd54715767ffd057ffd07f7de3
+_md5_=d25900d7fbc5b22bff0b7c8e8a735bde
diff --git a/metadata/md5-cache/media-tv/kodi-16.0 b/metadata/md5-cache/media-tv/kodi-16.0
index 48d8607f2b6c..e2cfe16139fd 100644
--- a/metadata/md5-cache/media-tv/kodi-16.0
+++ b/metadata/md5-cache/media-tv/kodi-16.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( gles opengl ) gles? ( !vaapi ) vaapi? ( !gles ) udisks? ( dbus
 SLOT=0
 SRC_URI=http://mirrors.kodi.tv/releases/source/16.0-Jarvis.tar.gz -> kodi-16.0.tar.gz https://github.com/xbmc/xbmc/archive/16.0-Jarvis.tar.gz -> kodi-16.0.tar.gz !java? ( http://mirrors.kodi.tv/releases/source/kodi-16.0-generated-addons.tar.xz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=11c7e27670cb91fb7c46a002238e8b1e
+_md5_=1b7041347ed00f11372ecc78e4e6b5f0
diff --git a/metadata/md5-cache/media-tv/kodi-16.1 b/metadata/md5-cache/media-tv/kodi-16.1
index 6ff7991bb1b5..5f98f005de45 100644
--- a/metadata/md5-cache/media-tv/kodi-16.1
+++ b/metadata/md5-cache/media-tv/kodi-16.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( gles opengl ) ?? ( gles vaapi ) udisks? ( dbus ) upower? ( dbu
 SLOT=0
 SRC_URI=https://github.com/xbmc/xbmc/archive/16.1-Jarvis.tar.gz -> kodi-16.1.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-16.1-generated-addons.tar.xz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dcfbe0fcee7ae07cca0d14ce7b289d04
+_md5_=166a24f33ca6212bd269593c9e37e483
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index edb2d20ed0f5..3b6023c8e8f7 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python
 REQUIRED_USE=|| ( gles opengl ) ?? ( gles vaapi ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f83bd55bf97c84b41ca9f1d851ae8c05
+_md5_=36d0ca76418201de0854b17faf5494e9
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.0.7 b/metadata/md5-cache/net-analyzer/wireshark-2.0.7
deleted file mode 100644
index 2f87cd9d423f..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-2.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=5
-HOMEPAGE=http://www.wireshark.org/
-IUSE=adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark cpu_flags_x86_sse4_2 ssl zlib +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
-SLOT=0/2.0.7
-SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.0.7.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=d4fd34e88f41e609e86adaccaff33c16
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.2.1-r1 b/metadata/md5-cache/net-analyzer/wireshark-2.2.2
similarity index 99%
rename from metadata/md5-cache/net-analyzer/wireshark-2.2.1-r1
rename to metadata/md5-cache/net-analyzer/wireshark-2.2.2
index 20ad4b64aac8..933c9e3f9eae 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.2.1-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.2.2
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=?? ( qt4 qt5 ) ciscodump? ( libssh ) sshdump? ( libssh ) ssl? ( crypt )
-SLOT=0/2.2.1
-SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.2.1.tar.bz2
+SLOT=0/2.2.2
+SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.2.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
 _md5_=c26bed5a1fa2ac3257dd7b15244c1de2
diff --git a/metadata/md5-cache/net-ftp/lftp-4.7.4 b/metadata/md5-cache/net-ftp/lftp-4.7.4
new file mode 100644
index 000000000000..eedc83154be4
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/lftp-4.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
+EAPI=6
+HOMEPAGE=http://lftp.tech/
+IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN linguas_zh_HK linguas_zh_TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
+SLOT=0
+SRC_URI=http://lftp.tech/ftp/lftp-4.7.4.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=fe2e8309f867b8a95b8f88518b868689
diff --git a/metadata/md5-cache/net-misc/openssh-7.3_p1-r7 b/metadata/md5-cache/net-misc/openssh-7.3_p1-r7
index b4909b296d6e..8e1ee2eb9eb3 100644
--- a/metadata/md5-cache/net-misc/openssh-7.3_p1-r7
+++ b/metadata/md5-cache/net-misc/openssh-7.3_p1-r7
@@ -4,11 +4,11 @@ DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=5
 HOMEPAGE=http://www.openssh.org/
 IUSE=bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
 RDEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl ) test? ( ssl )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.3p1.tar.gz mirror://gentoo/openssh-7.3_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.3_p1-hpn-14.10-r1.patch.xz http://dev.gentoo.org/~chutzpah/openssh-7.3_p1-hpn-14.10-r1.patch.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.3p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-9.2/openssh-7.3p1+x509-9.2.diff.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7483d861db93defa4054fc8f19551c8a
+_md5_=9f3b14f898ed337e930b223bec7dfe08
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.3.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.3.0
index 9e6ffc6ec164..207d2dad06e1 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-8.3.0
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=egl gles2
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=media-libs/mesa[egl?,gles2?] virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/demos/8.3.0/mesa-demos-8.3.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c8ddea32d3e6d9f28ae4b6950cf4e710
+_md5_=da1bdcda9682682f1d73771518926e39
diff --git a/metadata/md5-cache/x11-apps/xkbcomp-1.3.1 b/metadata/md5-cache/x11-apps/xkbcomp-1.3.1
index b24188c11bad..daf6dd1bb758 100644
--- a/metadata/md5-cache/x11-apps/xkbcomp-1.3.1
+++ b/metadata/md5-cache/x11-apps/xkbcomp-1.3.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison !<sys-devel/gettext-0
 DESCRIPTION=compile XKB keyboard description
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.3.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=3c897e8832b1c60a45e0003a763d9406
+_md5_=930863f3acb7bef3333d698f581e0176
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.5.0 b/metadata/md5-cache/x11-apps/xrandr-1.5.0
index 9b309ea51a7b..f8668a0b6000 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.5.0
+++ b/metadata/md5-cache/x11-apps/xrandr-1.5.0
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11 !<sys-devel/
 DESCRIPTION=primitive command line interface to RandR extension
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xrandr-1.5.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=e01d1ece5d5166e4c5ba2d65decee6ed
+_md5_=590c56e9bd72265df76b7a25ce4d2c02
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.18-r1 b/metadata/md5-cache/x11-base/xorg-drivers-1.18-r1
index c07593b11b26..a69915c352cc 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.18-r1
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.18-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
 IUSE=video_cards_amdgpu video_cards_apm video_cards_ast video_cards_chips video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_omap video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tegra video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_libinput input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=metapackage
 PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_chips? ( x11-drivers/xf86-video-chips ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_freedreno? ( x11-drivers/xf86-video-freedreno ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) video_cards_rendition? ( x11-drivers/xf86-video-rendition ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tegra? ( x11-drivers/xf86-video-opentegra ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_tseng? ( x11-drivers/xf86-video-tseng ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-ark-0.7.5 !<=x11-drivers/xf86-video-newport-0.2.4 !<=x11-drivers/xf86-video-sis-0.10.7 !<=x11-drivers/xf86-video-v4l-0.2.0 !<x11-drivers/xf86-input-evdev-2.10.0 !<x11-drivers/xf86-video-ati-7.6.1 !<x11-drivers/xf86-video-intel-2.99.917_p20160122 !<x11-drivers/xf86-video-nouveau-1.0.12
 SLOT=0
-_md5_=4b98485928fca987d7ff8700383c5cac
+_md5_=9dda1ebe9e4b239293c8a74037e38442
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.18.4 b/metadata/md5-cache/x11-base/xorg-server-1.18.4
index 0afa19c2ccae..37a68a3ec5bb 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.18.4
+++ b/metadata/md5-cache/x11-base/xorg-server-1.18.4
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xephyr xnest xorg xvfb glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland static-libs doc
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.18 )
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xephyr xnest xorg xvfb ) ) xephyr? ( kd
 SLOT=0/1.18.4
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.4.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=67ce93ea32f9e8545759ab03c1168492
+_md5_=290379ce74a027301535298942bedf6c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1-r1 b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1-r1
index 159be5895be4..85a08aaa11c8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1-r1
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=Aiptek USB Digital Tablet Input Driver for Linux
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.4.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=8071327481717659acf1d8eb90f1c0b6
+_md5_=f2eac2ac6cae0681054c94f6218b5359
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.3 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.3
index da9ebad82d15..830b8cda5e42 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.3
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.3
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev >=x11-
 DESCRIPTION=Generic Linux input driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.10.3.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=fb9ca5f9515ea265ea4644c5c7f8e595
+_md5_=44fcc866748c025f02df49b2476285ed
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.19.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.19.0
index 5b2817f0f904..accea90fb22b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.19.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.19.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libinput-1.2.0:0= !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-d
 DESCRIPTION=X.org input driver based on libinput
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.2.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-libinput-0.19.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=109d3670fd0fe6c2d6a4ff149913bf74
+_md5_=260e6afd7d504af8e47278f50836d4b8
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.3 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.3
index d3cd661c9d29..53c93f7673b4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.3
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=Driver for Synaptics touchpads
 EAPI=5
 HOMEPAGE=https://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
 IUSE=kernel_linux
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~mips ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=kernel_linux? ( >=dev-libs/libevdev-0.4 ) >=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=3d79d6adff0cdda9973b82f675747366
+_md5_=124259a01e821d2e8faca3bb148def7b
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.33.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.33.0
index 41d940a769dd..bccd0488eb08 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.33.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.33.0
@@ -4,10 +4,10 @@ DESCRIPTION=Driver for Wacom tablets and drawing devices
 EAPI=5
 HOMEPAGE=http://linuxwacom.sourceforge.net/
 IUSE=debug
-KEYWORDS=alpha amd64 arm ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ia64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/udev >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.33.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=ae58f30d1e8c89a9453452b1f3c612cd
+_md5_=ec8b8fe13fc22c30b681c35bb5a8fbeb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.7.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.7.0
index 86e916df72d1..ae3a1221b323 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=ATI video driver
 EAPI=5
 HOMEPAGE=http://www.x.org/wiki/ati/
 IUSE=+glamor udev
-KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.58[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/udev ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-7.7.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=81d6536dda493f0a7482734ffe4462b5
+_md5_=30959abd7bf49af345ddd07eccecde44
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.12 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.12
index 5586b0f1d818..4f6d27c171fe 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.12
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.12
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.1
 DESCRIPTION=Accelerated Open Source driver for nVidia cards
 EAPI=5
 HOMEPAGE=https://nouveau.freedesktop.org/
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.60[video_cards_nouveau] >=x11-libs/libpciaccess-0.10 x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=e7246a32b7b7c1de3d97ca01a9514744
+_md5_=1be0449ecdb8ac367fbbdfccd6c81abe
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.10.1 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.10.1
index babfc27b2887..5972ec6fd828 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.10.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=ATI Rage128 video driver
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.10.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=04f6fab829e20bd0a0834208825ea485
+_md5_=6e54c2151d6bdacb9d1e683f9262b981
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r1 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r1
index 0b558bab479b..840a7b9a0dc3 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r1
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X Display Manager Control Protocol library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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 doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=elibc_glibc? ( dev-libs/libbsd ) x11-proto/xproto abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=abfab980017de34c07773580d255734a
+_md5_=20ac5f05645725c2a6c8845c542d72ee
diff --git a/metadata/md5-cache/x11-libs/libXfixes-5.0.2 b/metadata/md5-cache/x11-libs/libXfixes-5.0.2
index 4ffa588ef898..1b5c5ad5cd79 100644
--- a/metadata/md5-cache/x11-libs/libXfixes-5.0.2
+++ b/metadata/md5-cache/x11-libs/libXfixes-5.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfixes library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=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-proto/fixesproto-5.0-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(-)?] >=x11-proto/xproto-7.0.24[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-proto/xextproto-7.2.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfixes-5.0.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=9e3d6ee5cdfd76446ff50389bc896c66
+_md5_=f8b7d76aecf70c4d1abc4220a46c9b93
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.6 b/metadata/md5-cache/x11-libs/libXi-1.7.6
index 3c2ea21b06d3..20d3faf0b2dc 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7.6
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.6
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xi library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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 doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=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/libXext-1.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(-)?] >=x11-libs/libXfixes-5.0.1[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-proto/inputproto-2.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-proto/xproto-7.0.24[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-proto/xextproto-7.2.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.6.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=a299afe0559febe1799c1ea995929e49
+_md5_=47242342975a8c7de7609e1802edbacb
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.70 b/metadata/md5-cache/x11-libs/libdrm-2.4.70
index da2649abcb42..4db1bb1c141d 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.70
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.70
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=https://dri.freedesktop.org/
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vmware libkms valgrind 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
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.70.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=034bd44c235fcdcbb466867f5315fed4
+_md5_=39dc399f3b78bd12108739c96021c31e
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.12 b/metadata/md5-cache/x11-libs/libxcb-1.12
index 28487b54be01..c95a04e96bc1 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.12
+++ b/metadata/md5-cache/x11-libs/libxcb-1.12
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings library
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
 IUSE=doc selinux test xkb 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 doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0/1.12
 SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=382758ac7d492afb1265f1ea06e00120
+_md5_=a8bdf472baf36cba14c6d3e68a3afa4a
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.6.0 b/metadata/md5-cache/x11-libs/libxkbcommon-0.6.0
index fb3bdf3a0cf7..4ce0ac232c85 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.6.0
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org xkbcommon library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=X doc 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 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xkbcommon.org/download/libxkbcommon-0.6.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=cc6218496c03d84db9aeb8e89a457fdb
+_md5_=f53768960ad1afa8f6b01ceaa02c9c3e
diff --git a/metadata/md5-cache/x11-libs/pixman-0.34.0 b/metadata/md5-cache/x11-libs/pixman-0.34.0
index 4227c1e154c8..9beec5410f8e 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.34.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.34.0
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level pixel manipulation routines
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.34.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=eceda35be5cc0308f1e7b2e9dce7ac68
+_md5_=317f74e6cc077e830e2c482d2348fe92
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r1 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r1
index d3270cb5647b..8cca25e0987e 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
 IUSE=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 static-libs doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1[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/xcb-util-image-0.3.9-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(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[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-proto/xcb-proto-1.8-r3:=[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-proto/xproto-7.0.24:=[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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.3.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=e235045f2ae5c6253ec0df52ab1b9027
+_md5_=6493c7dd6f3e3a2ba8efc3ad54f81d2a
diff --git a/metadata/md5-cache/x11-misc/qt5ct-0.27 b/metadata/md5-cache/x11-misc/qt5ct-0.27-r1
similarity index 62%
rename from metadata/md5-cache/x11-misc/qt5ct-0.27
rename to metadata/md5-cache/x11-misc/qt5ct-0.27-r1
index 68c57c478b69..f550dfd2e697 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-0.27
+++ b/metadata/md5-cache/x11-misc/qt5ct-0.27-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=configure install postinst
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 systray? ( dev-qt/qtgui:5[dbus] ) dev-qt/linguist-tools:5
 DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+IUSE=+systray
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 systray? ( dev-qt/qtgui:5[dbus] )
 SLOT=0
 SRC_URI=mirror://sourceforge/qt5ct/qt5ct-0.27.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=bd09603a26064d83a553408ef4c900ad
+_md5_=70d56889de225de62854399b07ee3808
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.17 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.17
index 36e054e319af..d3c2cef1a821 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.17
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.17
@@ -3,10 +3,10 @@ DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-
 DESCRIPTION=X keyboard configuration database
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=39935860ab9b56a1170eeb3a8c6785e5
+_md5_=926841bccbc143507082cafaa6469031
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6
index e02f135961cd..806ff0b2b5c8 100644
--- a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.6
@@ -3,9 +3,9 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=s
 DESCRIPTION=Old Imake-related build files
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=57363048602280861e1d38356804f4f5
+_md5_=607bbb962424414e335e71b051a8c648
diff --git a/metadata/md5-cache/x11-misc/xtermcontrol-3.3 b/metadata/md5-cache/x11-misc/xtermcontrol-3.3
index 91bc76bb6618..8308dc7417e4 100644
--- a/metadata/md5-cache/x11-misc/xtermcontrol-3.3
+++ b/metadata/md5-cache/x11-misc/xtermcontrol-3.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=xtermcontrol enables dynamic control of XFree86 xterm properties
 EAPI=5
 HOMEPAGE=http://www.thrysoee.dk/xtermcontrol/
-KEYWORDS=alpha amd64 ia64 ~ppc ~sparc x86
+KEYWORDS=alpha amd64 ia64 ppc ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.thrysoee.dk/xtermcontrol/xtermcontrol-3.3.tar.gz
-_md5_=07bd6e1624cd0a4477be33fc9cf4271c
+_md5_=8914770a07bc3773ac3181e632894510
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.3.2 b/metadata/md5-cache/x11-proto/inputproto-2.3.2
index 9edc98aa56f7..599865134896 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.3.2
+++ b/metadata/md5-cache/x11-proto/inputproto-2.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Input protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.3.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=3084c1f02d0c80a5039d7a5a0625cebc
+_md5_=207e83d4c6b2d50fa2bdc6d4931d90b8
diff --git a/metadata/md5-cache/x11-proto/videoproto-2.3.3 b/metadata/md5-cache/x11-proto/videoproto-2.3.3
index 5f8c39e5ade6..4c5db77f0dce 100644
--- a/metadata/md5-cache/x11-proto/videoproto-2.3.3
+++ b/metadata/md5-cache/x11-proto/videoproto-2.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Video protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.3.3.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=d52f4328248bbb6ef4cb31287b19d683
+_md5_=02e7b5cf48d583f8561beb58aab90ccc
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.12-r2 b/metadata/md5-cache/x11-proto/xcb-proto-1.12-r2
index e4d0cf8281a3..1f1ed6271576 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.12-r2
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.12-r2
@@ -4,11 +4,11 @@ DESCRIPTION=X C-language Bindings protocol headers
 EAPI=5
 HOMEPAGE=https://xcb.freedesktop.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=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(-)] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=14e650e2e5b65bafb6c245fd65cb921e
+_md5_=e65a5a0b6bfcc8df6d01a3d2abd1270d
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.29 b/metadata/md5-cache/x11-proto/xproto-7.0.29
index 620329f81628..a0d50b03362c 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.29
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.29
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org xproto protocol headers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=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 doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.29.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=bec47b8b29d531639d9e7ea002609557
+_md5_=84bedee36cb6d378dcbd16a50cc42304
diff --git a/metadata/md5-cache/x11-terms/xterm-325 b/metadata/md5-cache/x11-terms/xterm-325
index 7afe237d5518..02660a406cfb 100644
--- a/metadata/md5-cache/x11-terms/xterm-325
+++ b/metadata/md5-cache/x11-terms/xterm-325
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal Emulator for X Windows
 EAPI=5
 HOMEPAGE=http://invisible-island.net/xterm/
 IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=ftp://invisible-island.net/xterm/xterm-325.tgz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=79855dc81278cef6e8c3e2171ab13d31
+_md5_=99bbaf1b3c0c4460ebe25ec50518176d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e0d0907c4072..4970b7270741 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2016 07:13:23 +0000
+Thu, 17 Nov 2016 12:43:13 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 6156d2a702da..a9159873e5b7 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -853,10 +853,9 @@
     <name>Gentoo Dotnet Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Dotnet</url>
     <description>The Dotnet Project handles the development using the C# language. More specifically, it is often oriented with the mono development environment.</description>
-    <member>
+    <member is-lead="1">
       <email>cynede@gentoo.org</email>
       <name>Mikhail Pukhlikov</name>
-      <role>Member</role>
     </member>
   </project>
   <project>
diff --git a/metadata/timestamp b/metadata/timestamp
index 0c1605863345..ccb7f02da948 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Nov 17 07:09:35 UTC 2016
+Thu Nov 17 12:39:24 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d0a1f6b1e729..e8939968e7b6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2016 07:30:01 +0000
+Thu, 17 Nov 2016 13:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3da172cee212..6a1ef4806fd8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1479366601 Thu 17 Nov 2016 07:10:01 AM UTC
+1479386401 Thu 17 Nov 2016 12:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e0d0907c4072..4970b7270741 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Nov 2016 07:13:23 +0000
+Thu, 17 Nov 2016 12:43:13 +0000
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7159e7b21141..0b66fba1dbe7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,3 +1,3 @@
 DIST wireshark-2.0.6.tar.bz2 31213641 SHA256 70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db SHA512 2e4c9b76e365c6a2952b6a949173982286783884a60faaffb78a0364f606cb43811313ee31ada4c437cf831440253038d47976e5a1d73c3b1a85645691b1e5d9 WHIRLPOOL aa6570e5250c27ee3ac1ac9ea834102e0136f1482f702845b03aa4ab83fbcec64f8454fc9e9f6f92298e06208293c49a030f37d9dd6b569c3ed7c211e22eb5f5
-DIST wireshark-2.0.7.tar.bz2 31194949 SHA256 e7d161e147679fb0a2bf81efe7297988fd908155b9835cb0825083afae89e6d4 SHA512 2227cb66db77a480125399439658d345ce9387640512de9074539c056179aedf79f6a8e0be278e7c92a3d94058d1a6d461ba7409fa866e576f3e94cf3fd3baa9 WHIRLPOOL 74187e747c7bdacd8efc4b43fa2025aa77621a3f5115d5684c2638c02aa94d2294ca6b1572320396b57a6d62fdc4e68de0603f464c4e9240021c4afb9ad0fd40
 DIST wireshark-2.2.1.tar.bz2 32154087 SHA256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 SHA512 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 WHIRLPOOL e72460efee91d0013df40ae797f01f7331f27f15c0d159e3b1b1ee4aaaad30c07232e731ec2773c208e334879223337267f6c09684acfc44fa9d676cbf451994
+DIST wireshark-2.2.2.tar.bz2 32230208 SHA256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 SHA512 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0 WHIRLPOOL 52e81a2529a49f0f206e96c48e67fd235a6a3e7ab654cdf44107b90af269863b4c10f34ed4473966082bc025102eed18d690613fbdd2231fc7d177f5e77030a3
diff --git a/net-analyzer/wireshark/wireshark-2.0.7.ebuild b/net-analyzer/wireshark/wireshark-2.0.7.ebuild
deleted file mode 100644
index eed093c284d0..000000000000
--- a/net-analyzer/wireshark/wireshark-2.0.7.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="
-	adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
-	+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
-	cpu_flags_x86_sse4_2 ssl zlib
-"
-REQUIRED_USE="
-	ssl? ( crypt )
-	?? ( qt4 qt5 )
-"
-
-S=${WORKDIR}/${P/_/}
-
-GTK_COMMON_DEPEND="
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	crypt? ( dev-libs/libgcrypt:0 )
-	caps? ( sys-libs/libcap )
-	geoip? ( dev-libs/geoip )
-	gtk3? (
-		${GTK_COMMON_DEPEND}
-		x11-libs/gtk+:3
-	)
-	kerberos? ( virtual/krb5 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4[accessibility]
-		x11-misc/xdg-utils
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`.  The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		app-text/asciidoc
-		dev-libs/libxml2
-		dev-libs/libxslt
-		doc-pdf? ( dev-java/fop )
-		www-client/lynx
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk3? ( virtual/freedesktop-icon-theme )
-	qt4? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
-		"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
-		"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
-		"${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch \
-		"${FILESDIR}"/${PN}-2.1.0-sse4_2.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				myconf+=( "--with-ssl" )
-				;;
-		esac
-	fi
-
-	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk3 || use qt4 || use qt5; then
-		myconf+=( "--enable-wireshark" )
-	else
-		myconf+=( "--disable-wireshark" )
-	fi
-
-	if ! use qt4 && ! use qt5; then
-		myconf+=( "--with-qt=no" )
-	fi
-
-	if use qt4; then
-		export QT_MIN_VERSION=4.6.0
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	# Hack around inability to disable doxygen/fop doc generation
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
-	# dumpcap requires libcap
-	# --disable-profile-build bugs #215806, #292991, #479602
-	econf \
-		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
-		$(use_enable androiddump) \
-		$(use_enable ipv6) \
-		$(use_enable tfshark) \
-		$(use_with adns c-ares) \
-		$(use_with caps libcap) \
-		$(use_with crypt gcrypt) \
-		$(use_with geoip) \
-		$(use_with gtk3) \
-		$(use_with kerberos krb5) \
-		$(use_with lua) \
-		$(use_with pcap dumpcap-group wireshark) \
-		$(use_with pcap) \
-		$(use_with portaudio) \
-		$(usex qt4 --with-qt=4 '') \
-		$(usex qt5 --with-qt=5 '') \
-		$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
-		$(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
-		$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
-		$(use_with sbc) \
-		$(use_with smi libsmi) \
-		$(use_with ssl gnutls) \
-		$(use_with zlib) \
-		$(usex netlink --with-libnl=3 --without-libnl) \
-		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
-		--disable-profile-build \
-		--disable-usr-local \
-		--disable-warnings-as-errors \
-		--sysconfdir="${EPREFIX}"/etc/wireshark \
-		--without-adns \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-	if use doc; then
-		use doc-pdf && addpredict "/root/.java"
-		emake -j1 -C docbook
-	fi
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
-		if use doc-pdf; then
-			insinto /usr/share/doc/${PF}/pdf/
-			doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
-		fi
-	fi
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
-		doc/{randpkt.txt,README*}
-
-	# install headers
-	local wsheader
-	for wsheader in \
-		color.h \
-		config.h \
-		epan/*.h \
-		epan/crypt/*.h \
-		epan/dfilter/*.h \
-		epan/dissectors/*.h \
-		epan/ftypes/*.h \
-		epan/wmem/*.h \
-		register.h \
-		wiretap/*.h \
-		ws_symbol_export.h \
-		wsutil/*.h
-	do
-		insinto /usr/include/wireshark/$( dirname ${wsheader} )
-		doins ${wsheader}
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk3 || use qt4 || use qt5; then
-		local c d
-		for c in hi lo; do
-			for d in 16 32 48; do
-				insinto /usr/share/icons/${c}color/${d}x${d}/apps
-				newins image/${c}${d}-app-wireshark.png wireshark.png
-			done
-		done
-		for d in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
-			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-
-	if use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
similarity index 100%
rename from net-analyzer/wireshark/wireshark-2.2.1-r1.ebuild
rename to net-analyzer/wireshark/wireshark-2.2.2.ebuild
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 466b52282131..020f2e4d2ba1 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,2 +1,3 @@
 DIST lftp-4.6.5.tar.xz 1514644 SHA256 1fd0920a1791ce0e9e39ffce77ae6619e5dc665f16e9380bafbfc69411eeb71e SHA512 a22faa3a6901160460f1103c19c5276f603c154908ec2e34804a6eb48452b59ba495993e6824f57d114285ddc80a64dccd0069465cc0593f34f435ac181250c0 WHIRLPOOL 088598ed9395cd8f9ed79be26e0833593e733cf87bbd51e5d008ce4de2b9924e62add20789c098a866d82dc3f168a373c4874de264d669950524a9a255e1e028
 DIST lftp-4.7.3.tar.xz 1545012 SHA256 3b22259cdc4c1a6ae349057d16bda4b4816929e04d223242ab8927bc31a48e7c SHA512 1123e322a4c4f85ced4ef57c0af80b9b20d223c2770293ada3d8ca870fe159b62c6ee8d01a8c6be50e7ec00f3e6729a46c09db3aa776471825a6998792f1250d WHIRLPOOL 8ad61759c0ef56b23a13c4f3291bd672f398485ddc1a04c6e6b7c8f4e6a8ae36779d88e96c2db7697884e3089aef0f04a36952490a2b450a20ccb360b2a0df54
+DIST lftp-4.7.4.tar.xz 1564016 SHA256 bf67c4d128b6f769a4082947376a9679c5ee3463a24ab761a0757f75d70bd92c SHA512 f978379b6ac0dfb46c06dee7205b0b751a75642868c4b1bf37ac681108b04a475232915bb7280ec9731af008e00e855bd9e2e8745307b6507d341f27e4025159 WHIRLPOOL edfd7ac72e4b6e185222e350328acf771d83d5aeae4fac0860737feced5e3ade724891dd21448a366d87b4b59e24442dbfbf894f42813f71af4063f011450af3
diff --git a/net-ftp/lftp/lftp-4.7.4.ebuild b/net-ftp/lftp/lftp-4.7.4.ebuild
new file mode 100644
index 000000000000..db5858433e1a
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.7.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils libtool
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
+HOMEPAGE="http://lftp.tech/"
+SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
+LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
+IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1:=
+	>=sys-libs/readline-5.1:=
+	dev-libs/expat
+	sys-libs/zlib
+	convert-mozilla-cookies? ( dev-perl/DBI )
+	idn? ( net-dns/libidn )
+	socks5? (
+		>=net-proxy/dante-1.1.12
+		virtual/pam
+	)
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-1.2.3:0= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	verify-file? (
+		dev-perl/String-CRC32
+		virtual/perl-Digest-MD5
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	=sys-devel/libtool-2*
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.19 )
+	virtual/pkgconfig
+"
+
+DOCS=(
+	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
+	README.dnssec README.modules THANKS TODO
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2.91-lafile.patch \
+	"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch \
+	"${FILESDIR}"/${PN}-4.7.0-gettext.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize # for Darwin bundles
+
+	# bug #536036
+	printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with idn libidn) \
+		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
+		$(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \
+		$(usex ssl "$(use_with gnutls)" '--without-gnutls') \
+		--enable-packager-mode \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-modules \
+		--with-readline="${EPREFIX}"/usr \
+		--without-included-regex
+}
+
+src_install() {
+	default
+	local script
+	for script in {convert-mozilla-cookies,verify-file}; do
+		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
+	done
+}
diff --git a/net-misc/openssh/openssh-7.3_p1-r7.ebuild b/net-misc/openssh/openssh-7.3_p1-r7.ebuild
index d4a19efb4f24..8629c7469ce6 100644
--- a/net-misc/openssh/openssh-7.3_p1-r7.ebuild
+++ b/net-misc/openssh/openssh-7.3_p1-r7.ebuild
@@ -31,7 +31,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f3891ccf7942..6242a35125b9 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Lars Wendler <polynomial-c@gentoo.org> (17 Nov 2016)
+# jit not supported on ia64 (bug #600052).
+dev-libs/libpcre2 jit
+
 # Christian Ruppert <idl0r@gentoo.org> (14 Oct 2016)
 # dnstap USE masked due to missing keywords
 net-dns/bind dnstap
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6754f6952f47..e8a735f5f784 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8294,6 +8294,7 @@ x11-misc/mate-notification-daemon:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/mozo:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/openbox-menu:icons - Enable support for icons in menus
 x11-misc/openbox-menu:svg - Support SVG icons
+x11-misc/qt5ct:systray - Enable system tray support
 x11-misc/rednotebook:libyaml - enable libyaml support
 x11-misc/rednotebook:spell - enable gtk-spell support
 x11-misc/redshift:appindicator - Enable usage of dev-libs/libappindicator to export menu options in to unity and KDE 5
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch
deleted file mode 100644
index 82fdb00d9ff1..000000000000
--- a/sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: pcsc-lite-1.8.11/configure.ac
-===================================================================
---- pcsc-lite-1.8.11.orig/configure.ac
-+++ pcsc-lite-1.8.11/configure.ac
-@@ -284,16 +284,15 @@ fi
- POLKIT_MINIMUM=0.111
- AC_ARG_ENABLE(polkit,
- 	AS_HELP_STRING([--enable-polkit],
--		[Build with polkit support]),
--		use_polkit=$withval, use_polkit=no)
--if test "$use_polkit" != "no"; then
--	PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1 >= $POLKIT_MINIMUM], [use_polkit=yes], [use_polkit=no])
--	if test "$use_polkit" != "no";then
-+		[Build with polkit support]))
-+if test "x$enable_polkit" != "xno"; then
-+	PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1 >= $POLKIT_MINIMUM], [enable_polkit=yes], [enable_polkit=no])
-+	if test "$enable_polkit" != "no";then
- 		AC_DEFINE([HAVE_POLKIT], 1, [Build polkit access control support])
- 		polkit_policy_dir=$($PKG_CONFIG polkit-gobject-1 --variable=policydir)
- 		AC_SUBST(POLICY_DIR, [$polkit_policy_dir])
- 	else
--	        use_polkit=no
-+	        enable_polkit=no
- 	        AC_MSG_ERROR([[
- *** 
- *** polkit >= $POLKIT_MINIMUM was not found. Access control will be disabled.
-@@ -301,7 +300,7 @@ if test "$use_polkit" != "no"; then
- *** ]])
- 	fi
- fi
--AM_CONDITIONAL(ENABLE_POLKIT, test "$use_polkit" != "no")
-+AM_CONDITIONAL(ENABLE_POLKIT, test "$enable_polkit" != "no")
- 
- # --with-systemdsystemunitdir=DIR
- AC_ARG_WITH([systemdsystemunitdir],
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.5 b/sys-apps/pcsc-lite/files/pcscd-init.5
deleted file mode 100644
index aa750abee689..000000000000
--- a/sys-apps/pcsc-lite/files/pcscd-init.5
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-name="PC/SC Daemon"
-
-pidfile=/var/run/pcscd/pcscd.pid
-
-command=/usr/sbin/pcscd
-command_args="${EXTRA_OPTS}"
-
-start_stop_daemon_args="--user pcscd:pcscd"
-
-depend() {
-	need localmount
-	after udev openct
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o pcscd:pcscd /var/run/pcscd
-}
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.6 b/sys-apps/pcsc-lite/files/pcscd-init.6
deleted file mode 100644
index 5017199cfd95..000000000000
--- a/sys-apps/pcsc-lite/files/pcscd-init.6
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-name="PC/SC Daemon"
-
-pidfile=/run/pcscd/pcscd.pid
-
-command=/usr/sbin/pcscd
-command_args="${EXTRA_OPTS}"
-
-start_stop_daemon_args="--user pcscd:pcscd"
-
-depend() {
-	need localmount
-	after udev openct
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o pcscd:pcscd /run/pcscd
-}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
index f5c053f10a73..7c039fc875c5 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
@@ -19,10 +19,10 @@ DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
-	KEYWORDS="alpha amd64 arm hppa ia64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc x86"
 else
 	SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
index c2143f325ec4..2c5109fe94d2 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xrandr/xrandr-1.5.0.ebuild b/x11-apps/xrandr/xrandr-1.5.0.ebuild
index 37c667961d0f..3fa1811cf59b 100644
--- a/x11-apps/xrandr/xrandr-1.5.0.ebuild
+++ b/x11-apps/xrandr/xrandr-1.5.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.5
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
index f6a3038fe132..49fac1e08ba2 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
index 7109347ee735..f046a60f1a9f 100644
--- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland"
diff --git a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild
index ca43772530dd..7538200de2d0 100644
--- a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild
+++ b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.3.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.3.ebuild
index 9f3056aee460..66cb4a882057 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.3.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Generic Linux input driver"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.18[udev]
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.19.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.19.0.ebuild
index cdc3c5b04f92..1258be251d76 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.19.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.19.0.ebuild
@@ -8,7 +8,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.2.0:0="
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild
index 90aa93660894..bc3d33dfb608 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.8.3.ebuild
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="https://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
 
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~mips ppc ~ppc64 x86"
 IUSE="kernel_linux"
 
 RDEPEND="kernel_linux? ( >=dev-libs/libevdev-0.4 )
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.33.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.33.0.ebuild
index 1b8921e2c528..ac398751091a 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.33.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.33.0.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://git.code.sf.net/p/linuxwacom/${PN}"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 # depend on libwacom for its udev rules, bug #389633
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.7.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.7.0.ebuild
index 6be8316c1dd7..b12522ac5e53 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.7.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.7.0.ebuild
@@ -10,7 +10,7 @@ inherit linux-info xorg-2
 DESCRIPTION="ATI video driver"
 HOMEPAGE="http://www.x.org/wiki/ati/"
 
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+glamor udev"
 
 RDEPEND=">=x11-libs/libdrm-2.4.58[video_cards_radeon]
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild
index 5517c50be41a..01524dbd77d2 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
 HOMEPAGE="https://nouveau.freedesktop.org/"
 
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.1.ebuild
index a759a356bad9..067fa9c40bb2 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.1.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.10.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="ATI Rage128 video driver"
 
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.2"
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
index dcf379ae11db..80a636309341 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )
diff --git a/x11-libs/libXfixes/libXfixes-5.0.2.ebuild b/x11-libs/libXfixes/libXfixes-5.0.2.ebuild
index 80edbc9c99af..337afb498a2d 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.2.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/libXi-1.7.6.ebuild b/x11-libs/libXi/libXi-1.7.6.ebuild
index 802b6300d2e1..552353d56172 100644
--- a/x11-libs/libXi/libXi-1.7.6.ebuild
+++ b/x11-libs/libXi/libXi-1.7.6.ebuild
@@ -9,7 +9,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/libdrm-2.4.70.ebuild b/x11-libs/libdrm/libdrm-2.4.70.ebuild
index 34287d4bf1f3..96a1699fe3ee 100644
--- a/x11-libs/libdrm/libdrm-2.4.70.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.70.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/${PN}/${P}.tar.bz2"
 fi
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libxcb/libxcb-1.12.ebuild b/x11-libs/libxcb/libxcb-1.12.ebuild
index 90ed515dddf0..420b7a8e5a47 100644
--- a/x11-libs/libxcb/libxcb-1.12.ebuild
+++ b/x11-libs/libxcb/libxcb-1.12.ebuild
@@ -18,7 +18,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux test xkb"
 SLOT="0/${PV}"
 
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
index 2a8a060cde40..badabb3d0794 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
@@ -18,7 +18,7 @@ fi
 inherit xorg-2 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 ~sparc x86"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
diff --git a/x11-libs/pixman/pixman-0.34.0.ebuild b/x11-libs/pixman/pixman-0.34.0.ebuild
index 3016ffb7e858..7a53c080b209 100644
--- a/x11-libs/pixman/pixman-0.34.0.ebuild
+++ b/x11-libs/pixman/pixman-0.34.0.ebuild
@@ -10,9 +10,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 if [[ $PV = 9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ia64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc x86"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
index 25ff13296528..7db5d9eedc1c 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r1.ebuild
@@ -16,7 +16,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
diff --git a/x11-misc/qt5ct/metadata.xml b/x11-misc/qt5ct/metadata.xml
index 74362b492c50..2e9a34141459 100644
--- a/x11-misc/qt5ct/metadata.xml
+++ b/x11-misc/qt5ct/metadata.xml
@@ -13,6 +13,9 @@
 		This program allows users to configure Qt5 settings (theme, font,
 		icons, etc.) under DE/WM without Qt5 integration.
 	</longdescription>
+	<use>
+		<flag name="systray">Enable system tray support</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">qt5ct</remote-id>
 	</upstream>
diff --git a/x11-misc/qt5ct/qt5ct-0.27.ebuild b/x11-misc/qt5ct/qt5ct-0.27-r1.ebuild
similarity index 87%
rename from x11-misc/qt5ct/qt5ct-0.27.ebuild
rename to x11-misc/qt5ct/qt5ct-0.27-r1.ebuild
index 92a40e0b818d..8c8cc16ec066 100644
--- a/x11-misc/qt5ct/qt5ct-0.27.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.27-r1.ebuild
@@ -13,19 +13,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="+systray"
 
 RDEPEND="
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5=[dbus]
+	dev-qt/qtgui:5=
 	dev-qt/qtwidgets:5
+	systray? ( dev-qt/qtgui:5[dbus] )
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
 src_configure() {
-	eqmake5 ${PN}.pro
+	eqmake5 DEFINES="$(usex systray '' QT_NO_SYSTEMTRAYICON)" ${PN}.pro
 }
 
 src_install() {
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild
index 5e2c9618f34b..49526e335bcf 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 [[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 29fab04c06c3..1bd1d9ee0fef 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
index 7ad05e1efbfa..bfe56d7d38db 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
@@ -10,5 +10,5 @@ SRC_URI="http://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE=""
diff --git a/x11-proto/inputproto/inputproto-2.3.2.ebuild b/x11-proto/inputproto/inputproto-2.3.2.ebuild
index 9e79364c8a67..8cd511503b8d 100644
--- a/x11-proto/inputproto/inputproto-2.3.2.ebuild
+++ b/x11-proto/inputproto/inputproto-2.3.2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Input protocol headers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/videoproto/videoproto-2.3.3.ebuild b/x11-proto/videoproto/videoproto-2.3.3.ebuild
index 25ff63814175..68656761c7c2 100644
--- a/x11-proto/videoproto/videoproto-2.3.3.ebuild
+++ b/x11-proto/videoproto/videoproto-2.3.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Video protocol headers"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild b/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild
index f4ccdcf9b290..23ee56fbd8d9 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/x11-proto/xproto/xproto-7.0.29.ebuild b/x11-proto/xproto/xproto-7.0.29.ebuild
index cc9ba858f687..b85d1c55475e 100644
--- a/x11-proto/xproto/xproto-7.0.29.ebuild
+++ b/x11-proto/xproto/xproto-7.0.29.ebuild
@@ -9,7 +9,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org xproto protocol headers"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-terms/xterm/xterm-325.ebuild b/x11-terms/xterm/xterm-325.ebuild
index 784440ab9557..832bf8a7bd4f 100644
--- a/x11-terms/xterm/xterm-325.ebuild
+++ b/x11-terms/xterm/xterm-325.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
 
 COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )