Merge updates from master

49 files changed, 333 insertions, 432 deletions

diff --git a/app-admin/logrotate/logrotate-3.12.2.ebuild b/app-admin/logrotate/logrotate-3.12.2.ebuild
index d700644cc10b..930ab1dc2ca2 100644
--- a/app-admin/logrotate/logrotate-3.12.2.ebuild
+++ b/app-admin/logrotate/logrotate-3.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
index 2ec47027f998..a10b5392407d 100644
--- a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
+++ b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.freedesktop.org/software/PackageKit/releases/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index 53cabe6bf313..cbeb5e837ebd 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-emulation/libvirt/libvirt-3.3.0.ebuild b/app-emulation/libvirt/libvirt-3.3.0.ebuild
index 25e5664cd704..66c3fa5acfbe 100644
--- a/app-emulation/libvirt/libvirt-3.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-3.3.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SLOT="0/${PV}"
 fi
 
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 70242850aaa1..11a6d2c03360 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,2 +1 @@
-DIST asciinema-1.3.0.tar.gz 34214 SHA256 968016828119d53b8e4e6ccf40a2635704d236f8e805f635c15adc09a4373a55 SHA512 882f2f9c23c42d6930fc54797a87134004c1e679b2c054d29c71a9af616604f6e54aa1461b7f0f9826557c66dcf51470710d6e2886d785cbf28464ea2397d5d2 WHIRLPOOL 68a9a32b4067115cdece92a69f824a15ac42bfe1855701fb1e74cb7d138022f235a83c4a879453f87ac3757f1dc3c5036d596e4b7cea84cf8f8891b696b1a1fe
 DIST asciinema-1.4.0.tar.gz 35264 SHA256 841a55b0f51988d5e155e99badbd6ce5cf3b43cca2ba15cd20c971a19719dc9a SHA512 23c67a462acdbbbed495e6cc3e0e22ed028effcc945af30b5925854e216c6f74bb1b416d9b0001726732ae8be510796e996bbca69b225c20422143e5ed1aca5c WHIRLPOOL 42cce226c8d94cc957e3e719eebbb887a696aec987f7ff02972a6ec74d6cc249a79fb804089d95e05341952816f6cc5ef5591f43eb1c411c746b804d2d5bb126
diff --git a/app-misc/asciinema/asciinema-1.3.0.ebuild b/app-misc/asciinema/asciinema-1.3.0.ebuild
deleted file mode 100644
index 9843507560f2..000000000000
--- a/app-misc/asciinema/asciinema-1.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.python.org/pypi/asciinema"
-SRC_URI="https://github.com/asciinema/asciinema/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md doc/asciicast-v1.md )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# obsolete, already removed in upstream git
-	rm asciinema/requests_http_adapter.py || die
-}
-
-python_test() {
-	nosetests || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman man/asciinema.1
-}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 4a55d6920c44..fa2e4dc74d05 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,2 +1 @@
-DIST gramps-4.2.4.tar.gz 18683901 SHA256 25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499 WHIRLPOOL ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0
 DIST gramps-4.2.5.tar.gz 18694912 SHA256 1de3007215b7d0b779ec8f086e14e7a75f2aa811ee37c6d0cff06bfc9458743d SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c WHIRLPOOL d9f49b188e20697477860ecb5916c452b95ea08c038b828b0f01edc1097d3d45b549e3e1a5bc5a4aad1d8aab390b8dfefc4ec46ac58420161de8e4d644c8f95e
diff --git a/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch b/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
deleted file mode 100644
index 4c1f6920cbb0..000000000000
--- a/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py	2016-09-04 14:44:02.000000000 +0000
-+++ b/setup.py	2016-09-22 12:21:52.496968618 +0000
-@@ -278,7 +278,7 @@
-             if packaging:
-                 path = resource_path
-             else:
--                path = os.path.abspath(os.path.join(self.install_data, 'share'))
-+                path = '/usr/share'
-             fp.write(path)
- 
-         _install.run(self)
diff --git a/app-misc/gramps/gramps-4.2.4-r1.ebuild b/app-misc/gramps/gramps-4.2.4-r1.ebuild
deleted file mode 100644
index 43033e1cf0a2..000000000000
--- a/app-misc/gramps/gramps-4.2.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+reports +exif spell"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	spell? ( app-text/gtkspell:3[introspection] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-resourcepath.patch"
-)
-
-python_prepare_all() {
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/app-misc/gramps/gramps-4.2.5.ebuild b/app-misc/gramps/gramps-4.2.5.ebuild
index 1231230e50e1..bc0c6b1ef46b 100644
--- a/app-misc/gramps/gramps-4.2.5.ebuild
+++ b/app-misc/gramps/gramps-4.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+reports exif geo spell"
 
 RDEPEND="
diff --git a/app-misc/tmux/tmux-2.3-r1.ebuild b/app-misc/tmux/tmux-2.3-r1.ebuild
index 69c674033d78..8ec2f28ce7d9 100644
--- a/app-misc/tmux/tmux-2.3-r1.ebuild
+++ b/app-misc/tmux/tmux-2.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 6f7d9cf32d70..e3e24febf7a0 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,2 +1 @@
-DIST tatt-0.3.tar.gz 22527 SHA256 bad1f0f33889aaa5887bab8c80bcbdaa620c379de5ff381ab983ae23d24ac9ed SHA512 822ec8904e452afd2373ca7ff01a05b8020b261acfc02864523a22e91d83dea51a1d2a8c79ec75db38e6de00cb3c06b3799dee261f376ec91d261a9f468aaa19 WHIRLPOOL f9be83b45c3d79e004600fa3e1ecd2d1ab6e6720035f13ab5f0b4a46555c280663e6371fb9ed88ab0de6bbfb4a853a0f07963dbc25f668a3cd8482c369343b90
 DIST tatt-0.4.tar.gz 23397 SHA256 53ed63685187acc55241698dac26a7cadbdf846dfc72709a9d67db65572dc2ef SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6 WHIRLPOOL a152e6cdee833d892eb0ff1b6c24d107b99ac4b7c92510d230fdbb6e1375825c1294a7008e1e09c496115f6116f3de48a4500dcc3a257998c8ee5bb0a29c08b0
diff --git a/app-portage/tatt/tatt-0.3.ebuild b/app-portage/tatt/tatt-0.3.ebuild
deleted file mode 100644
index 92b3bd9cce7e..000000000000
--- a/app-portage/tatt/tatt-0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="tatt is an arch testing tool"
-HOMEPAGE="https://github.com/tom111/tatt"
-SRC_URI="https://github.com/tom111/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit
-	www-client/pybugz
-	dev-python/configobj[${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}
diff --git a/dev-cpp/muParser/muParser-2.2.5.ebuild b/dev-cpp/muParser/muParser-2.2.5.ebuild
index f4ede7345d0d..830abea368df 100644
--- a/dev-cpp/muParser/muParser-2.2.5.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
 
 S=${WORKDIR}/muparser-${PV}
diff --git a/dev-lang/perl/perl-5.24.1-r2.ebuild b/dev-lang/perl/perl-5.24.1-r2.ebuild
index ff54f77c3449..f3448f5f6dd0 100644
--- a/dev-lang/perl/perl-5.24.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.24.1-r2.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
index c667972e2f74..f78cdf117f63 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-libs/librelp/librelp-1.2.13.ebuild b/dev-libs/librelp/librelp-1.2.13.ebuild
index ab14f75d6c47..89fc127ff7bd 100644
--- a/dev-libs/librelp/librelp-1.2.13.ebuild
+++ b/dev-libs/librelp/librelp-1.2.13.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.2.0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
 IUSE="debug doc +ssl static-libs"
 
 RDEPEND="
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
index 5842f4e0caa2..3a9f09cbd62a 100644
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/gevent/gevent-1.2.1.ebuild b/dev-python/gevent/gevent-1.2.1.ebuild
index 59c6d754182c..8d9af07ca111 100644
--- a/dev-python/gevent/gevent-1.2.1.ebuild
+++ b/dev-python/gevent/gevent-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild
index c7930e15b36b..7361e9b767d2 100644
--- a/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
index 075caae44871..f9761144b630 100644
--- a/dev-python/oct2py/oct2py-3.6.0.ebuild
+++ b/dev-python/oct2py/oct2py-3.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index edbae3092292..195cd1ac3d70 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1 +1,2 @@
 DIST kdev-php-5.1.0.tar.xz 678080 SHA256 bafb0cf407a80476ce0d2c0316bff304ff766c3dbee014e7ed2df2fc2160d5ab SHA512 bd7768e7285a87dcc79fd5206528c3473590350e2b8ebb268f71cba6fc59014c70ee95078d8531aa70a262455f32197212c16b65f4af41f86b868acaacf10bf9 WHIRLPOOL 78f82cf1902d06d8e7e41b50f7e096c9fa8c29dcb67f2b5a2b484068084cd75e8062cdab2ba68ed4aef0a08c3739b8d0040e9b1ab6133ab21ec67ae769f71f71
+DIST kdev-php-5.1.1.tar.xz 678368 SHA256 a33abd4837354218891225f0e18b7e9eb6e106cc1c744731a9003a9ea71e1404 SHA512 71d59db196e33663ae7167b973c3514e795d636370ace39b9c760a601f4bd947ffd6a3f8d7cfa0e199c77d8818dfeaf56882059aa18026aadd1e7b808326d0fc WHIRLPOOL ea4c437fa30bbad082d2e2fd65d38e8b91d9c4701a7726db7fc7010b80ca46f05d5975e5a2679df82b26ba26175abb11f6b0dca16f98a0ec992531dbe33fe91e
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.1.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.1.1.ebuild
new file mode 100644
index 000000000000..a98238d9a22f
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.1"
+KDEBASE="kdevelop"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional-recursive"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="PHP plugin for KDevelop"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop-pg-qt:5
+	>=dev-util/kdevplatform-${PV}:${SLOT}
+"
+RDEPEND="${DEPEND}
+	!dev-util/kdevelop-php-docs
+	dev-util/kdevelop:5
+"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index fef8da7c50ee..2b8aa6f8ceb6 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1 +1,2 @@
 DIST kdev-python-5.1.0.tar.xz 1068408 SHA256 362334b35a807af9143cd209619939f514a526d7e93a7f22000ed090c045d918 SHA512 9e7a847d0303a580929d70016de43392b0fe59531b4edafd25f601c27f87edae0c9056c77da2092d2d6fabd7a60e0f259a9a4209d7eef94fc932f35d9f2f9092 WHIRLPOOL 712057597fe91d42930d19b32dba1ceeb687d3e9e32ed100f37b9a0a4bbf075137098f95aa7f218f4e5797dfc81f9efbdaf5bc232dd62878d6731dba0309752c
+DIST kdev-python-5.1.1.tar.xz 1068832 SHA256 e2d8ed64106fb6ff12161095df67d078af9e56c9075f7c2a99d96fb517ff020e SHA512 e232b2fc44876c8e46422ea2986c2df06071e3422236139d3658f514d2f9d968c4f6320048566fe991c5c510cc3cf36eb55389e3d2205bb29c92b4c6a97b19bf WHIRLPOOL c5990fb2bbd74aee057b31b9dd74dafad0d1a8fe183f8c9321d444aca820dffe85a37642fa7de961362dea1b51224d6e3e80ab4c67525c82c676a152dd76425b
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.1.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.1.1.ebuild
new file mode 100644
index 000000000000..fe446336d5ea
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.1"
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevplatform:5
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	dev-util/kdevelop:5
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null || die
+	emake parser
+	popd > /dev/null || die
+
+	kde5_src_compile
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 69b4dcbf1b16..5005a20e590e 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1 +1,2 @@
 DIST kdevelop-5.1.0.tar.xz 4681648 SHA256 c0bc424a765a9be3ffb25acefcfa4db323b0612bae762fca1ae70225fa5c8ce8 SHA512 a4363467a3caabd1b047e17ae9f1c56a4511ae752611705326a1563e48752044a242cdd429e651b3f8bc87c1de429f508dc264888898a7715eab43b9f10a6685 WHIRLPOOL 7343997594c6edac84c49ba2b2deac9d82ecc230e8dde3bc0c09c58e0e2e19efebd80fcc4e9da6cc98fd951beae0df3eb9d375c6357e73ccfcf26af8c61325c1
+DIST kdevelop-5.1.1.tar.xz 4685416 SHA256 0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754 SHA512 e2c1a4885bab9815341a53da6a98dd4939b7128eee174e79c616cc020f464362a2730508b3a8d66f00e4ea95f2098b92d6328b43b9f22bd77145bbe6ce096529 WHIRLPOOL 7e4134a89533ec510486f4b65a50cdc4b6f9f3ec3639f38077e568b54ae66d470f8028348eaab875c08ab8de4535902e2572aea99f86baba9359b581747a4366
diff --git a/dev-util/kdevelop/kdevelop-5.1.1.ebuild b/dev-util/kdevelop/kdevelop-5.1.1.ebuild
new file mode 100644
index 000000000000..acb31ee1a300
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.1.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.1"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+gdbui +ninja okteta +plasma +qmake qthelp"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-util/kdevplatform-${PV}:5
+	>=sys-devel/clang-3.5.0:*
+	x11-misc/shared-mime-info
+	gdbui? ( $(add_plasma_dep libksysguard) )
+	okteta? ( $(add_kdeapps_dep okteta) )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	qthelp? ( $(add_qt_dep qthelp) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	>=sys-devel/gdb-7.0[python]
+	ninja? ( dev-util/ninja )
+	!dev-util/kdevelop:4
+	!dev-util/kdevelop-clang
+	!dev-util/kdevelop-cppcheck
+	!dev-util/kdevelop-qmake
+	!dev-util/kdevelop-qmljs
+	!<kde-apps/kapptemplate-16.04.0
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		-DBUILD_ninjabuilder=$(usex ninja)
+		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		-DBUILD_qthelp=$(usex qthelp)
+	)
+
+	kde5_src_configure
+}
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 09bec9a9f593..2b5f32956a6b 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1 +1,2 @@
 DIST kdevplatform-5.1.0.tar.xz 2048172 SHA256 f09f3b807c9d360b894bc4439cce5b1cb23ff0754941dd26abf45c33b731aedb SHA512 b94fcd1294855654c3183c7bc0dbfefd099cfaadeb44180788f439b11c0e61609863aae5a06776d9e6a4915c9768a794760c8a931678d9cc5d9c5e98560a7998 WHIRLPOOL 301620ff6ebc9012f0f7bce4d771b83b8b03ab75602cae0182a0b23173ff1d9382a0536c16acc512e5ee27bd01861b308b5388b853ac701ec83b44f3b913e714
+DIST kdevplatform-5.1.1.tar.xz 2047948 SHA256 3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726 SHA512 2780bc8f321be262bb9c2152fa8c58d52c93d48411122a5ce8d00f11becc8885c9697be7159cbcbb57c0a3f049912f96e67bc274af7ffa90cebf62eeba1eb572 WHIRLPOOL 60ea7b77d5edc007e91d141affbb9c9d46a4cbf52efc21e7b0202d07132d553e266af2968802843758a40905aeb5f568fff787fd4f68c48698619b5f8528378a
diff --git a/dev-util/kdevplatform/kdevplatform-5.1.1.ebuild b/dev-util/kdevplatform/kdevplatform-5.1.1.ebuild
new file mode 100644
index 000000000000..feaee6056445
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-5.1.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.1"
+KDEBASE="kdevelop"
+KDE_TEST="forceoptional-recursive"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE development support libraries and apps"
+IUSE="cvs reviewboard subversion +welcomepage"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	reviewboard? ( dev-libs/purpose )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	cvs? ( dev-vcs/cvs )
+	!dev-util/kdevelop:4
+	!dev-util/kdevplatform:4
+"
+
+REQUIRED_USE="test? ( welcomepage )"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	# root tests subdirectory actually does not contain tests, installs stuff
+	if ! use test; then
+		sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
+			CMakeLists.txt || die "Failed to fix CMakeLists.txt"
+		sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
+			tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_cvs=$(usex cvs)
+		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		echo
+		elog "For konsole view, please install kde-apps/konsole"
+		echo
+	fi
+}
diff --git a/media-gfx/darktable/darktable-2.2.4.ebuild b/media-gfx/darktable/darktable-2.2.4.ebuild
index 768bdc5f4beb..fb0fe222ff1c 100644
--- a/media-gfx/darktable/darktable-2.2.4.ebuild
+++ b/media-gfx/darktable/darktable-2.2.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2260d07e4e5c..d7276d4cc54c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-3.1.2.1.tar.gz 209242179 SHA256 934ed82c3f4e55e7819b327c838ea2f307d3bf3d040722501378b01d76a3992d SHA512 09ca30579b0f32d0b1ca3a7ebfbf456b80fd3f14d2e8c2be1529c398b983a89753e39b325eea23d78e61381f7b7fc9aa1a187d3bf4b1a78c1d317cd5d7f305ac WHIRLPOOL 30a0967efa184f544010a44229bc5d88daaf014316b73da43f922f32489a5b8e1a1039401a035018ffda716a390a80d011deba855c14500eb35f5a49b41c451d
 DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
diff --git a/media-gfx/krita/krita-3.1.2-r2.ebuild b/media-gfx/krita/krita-3.1.2-r2.ebuild
deleted file mode 100644
index 12d8dfab0db8..000000000000
--- a/media-gfx/krita/krita-3.1.2-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.1.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-S="${WORKDIR}/${P}.1"
-
-PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-3.1.4.ebuild b/media-gfx/krita/krita-3.1.4.ebuild
index 93ac76c58e4b..0b60191a36ab 100644
--- a/media-gfx/krita/krita-3.1.4.ebuild
+++ b/media-gfx/krita/krita-3.1.4.ebuild
@@ -72,6 +72,8 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package color-management OCIO)
diff --git a/media-gfx/potrace/potrace-1.14.ebuild b/media-gfx/potrace/potrace-1.14.ebuild
index e83da98afa4e..1bc0bf12ee83 100644
--- a/media-gfx/potrace/potrace-1.14.ebuild
+++ b/media-gfx/potrace/potrace-1.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
index 244ad3e5b138..64d8f47f5cae 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
@@ -8,7 +8,7 @@ MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd"
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index 4f8fe7701a40..c663b9638466 100644
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
index e6c158198023..69d6b1119b9f 100644
--- a/media-radio/unixcw/unixcw-3.5.1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~ppc x86"
 IUSE="alsa ncurses pulseaudio suid qt5"
 
 RDEPEND="ncurses? ( sys-libs/ncurses:= )
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 3594ad4fed73..d155478e9841 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,2 +1 @@
-DIST kid3-3.4.4.tar.gz 1366457 SHA256 ab1f622e26e5d672eb078f93abdb51f1a2667a748be8a211fcd91d18e0db4de0 SHA512 3c37f8345a6a22d241c7d5b5a57957d1009055eadb492b54cf3963aa43c47d8884de940190f9c8c2b4c70d9103a7769eac78d7df646be84a65cdef6ed16a4e32 WHIRLPOOL 33d865ea40f1e97299f7fa244bd587f3d2b04aa813debb8a56698f0363e6a3a5481a4d51dfd200e1847dd3afa904ef67408209b056d8da4726dcc30f8acefa27
 DIST kid3-3.4.5.tar.gz 1376570 SHA256 0d703b0b8c2538eba1f8f540a87e13a4bf61f715ef9cd1253f18417ebb096404 SHA512 36ffb45dd6689f252021cb9cda667f28810fb1d7da77179ef6abc80031b7a0dfaa445776c8e3586000d774bc608395fff0854d867c9e1e52676409f78a515ae3 WHIRLPOOL eeb0d29b9a30685ca6bdb4064216efbea48cb35de8056c7cf60956801129455e2145842e9cd52d8a4e99a099752d70e31e09307454ac25ce2c8d4d1bbc122199
diff --git a/media-sound/kid3/kid3-3.4.4.ebuild b/media-sound/kid3/kid3-3.4.4.ebuild
deleted file mode 100644
index 47b335519c5a..000000000000
--- a/media-sound/kid3/kid3-3.4.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
-	"${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_PHONON=OFF
-		-DWITH_QT4=OFF
-		-DWITH_QT5=ON
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.4.5.ebuild b/media-sound/kid3/kid3-3.4.5.ebuild
index 6e7a7174d66d..5766131f8ebc 100644
--- a/media-sound/kid3/kid3-3.4.5.ebuild
+++ b/media-sound/kid3/kid3-3.4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
diff --git a/net-ftp/filezilla/filezilla-3.25.2.ebuild b/net-ftp/filezilla/filezilla-3.25.2.ebuild
index 7ca3a8e8ea12..393e5e9c2e4e 100644
--- a/net-ftp/filezilla/filezilla-3.25.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.25.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="dbus nls test"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 2fcae30bbe87..97ec09dcc2f0 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,2 +1 @@
-DIST konversation-1.6.2.tar.xz 3876040 SHA256 b6521dc29ee4e2b2b6d736860d1edb381609ee182a13517680439dcfa9d6289d SHA512 c4c2515fd6ea02a07250492151887be842c0d6ccdf6ea66075d0cd757ed26c3ed506852049e20b38c535bae9557f313a0b8fc3cd8616ad10c6b60f9a047b9e63 WHIRLPOOL d8d23a688a4e26877375514ddb9a3ae1560976a5b5df660e15ecc89f00f93478eff33c62b7bbd7444fcc19aa56e0ca050d6d83f008733b05368f86712b92e783
 DIST konversation-1.7.2.tar.xz 3736968 SHA256 5ff96e84cee4e1eefc404a31d778067ea50dddd8a6c848911fac70bd52812618 SHA512 91523043afd7d7698c8166256d3eba225d8ff1ba44cad6811b00bf0004b765ce1ed618e900c8cafa7b395217b3fa3703db62a79b0a491bcef6c0bb65037add06 WHIRLPOOL 842fac84013a6915b5acad2c7ee8abab794c01722628fb4cbd7a3c462229fadf1c88b340fd094efadb1ac62e2c1838de80a26114bff0c98064c9f57e87974860
diff --git a/net-irc/konversation/konversation-1.6.2.ebuild b/net-irc/konversation/konversation-1.6.2.ebuild
deleted file mode 100644
index 2ce37c414759..000000000000
--- a/net-irc/konversation/konversation-1.6.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A user friendly IRC Client"
-HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+crypt"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5]
-	sys-devel/gettext
-	crypt? ( app-crypt/qca:2[qt5] )
-"
-RDEPEND="${DEPEND}
-	!net-irc/konversation:4
-	crypt? ( app-crypt/qca:2[ssl] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-irc/konversation/konversation-1.7.2.ebuild b/net-irc/konversation/konversation-1.7.2.ebuild
index aef932222c01..fa77bdc1f7e8 100644
--- a/net-irc/konversation/konversation-1.7.2.ebuild
+++ b/net-irc/konversation/konversation-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konver
 SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+crypt"
 
 DEPEND="
diff --git a/net-libs/opal/opal-3.12.4.ebuild b/net-libs/opal/opal-3.12.4-r1.ebuild
index d6917cf8eea5..b42c15a8d05c 100644
--- a/net-libs/opal/opal-3.12.4.ebuild
+++ b/net-libs/opal/opal-3.12.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
 LICENSE="MPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+IUSE="celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
 ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
 stats swig theora +video vpb vxml wav x264 x264-static xml"
 
@@ -26,11 +26,10 @@ RDEPEND=">=net-libs/ptlib-2.12.4:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )
 	ivr? ( net-libs/ptlib[http,xml,vxml] )
-	java? ( >=virtual/jre-1.4 )
+	java? ( >=virtual/jre-1.4:* )
 	plugins? (
 		media-sound/gsm
-		capi? ( net-dialup/capi4k-utils )
-		celt? ( media-libs/celt )
+		celt? ( media-libs/celt:0 )
 		ffmpeg? ( virtual/ffmpeg[encode] )
 		ixj? ( sys-kernel/linux-headers )
 		ilbc? ( dev-libs/ilbc-rfc3951 )
@@ -38,7 +37,7 @@ RDEPEND=">=net-libs/ptlib-2.12.4:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?
 		theora? ( media-libs/libtheora )
 		x264? (	virtual/ffmpeg
 			media-libs/x264 ) )
-	srtp? ( net-libs/libsrtp )
+	srtp? ( net-libs/libsrtp:0= )
 	vxml? ( net-libs/ptlib[http,vxml] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -134,6 +133,7 @@ src_configure() {
 	econf \
 		--enable-versioncheck \
 		--enable-shared \
+		--disable-capi \
 		--disable-zrtp \
 		--disable-localspeex \
 		--disable-localspeexdsp \
@@ -148,7 +148,6 @@ src_configure() {
 		--enable-g711plc \
 		--enable-rfc4103 \
 		$(use_enable debug) \
-		$(use_enable capi) \
 		$(use_enable fax) \
 		$(use_enable fax t38) \
 		$(use_enable h224) \
diff --git a/net-mail/tnef/tnef-1.4.15.ebuild b/net-mail/tnef/tnef-1.4.15.ebuild
index 164972ba9d07..ca70b476b5f1 100644
--- a/net-mail/tnef/tnef-1.4.15.ebuild
+++ b/net-mail/tnef/tnef-1.4.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/verdammelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 src_prepare() {
 	default
diff --git a/perl-core/File-Path/File-Path-2.130.0.ebuild b/perl-core/File-Path/File-Path-2.130.0.ebuild
index 42dad2e5fbc7..031f8b442fe7 100644
--- a/perl-core/File-Path/File-Path-2.130.0.ebuild
+++ b/perl-core/File-Path/File-Path-2.130.0.ebuild
@@ -10,6 +10,6 @@ inherit perl-module
 DESCRIPTION="File path and name utilities"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
diff --git a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
index a99af6f9cc2b..fc2d84c560d0 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.130.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/www-servers/uwsgi/uwsgi-2.0.15.ebuild b/www-servers/uwsgi/uwsgi-2.0.15.ebuild
index 4cc7e9275b7d..8091a9b689c7 100644
--- a/www-servers/uwsgi/uwsgi-2.0.15.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.15.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog