Merge remote-tracking branch 'github/pr/448'.

107 files changed, 845 insertions, 397 deletions

diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index dfe3e7534a3..483b907ea08 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -1,3 +1,4 @@
 DIST arj_3.10.22-10.debian.tar.gz 12200 SHA256 0636c97817cf7328f43f541edfbb5ed59435daddee6febb4ffb8f7149543a983 SHA512 f4666a9dcaad3b5f49dbecfcac658d3ba3640fd885d2a378339c4c1c365019a5aa3a78935d9478d94a3ed80a9fda5d2b5ff02e5edfcad48597bee07662be560b WHIRLPOOL 617ca21734a325f0636dbe81d3cb7e78c8dcc4db20ce8848f6c46742bfed1c30563d979e3323d23fbfd9477c3c9821bd4ef5f9c9d0a6b1b1517fcc5aa9397627
+DIST arj_3.10.22-13.debian.tar.xz 15904 SHA256 d74588f13a2de780d762d3405b0216a02cf4e55bda4ac4703cab94310ac3ea46 SHA512 670f9fb69f1f4363a4d277151bc99286de024764a99ca5276e9f46d560718a906657ec6e2898290f57fbf1007c9190959d38de14ecd1d3205fb26323eff6795d WHIRLPOOL b1111dc6dce1d3810819d6773a27b5d9642ea421e571fe1fa7eac0f4dfb16625769d57a4378613ca7f1b58531593f55044ef6efcb41a56fc4afd2a65c290c53f
 DIST arj_3.10.22-9.debian.tar.gz 11160 SHA256 3ca3437f48f6a17b6fe3fe9526d2029dc30a1f22d7a5c5df5bb6140b5fe9255a SHA512 d0b41584b8771ab757b7a90a697b4cc8099bc0657a0bfb3187db74f7626f5ffe249e9362d2acbe6bf86ddaf7fa5e97c936019112828608b489621bdc4eaf36e5 WHIRLPOOL f8a28d14dea45ed38cf30b79b88805b3981344ac30bd8e48aff468e7d5d63812da4eaf34090f2a2064b383fe4cc39d1547c01c3a8da081f8827442bcb59be93f
 DIST arj_3.10.22.orig.tar.gz 431467 SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76 WHIRLPOOL 86223959a938898126c544a75cbc0c4885777fe2eda3ccad2bbae47f8e3a31a409e2dca0dbbde8333e8c2ac77a1f350c7d95bbcba002f88ee94420f31d957319
diff --git a/app-arch/arj/arj-3.10.22-r5.ebuild b/app-arch/arj/arj-3.10.22-r5.ebuild
new file mode 100644
index 00000000000..decc02d471a
--- /dev/null
+++ b/app-arch/arj/arj-3.10.22-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib toolchain-funcs
+
+PATCH_LEVEL=13
+
+DESCRIPTION="Utility for opening arj archives"
+HOMEPAGE="http://arj.sourceforge.net"
+SRC_URI="mirror://debian/pool/main/a/arj/${P/-/_}.orig.tar.gz
+	mirror://debian/pool/main/a/arj/${P/-/_}-${PATCH_LEVEL}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-implicit-declarations.patch \
+		"${FILESDIR}/${P}-glibc2.10.patch"
+
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}"/debian/patches
+
+	epatch "${FILESDIR}"/${P}-darwin.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
+
+	cd gnu
+	eautoconf
+}
+
+src_configure() {
+	cd gnu || die
+	CFLAGS="${CFLAGS} -Wall" econf
+}
+
+src_compile() {
+	sed -i -e '/stripgcc/d' GNUmakefile || die "sed failed."
+
+	ARJLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	emake CC=$(tc-getCC) libdir="${ARJLIBDIR}" \
+		ADD_LDFLAGS="${LDFLAGS}" \
+		pkglibdir="${ARJLIBDIR}" all
+}
+
+src_install() {
+	emake pkglibdir="${ARJLIBDIR}" DESTDIR="${D}" install
+
+	dodoc doc/rev_hist.txt
+}
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index a7293d511e6..61551f39498 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,12 +1,9 @@
-DIST rarlinux-4.2.0.tar.gz 938809 SHA256 6826646bc9620055689f465e61f7d4a86e6ccc66940178d24f48d01734968eb5 SHA512 6cf2df60719e06eacedfecb7c30ba941803a537949a04d2a53b261f6975c322391195605873f7ba5307bfd4072d77ded436eb923da7bbaf12f1a3c675ad0e827 WHIRLPOOL 07dcacf990f8e4d2b419a2ff7816154066270aa87ad2e721af37228a0a0f607113f329cca31d56061372b86e171687a5a121f05f19824875889f601026021a50
-DIST rarlinux-5.0.0.tar.gz 1098525 SHA256 4f942d79bb16dc1981ccb52893e4a24dbee908089d783d766ac45cd4f2c78610 SHA512 46ef3d9703a71555e1166467d9658b7d0d210a21cce72957510bbb22870a3a10fc55a6298774c7dfd2ee0d1a2b02dd38fe2e4bcc248d025a7cb276d4d77a6629 WHIRLPOOL af2008d3bca69afc064ff9f5c9201ba99601c2f14173aeb949331cec22e2c9a25b451a7b6375f3c61b848adf003ac6d3788d5b9905bdac64217153d331205761
 DIST rarlinux-5.1.0.tar.gz 1103841 SHA256 586ba2671ace61f2d56fe85e54710b6a588cd9f87f95030b81d9b2aff2292636 SHA512 affe60f9865ad172bb8053af50e977afbb70a43e0cfeefb4e9d6924f2d9718670662a24770e46cf990715d9841ae3387d2c30522075f5cde97a05a2b0da23f22 WHIRLPOOL 9e957ff470130e40d05c2c80064ea39fa5c2fbb3c3ce85381bf9d3c8bac7487e10ab773c2752c8b7cb38906c8792c4b23bb96cd2fe22fdb7f2f764a274d5d2be
 DIST rarlinux-5.2.1.tar.gz 1109839 SHA256 dafe2deb46d0a9cc99b5f4e7204913051d4a2010e08311a0d3565050bd74026f SHA512 bb7ad791f5a34b8d48008a75f9d8008237f36261be6e722d8fdf97a19e70e444c42232544ac63514c354e1d173260dcb635024f72c77afff172f326a137ef21c WHIRLPOOL 6ee7d38bac0c158f0ab6b534544dd7fcd3bf3459219790d2f05ae60df86e7502ca8211580035d62279e99bd427577c4a79bd2eca6e1b99dc2dfde679a07537ec
-DIST rarlinux-x64-4.2.0.tar.gz 979938 SHA256 db4a35d1092eade42fd4233e200c8a24b942c7d67a4b7d0f92914781924b3985 SHA512 48da42222d4e8cc6eb23d21b7f3df1f699dd9624d525cafa81760ca1ed86d7a8c1a70a18a4f89ffd6b4ac65c8aa81c77895692f2c79f8f439dd179ba8d1433be WHIRLPOOL a8c949dffccd8e8774f575b2ac1aaae098e6f253e5c3a355586d2194a753b8f746096e6b3e3a4232001b68c29f39d939ed3c7c4ee89335a850813f32f41cdf56
-DIST rarlinux-x64-5.0.0.tar.gz 1134245 SHA256 aceefdab919a03dfab9892dbd7d25cbc0681f76608de2c73e400887fd625f30c SHA512 0b479703ea5c999274b246ef0d5ff5481bafb814f3342a13993586e252e3979b7e903818dbede7a72f9211150cca62a303d3f98c2e9830c5a4020a3d0635ad74 WHIRLPOOL 8195d69ab7811ea46f73ad11ce49fb183767f0160981891ef65f4183e933a11e90c52929db8f40af6d3fe8da6c6092a7f3985a5c944e3e38ca03c9b8054c78d7
+DIST rarlinux-5.3.0.tar.gz 1114667 SHA256 7638f20ba68a49e9d9b3b247d9922f3d36c248eaa2e784bd2f0fad0aa1fd7ba8 SHA512 b2eb9831cac88f7f72a169c081a35fc688aa82a5e80cf681440b38f7d5f7691511ca1b85960b3949668faa4c1fe0921fb170d7a1ffb52d77db124fd073f1516b WHIRLPOOL 42ee7ef6f4a186b6284490e04378d24fcdbdea2406724137522ce2c18ebc62f8321e7092673ce4ea3e917b0ea393145b8f496ba06e780bdf2526b3223d5474aa
 DIST rarlinux-x64-5.1.0.tar.gz 1139386 SHA256 8c04474201179cc3d3a4f3d1aa7bdd6ee3244479aa16371d2449cf416f882299 SHA512 76b1bf5f7cfc950415d3b9295b010766d1caf7207b86eae00edaf325898e7934909982658c6bc7d113dcc2dbcd7fdb40dc02dddeca63cbc90d69950fde426bb7 WHIRLPOOL 0fa10a995777a2aad7575b2842d5e82c741de9458fd9349c21cb3c8842a260ebc1b8480451c287239a6047b543330279f63fc3a6ac9b0517629997e70ba246dd
 DIST rarlinux-x64-5.2.1.tar.gz 1145110 SHA256 54015e921bf2789ca90afdf913c5a5d57db612bfdbf33eedae7b068aa1016a2d SHA512 fe0f866aa7437608e60d3d760263aa2428d7154f0574140008d19a088b6968b06a02d056bd6e9f1b30f4b06c5fd447bf8383bd823d958c6676cd7d835f14de2c WHIRLPOOL b82f153a9aa1e239e2b1e137c71005ce812ce446911e9f62c43609a810cfb86874aa7137698b7a79326d693d4571da20df19973206412be429f1b593908fa86e
-DIST winrar-x64-420.exe 1656459 SHA256 e1039b5051eef12c37200ab0d3e93d407a5027aad6b59ba705526f670f0634b1 SHA512 906ddbd30ce8503df8b71d5446bfc7a7aae0076313f58dd94523e63acd525b9a323d42f937b772f75fa274740d96c8d21030e6de68610c93d56d37935f40022e WHIRLPOOL 683b96c7c6af6a2562a7de5ab394182d27c58df71a13a0650b5a93edefda14795402d19f8277bfbb08692d3c813671adfef363847b370b53741949708ece608f
-DIST winrar-x64-500.exe 1970848 SHA256 72b1577d0993d1358c7e4d0ebc651b8236c5d6e1a2390b839fb9b34e79fcbb02 SHA512 f99d9bca49d401baeb82108e22728a8cc5652eb17f5fc9ea5ca44d66197ecdb1a0c3a85a114bfaafd4e61593a5c2ceac9c182774af02f17f8e6f9a11eeec0da5 WHIRLPOOL b4d779f9e90eecb59fa94c005576417d92d93491da049512f7c49bbcafdaccfc43d1658d529f8b7e662ebfec930a2e8f68e32916b836ab859585b7a4b1c1de93
+DIST rarlinux-x64-5.3.0.tar.gz 1149037 SHA256 8075b01d29ba0fc0c927f08e2a1b2149921bdb42c9457b7a7ef0950e387b5131 SHA512 3391db53adcdc355b6c58843a59f17a0adc2abc874ba8828cb985f27d33d27804d6a8c4db642fbef6a09d513858a6b507f6b49f9097a499d800f4cdd953f1f3e WHIRLPOOL b450bf85d36627c0b03be1523cdee980ac771ea5acd9786264fc10efd8473b1cec031dec57d1b1f345ea601fed94f0505d300d106800076c20bc97a437b6fd26
 DIST winrar-x64-510.exe 1915800 SHA256 3dad374e0a3b38e5629e8e9d591c77e73199e7714fef2cfb651a133e843971ed SHA512 a7d723ca45d376fe1b003be0ccd0477e51b057784ee14feeb78727207c390a9e31efe481eb998f316ea27f33298b0235690eed71242fa4f591603f3cc7238f20 WHIRLPOOL 9a6992d1cf6e52f352199f037b410853134e77245cb758f641569c91e208a1f693f5a9eb0e0680763b5bd0539fca2bac55b8af13106957a40d32297b8078536e
 DIST winrar-x64-521.exe 1941744 SHA256 e315674d9e2f5f63977fb5fd8e8bcafcdc106594b83e7ba062c5bec24901a5d2 SHA512 b08be6ea9dcbd19ac3849045a18d59a968ade46bcdfe3c6451dbcb5856d294b9dbdb89b1d38dff1749b44c47dc47b4de519ae5561825f06498455ffec48c7822 WHIRLPOOL 4faf6f2379e8b589974bff8fbb4a8a9561d2d60473f7874c0bf163a8915e902d7550847bd808e32ace3f48cfc02246b07b69b50ed848881d84d59d0594fd2322
+DIST winrar-x64-530.exe 1964912 SHA256 951b53d30aa7d40f5fd4720ddd7385d431ede0e18df496fcb9c255ee1520d668 SHA512 ebe7ba3e3bc36941a6cf4f27f00edfd62e2297fda6de64a3718da10f10c9a9510b1dea96e5d128602e3b4069e276c88f79914b535a0acb390158a620510501ca WHIRLPOOL ac463202b33f4130e45da5df85b47a0eaf268686aefb5bcd8b09da729f1348d000d513f8297c67520515321b0d6632a16d6ed23ccc73efbd18c605cb624981d1
diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index 9f388db16c0..373b125376c 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>jdhore@gentoo.org</email>
-	<name>Jeff Horelick</name>
-</maintainer>
-<use>
- <flag name='all_sfx'>
-	Install all SFX (Self-Extracting) files rather than just the native
-	format (allows creation of Windows EXEs on Linux ELF systems)
- </flag>
-</use>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jdhore@gentoo.org</email>
+		<name>Jeff Horelick</name>
+	</maintainer>
+	<maintainer>
+		<email>elizabeth@interlinked.me</email>
+		<name>Elizabeth Myers</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<use>
+		<flag name='all_sfx'>
+			Install all SFX (Self-Extracting) files rather than just the native
+			format (allows creation of Windows EXEs on Linux ELF systems)
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-arch/rar/rar-4.2.0.ebuild b/app-arch/rar/rar-4.2.0.ebuild
deleted file mode 100644
index 88aaa026653..00000000000
--- a/app-arch/rar/rar-4.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=4
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="http://www.rarsoft.com/"
-URI_x86="http://www.rarlab.com/rar/rarlinux-${PV}.tar.gz"
-URI_amd64="http://www.rarlab.com/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="http://www.rarlab.com/rar/winrar-x64-${PV//.}.exe"
-SRC_URI="x86? ( ${URI_x86} )
-	amd64? ( ${URI_amd64} )
-	all_sfx? (
-		${URI_x86}
-		${URI_amd64}
-		${URI_w64}
-	)"
-
-LICENSE="RAR"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all_sfx static"
-
-DEPEND="all_sfx? ( app-arch/unrar )"
-RDEPEND="sys-libs/glibc"
-
-S=${WORKDIR}/${PN}
-
-QA_FLAGS_IGNORED="opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-	opt/rar/unrar
-	opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-src_unpack() {
-	use x86 && unpack ${URI_x86##*/}
-	use amd64 && unpack ${URI_amd64##*/}
-	rm -f "${S}"/license.txt
-	if use all_sfx ; then
-		mkdir sfx
-		cd sfx
-		unpack ${URI_x86##*/}
-		mv rar/default.sfx default-elf32.sfx || die
-		unpack ${URI_amd64##*/}
-		mv rar/default.sfx default-elf64.sfx || die
-		ln -s "${DISTDIR}"/${URI_w64##*/} w64.rar
-		unpack ./w64.rar
-		mv Default.SFX default-win32.sfx || die
-		mv Default64.SFX default-win64.sfx || die
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar || die
-	use static && { newexe rar_static rar || die ; }
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar || die
-	dosym ../rar/unrar /opt/bin/unrar || die
-
-	insinto /opt/rar
-	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
-	else
-		doins default.sfx || die
-	fi
-	doins rarfiles.lst || die
-	dodoc *.txt
-}
diff --git a/app-arch/rar/rar-5.0.0.ebuild b/app-arch/rar/rar-5.3.0.ebuild
index 063c4f6144b..bf31841b9ca 100644
--- a/app-arch/rar/rar-5.0.0.ebuild
+++ b/app-arch/rar/rar-5.3.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=4
+
+EAPI=5
 MY_PV="${PV/0_beta/b}"
 DESCRIPTION="RAR compressor/uncompressor"
 HOMEPAGE="http://www.rarsoft.com/"
-URI_x86="http://www.rarlab.com/rar/rarlinux-${MY_PV}.tar.gz"
-URI_amd64="http://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_w64="http://www.rarlab.com/rar/winrar-x64-${MY_PV//.}.exe"
+URI_x86="http://www.rarsoft.com/rar/rarlinux-${MY_PV}.tar.gz"
+URI_amd64="http://www.rarsoft.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
+URI_w64="http://www.rarsoft.com/rar/winrar-x64-${MY_PV//.}.exe"
 SRC_URI="x86? ( ${URI_x86} )
 	amd64? ( ${URI_amd64} )
 	all_sfx? (
diff --git a/app-portage/kuroo4/kuroo4-0.90.4.ebuild b/app-portage/kuroo4/kuroo4-0.90.4.ebuild
index 670bed83698..6550fb31a47 100644
--- a/app-portage/kuroo4/kuroo4-0.90.4.ebuild
+++ b/app-portage/kuroo4/kuroo4-0.90.4.ebuild
@@ -20,5 +20,5 @@ DEPEND="dev-db/sqlite:3"
 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
 	$(add_kdeapps_dep kdesu)
-	$(add_kdeapps_dep kompare)
+	kde-apps/kompare:*
 "
diff --git a/app-portage/kuroo4/kuroo4-0.90.5.ebuild b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
index 670bed83698..6550fb31a47 100644
--- a/app-portage/kuroo4/kuroo4-0.90.5.ebuild
+++ b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
@@ -20,5 +20,5 @@ DEPEND="dev-db/sqlite:3"
 RDEPEND="${DEPEND}
 	app-portage/gentoolkit
 	$(add_kdeapps_dep kdesu)
-	$(add_kdeapps_dep kompare)
+	kde-apps/kompare:*
 "
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index bbc4669d733..fd7a612d4a5 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -3,8 +3,10 @@ DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e031
 DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
 DIST swi-prolog-7.3.10-gentoo-patchset-1.tar.gz 1117 SHA256 e3596515edc419cca5fed53410d4edbc8bb95eeff206274260916fb348c97f0d SHA512 2be89c25e9980785760305c9d443a92388ce0bfb09e1f64e5a8029341e9d7cc97bafa32992382c303aa51cf741f989e64bc675f5fdd31d09dac7442ee9b3d3ad WHIRLPOOL a2d206a564652bff73bd946f9aee386da7b76647e6f93d55c33cf45c8331d8d2afd980746e4a25f40825f6258fc53c926a94279d75e66053e2c21d80dda0eeb8
 DIST swi-prolog-7.3.11-gentoo-patchset-0.tar.gz 338 SHA256 9440ba227c09708255790dce8797d79a258592dd0ea47853b273f45a1682a2ba SHA512 40e5b92b2491835a255b5666b43c4f9b4f24ad8df3d5fb7f7eaae51ee6582209cfe256c4ebdede72d3101838df1ee5d48c91c36ec7b5988555c2bcdd00cb8501 WHIRLPOOL 1e5983899f6acb4cb22102c445020b1d328ad2621745f9d30f1f84dc1b4f6498ad0d4043f078cb7de12d9acc11ceff925a4f28d004f48944c7afddf3876976ff
+DIST swi-prolog-7.3.12-gentoo-patchset-0.tar.gz 334 SHA256 648fa255ffa3a88f94bab11cf746a4a39f69554c2a4b97a2fc7cc65a0c7a954f SHA512 36ad39132eef380f620f29b3d05acbd499667cf2c82a8952d2047ebaea4dea4a7d1c54fdfa290b76fe5eda2e9e1698b25f7f707825485cf56be56db57b433a6c WHIRLPOOL e8a8988d51f40670abfa25a6788785932dbb01c8cdb885f4b4dc8c46fba793e30aa2d014af57c544f0e863ceb6c5b15dbfd89cdd69ff1ca069fc1e56ebbec2ce
 DIST swi-prolog-7.3.9-gentoo-patchset-0.tar.gz 1507 SHA256 029541109cc60d176b65d12903ee2e06f209c38ff29421674e660d31d6ee44d4 SHA512 357df9c6e5ce5b046e4ceb7d65b358bd191ff8c912812deba918fe3b76c48a46c9f89f28ddc950de151e47ec57d654c53f537024da5f7f2f373f7466f07f914f WHIRLPOOL 5ac911d2950d4ccffe1db959467215fc8d074b9a842e79aea7d8bc0d14587dce6388707b2c06e3d94474eed8feb939398daa616160642883192e6dbfe7034da2
 DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
 DIST swipl-7.3.10.tar.gz 16093869 SHA256 caa2774963122cb57fb04370ea08d6a3c3ed5a5e98d92eb9865953e6b20baf5f SHA512 0f7113f20679a85e048f8d1892777a4bd78d60787b834d2200137cbad767618ca942dd152cf69a3496577f10ce85555f4d694d22394b5ae31244b7cfa8d07e01 WHIRLPOOL 797a8c0b5cd524e502de1ade9f33bfb8b8f9de1454bf3233643aea4870a8ed14c17ffb097edcd943dfbea1d9f50dd78a304beb55b15d4960224c4110c2e4dccc
 DIST swipl-7.3.11.tar.gz 16114511 SHA256 d5f65705454a72450214aca612b78d99a63d7820a9c875b4131badb67cc565f9 SHA512 d310062fbc41a4ae527265fa9acade0eeb81ee84bf4372c1af1892937ecd4b8b60a7409ba7a7a17474bee0c5a2429190f797ba0fe365a9b6b46d4be478e79a78 WHIRLPOOL d12f177b4021e571bcd16282e4ef518781c726b1a75a5c188b006a8ef256e4e73d13c226727bc117b0a04f96b8151429277ef7bab8249ddf62c22704946c257c
+DIST swipl-7.3.12.tar.gz 16176445 SHA256 33b5c8fbdcabc1a297f577e5a95dbc0d52150890e577f94809aa85dc9cc4b798 SHA512 d45785467eeef5f7f102597e2b61ee29e5fe973996f8d11fc1ae94276ce3de2b2b7335d1cbf9e6a0257b74ab409e7b12231ae29fff4e27fafc834d5c0894c370 WHIRLPOOL 400d2e41f7fa24f6e0cfce81cd32b97d36aa28af3f440b4b697cf2c6f631943d0cb7bad82b20253e71a2077fb3daa3d159208da358f51cd92fd11a77ae0a808c
 DIST swipl-7.3.9.tar.gz 16086076 SHA256 0a0b6933bd37cf23446d77839651e0cbbb9d4becd74d9d47fc9d1f26fe409d04 SHA512 b592eafdf5413e1f473a83371ea387adbfa1f64fea1a1e809d2e0eafc11b95fd3e47a429e39dcb6c0c27f490d9ba20702805866e9f9d71d5ba2a135c4adb6043 WHIRLPOOL 0920d8d605be185035d3876adb92ba77c0b9081e66ee8da5fd9cabe83902fb9562fbce39769c137fddbf41f9b6580c267676a4cd21ed91b51f7a60827f5d6a75
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.12.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.12.ebuild
new file mode 100644
index 00000000000..9fab135a9b9
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.12.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline:= )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.5:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with odbc) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-libs/glib/glib-2.44.1-r1.ebuild b/dev-libs/glib/glib-2.44.1-r1.ebuild
index 86dc4bade84..50e93f8dd09 100644
--- a/dev-libs/glib/glib-2.44.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.44.1-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
diff --git a/dev-python/pytest/pytest-2.8.4.ebuild b/dev-python/pytest/pytest-2.8.4.ebuild
index 7d1ea6c07e2..f8a1f8a714c 100644
--- a/dev-python/pytest/pytest-2.8.4.ebuild
+++ b/dev-python/pytest/pytest-2.8.4.ebuild
@@ -54,9 +54,6 @@ python_prepare_all() {
 		-e 's:test_logging_initialized_in_test:_&:g' \
 		-i testing/test_capture.py || die
 
-	find \( -name __pycache__ -o -name "*.pyc" -o -name "*.pyo" \) \
-		-exec rm -rvf '{}' + || die
-
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index ea260536a02..88b7e2d860a 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,2 +1,3 @@
+DIST setuptools_scm-1.10.0.tar.bz2 16093 SHA256 080fccdf74121d8239aff8a17574123c9d2369dadf82178cf565422b2973632b SHA512 8a7eaf56dbebea08f12d4444606ef36033fbe9a0b725f92245d600a56d051988a87b73c43c7ead46a8ce4f83593db4b5a8c77f6dd331bfa381c7348f72743b0a WHIRLPOOL 9b988f77b5905f34da687b04841f606986e804ceb57f7aa2ca1de69a8e9b925d23325cf5c7db9be3f9b1f7051ebf3af0bd198ea0fc891dd7888369c962e5ae19
 DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762
 DIST setuptools_scm-1.9.0.tar.gz 17669 SHA256 b17362734ea2494a5fee611a2b3f09c251356fa5b9ed4567b666fe91105d4478 SHA512 e44cd8fa4e6badd707e8987e0d91f79d6dee4cda3dbab42bba70f661a66b841cc16dc9b59b35fecc0948b80e6ef198fb19f267aa839e32d09a543f3b724645cd WHIRLPOOL f688f00d2c700946ba17bc2acbc357412569068063893fd72414ab41d5e4e3360d410ae3e48b837ddebec5979e7e024ab544e75556b428d5e2603edf2b82acff
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild
new file mode 100644
index 00000000000..784a6dfc876
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 2774a6298ab..b00b76cf977 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -26,25 +26,12 @@ PATCHES=(
 	"${FILESDIR}"/1.9.0-mapping.patch
 	)
 
-# Run twice.
-# pkg_pretend to catch as early as possible, but be forgiving if 
-# python impl is not installed allready.
-# pkg_setup to catch them all
-pkg_pretend() {
-	six_dir_check() {
-		type -p "${PYTHON}" > /dev/null || return 0
-		local dir="${ROOT%/}$(python_get_sitedir)"/six
-		[[ -d "${dir}" ]] \
-			&& die "${PN} doesn't work if ${dir} is a directory #546730"
-	}
-	python_foreach_impl six_dir_check
-}
-
 pkg_setup() {
 	six_dir_check() {
 		local dir="${ROOT%/}$(python_get_sitedir)"/six
-		[[ -d "${dir}" ]] \
-			&& die "${PN} doesn't work if ${dir} is a directory #546730"
+		if [[ -d "${dir}" ]]; then
+			die "${PN} doesn't work if ${dir} is a directory #546730"
+		fi
 	}
 	python_foreach_impl six_dir_check
 }
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 21abdbf124e..c86c49e31ab 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1 +1,2 @@
 DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2
+DIST pkgconf-0.9.12.tar.bz2 87109 SHA256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f SHA512 efe13db7a46992eb44ead493fc12b3fc6a5567e0206f701b6c48d9b5eb0bc90fcc9ae7a7e08ae641bb10df869287e5b68291701d4013d6cf27bd2b1518c29192 WHIRLPOOL 9fa7336e111f29648f5c37310bdeb2266bead1b86ff18183cfb57c06054916d235da20a5723bd364497d20a1f4db399eaf77f38c0bfc1519f2b7b825ab4666d0
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 94288df8b18..938c704a8aa 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jdhore@gentoo.org</email>
-    <name>Jeff Horelick</name>
-  </maintainer>
-  <use>
-    <flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
-    <flag name="strict">Adhere to POSIX pkg-config specification. Useful for finding uses of non-standard pkg-config invocations.</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">pkgconf/pkgconf</remote-id>
-  </upstream>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jdhore@gentoo.org</email>
+		<name>Jeff Horelick</name>
+	</maintainer>
+	<maintainer>
+		<email>elizabeth@interlinked.me</email>
+		<name>Elizabeth Myers</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<use>
+		<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
+		<flag name="strict">Adhere to POSIX pkg-config specification. Useful for finding uses of
+non-standard pkg-config invocations</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">pkgconf/pkgconf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/pkgconf/pkgconf-0.9.12.ebuild b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
new file mode 100644
index 00000000000..ebc4c7f9922
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+	inherit autotools git-2 multilib-minimal
+else
+	inherit eutils multilib-minimal
+	SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+RESTRICT="test" # at least until 0.9.13
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	[[ -e configure ]] || eautoreconf
+
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable strict)
+}
+
+multilib_src_install() {
+	default
+	use pkg-config \
+		&& dosym pkgconf /usr/bin/pkg-config \
+		|| rm "${ED}"/usr/share/aclocal/pkg.m4 \
+		|| die
+}
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 595506381f3..39b2d299407 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,2 @@
-DIST bluedevil-5.4.2.tar.xz 128492 SHA256 a0b5b46f4ffae99ff2b591703e3fc82f3af1f12d1929c7980c28367ddc2abdab SHA512 afe26bfad23e0243cda16539eb75165c60e77acc3db76b288e5bfd7c0bb20d3a8b1f6f0733b915b76909addc02b71c3e2186d3369dfaca095cc2c3be69024124 WHIRLPOOL 44f98744303086a2669014283e7005dd415e7fbf43a77e002484327f50ea1648dc161b140399bdf285f7c3b0da34ea69e634ae7c8db2b3140ce1166b8fc43d9c
 DIST bluedevil-5.4.3.tar.xz 129024 SHA256 7364cf95850fb30cbf487ab8e01686b82d5c7817fe45046f75bdc654a846f413 SHA512 d28b2d85322dab9d0680e7ef371f10e197a1a4dd9acc2e96df424f0928a19634363469671908f0dfb188b3ccfbd936bd7469b797bd010dad42717fa7322db930 WHIRLPOOL bf09237e2c830b9aa75a46991f6bc51b2e38588f1df5d6eeef94c87a89e25524d98c26bb0e72e172fe0f18017df08827b69db9eac8e5cccfea6dfadf8f211f64
+DIST bluedevil-5.5.0.tar.xz 132872 SHA256 f3e154a95845fd7cc78903808a4fdc7c4ab7a29267824654cd948a58af351140 SHA512 bae2ff37459bcebe53881ba8ec3154cc95c60b8041793cdb2f3c17548fc4094710a052196995246e33d82ad6c88539813b5d20850e618ad1e5c398c5785bdfa0 WHIRLPOOL d497454c5a767c7357b0008342cc6d7e33bebdc7a3123274e764773fbb3f50cf649bca4d138b267402084e2075a081367ecedae07e63969bf60088efbece4d31
diff --git a/kde-plasma/bluedevil/bluedevil-5.4.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.5.0.ebuild
index c8e6a5407c5..00c987acd31 100644
--- a/kde-plasma/bluedevil/bluedevil-5.4.2.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.5.0.ebuild
@@ -8,7 +8,7 @@ inherit fdo-mime kde5
 
 DESCRIPTION="Bluetooth stack for KDE"
 HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
new file mode 100644
index 00000000000..ddb86059edf
--- /dev/null
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -0,0 +1 @@
+DIST breeze-gtk-5.5.0.tar.xz 257560 SHA256 fe7cd9cf38bc39f8b6f7dbed5b4b2f3f684cfe70c504de75a2d7c01edc925a30 SHA512 5cc1fa912534f2591f7cc919f4ab7de830c00f2c152349d445e782540b68458fa0f9fd4167af3459bdce9fd1689dcd5eedfa4efa91936263b5ec3d7f9a41ff2e WHIRLPOOL ebb0258adbf5c4baceeae335e7bb3cc9ae440696dd842065aa42c7301b7ce3a104176a2161a91398ba17c83b772f3824e6c81b19dd0be3ef886967962ffd1427
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.ebuild
new file mode 100644
index 00000000000..0be6858817b
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
diff --git a/kde-plasma/breeze-gtk/metadata.xml b/kde-plasma/breeze-gtk/metadata.xml
new file mode 100644
index 00000000000..a23f444b67d
--- /dev/null
+++ b/kde-plasma/breeze-gtk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index d066f8b82bd..f36a727e601 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-5.4.2.tar.xz 36567028 SHA256 9d2861867f133006ac7e1644c9b932a0f8cdf79ba912898f565d301a362e859e SHA512 665e6cab47a80c8f5a2af958466ab414dbfd018f2f676814f0413e030b083a14fe78acd3d91b1b0735eb3b1e059264f134f8a7edd5f7ae5e03fac60a988aeb62 WHIRLPOOL 611fcf3022e27fcb626d40f09903110ac48586d49b58be4e75a64efbd69efcf33df98557b76f3c4e52509428a2547cc3dc4591fb9662344c2996f207cdad1571
 DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39
+DIST breeze-5.5.0.tar.xz 29670848 SHA256 77a8d5732437ccb1cec08aa1c89ab409e75aa8cd55940e49cc6ab45d72445c49 SHA512 3c2886935f06888371e361f1efc1b0fcdd8a9f89a82e5048bf5739e7126ee266903f06c7c05474c3d6c19b021779b711173282bf6a98abee00010e9fbbdd4a88 WHIRLPOOL 2d3a49415f9ac42892890ccee6d40c18cade2cc4af4ed13bebe706cd44749d69afdfd588f435e8608c34b0ac2ae19223ccd2ab1afb8460fcb2d7c821b9d70560
diff --git a/kde-plasma/breeze/breeze-5.4.2-r1.ebuild b/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
deleted file mode 100644
index 21bdadf0a4f..00000000000
--- a/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde5 multibuild
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
-
-DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-	qt4? (
-		kde-base/kdelibs:4
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-breeze-dark.patch" )
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/breeze/breeze-5.4.2.ebuild b/kde-plasma/breeze/breeze-5.5.0.ebuild
index 0fa9af1475f..292de9565f4 100644
--- a/kde-plasma/breeze/breeze-5.4.2.ebuild
+++ b/kde-plasma/breeze/breeze-5.5.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5 multibuild
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="qt4"
 
 DEPEND="
@@ -21,6 +21,7 @@ DEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
 	$(add_plasma_dep kdecoration)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -33,6 +34,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
+	$(add_frameworks_dep breeze-icons)
 	$(add_plasma_dep kde-cli-tools)
 "
 
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 7eee0a02b5a..6d62d96cd33 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,2 @@
-DIST kde-cli-tools-5.4.2.tar.xz 484304 SHA256 626474b9890c789a7bde44bdd40c4c5999a45161cb1fa62eee7873a8250b8c41 SHA512 1dc050e959d84d18bede20a36abd443c4b20ca19d6143a60c4bf569b35acbc128b107f17a30ad32973d37957c8ea697748d13e25427e08821601c149fc4f1466 WHIRLPOOL 42ff5716ed2bfc10f4a1012fa65fa60582cd9c951cea3f7fdd8ef4adec00e2f6bb558923e4d292de1ce1f771252a8d76d3b1f395ff775550c6d722762d6bd159
 DIST kde-cli-tools-5.4.3.tar.xz 484060 SHA256 19e1c443e74f4472dd85fe3065fd204bebff0e3358b9f34c82c0e4b5fb74a799 SHA512 6e9970fd492097319be2c3d84e08fa6cf885befdac8c8f4c8a328080c0f1091f976f885650156ee0e073a6c9af294c47482a1aeef8276b880538e2ef5d018b28 WHIRLPOOL aa8f48e0464de0f35597d7889203a743f575eb4cc29405f945b345cd92e3d158a3dcb1b2b829e10a0020ea3076cc980c3d39355dd863f2fd5e566763ffd3796b
+DIST kde-cli-tools-5.5.0.tar.xz 485988 SHA256 9b4fadc2d7d2526f30ce22fcbcf375aefd7793aa8d53609e5ecedfc043878550 SHA512 e0201b134c86f7b02b8016e2cb6c7910847f2c3a8dc71b93c2a9e94c0f83c70324d7532f3ffd4bc17472185988cf9034f90c5fbe8a8b6adbba6bea1f0c6bc7cd WHIRLPOOL e36443897b2870a036be38037da5dee44d38e8949baf55eaf379cf791bccc2418a8662f586e3f20972f32f582db6573d5d0473d9f48ce99b79894fbf5e96fbfa
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.0.ebuild
index b606eda0eae..17bb7d28047 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.2.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.0.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 5610fc65141..b8045f98730 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,2 @@
-DIST kde-gtk-config-5.4.2.tar.xz 144516 SHA256 1d1c78a6b0aa28fc615d1fbfd0c267cfd5f381d39e810786863bef07bdb54340 SHA512 d2667bd34d6227173bb950383909a7408f9a25882b7766a8897052cae6b3b2fe8d17e5c58a9e8fc0642c1d16aa442cc9cee67744b1c04a3ed57885b10691bef0 WHIRLPOOL 785a7216bcce4c9c227aec18ddb1ce0a050bce4373e55e7cef15dc8170a82a0fd4d2b85deb5fbe36ad1d473728ed89650d473992e0caaa7109eb537722f36b31
 DIST kde-gtk-config-5.4.3.tar.xz 144832 SHA256 2839198cfb470095a550cf574beb7a699fe532f77337d0a700afdccf2bdbee2a SHA512 4cbfcab8b2bb905627b7ec17fa78c5a6ae538aba20a5f83b762aad0837f33fd8cfb89bece94cca7f36bbd93328c5d77c6de02c95111b6fd27792de9891d54117 WHIRLPOOL 8f9f69edaf5a1025e4c5acb783169018030ee2ad8ec7563dfcfdf9368c0e5808faff8cd4c80591ca74016840bb339798774d2547663f458d359bbebca5b6654c
+DIST kde-gtk-config-5.5.0.tar.xz 145896 SHA256 6a8454c6275668c871d6e52fa5367d1dcdb84ace5804e164b15990bd4e6e26ae SHA512 a920d060fc0d94d9ddc7705a26cafa3a3142211f811acde471ca91f47870e27cccc1a1974908f2dbbb9ee8d4d28a1d7ebacb45c3970e37f4fbec1b021cb382ca WHIRLPOOL 302e5f21693b3ff6d09ddfec8f19a63473e80bcd4b54afe1c0a7057ec83ca8990d1d1491ff1d011ee63ac9be334445cc4e4217ab8dae15445f18a3d9d9103fc7
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.0.ebuild
index fc009134e1b..dd38b01901e 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.0.ebuild
@@ -4,13 +4,14 @@
 
 EAPI=5
 
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://projects.kde.org/kde-gtk-config"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="+gtk3"
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 59dbc555cb8..ce822ab36e4 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,2 @@
-DIST kdecoration-5.4.2.tar.xz 33564 SHA256 7d70aee4e709771cb7ec09a5c1316b286c407ac44375078e7d5fd3df0103a050 SHA512 daab62c923f2834531ff4a14b2c04fd27ec92d95120520966c8716389ed7e0cabde2d076dbf439fc4bfd69e8703423fda313991514c80feb1b21a412582c64fd WHIRLPOOL 3347e0664b5332fc137444ca46ceb6f74df4ef9f2a9aa8308adcb28c8622b144712ca575da006698d0fbef4937cbceaa7f1135cb2d6c2c9420bd56dc0cd2608c
 DIST kdecoration-5.4.3.tar.xz 33580 SHA256 38056c388568e65976e8579825f863eccf01e730c159c81f674d3d80ebd522d5 SHA512 b346a370ddcc7ad3bda74c57f30e0eb586333e0a50d432382af1495ab292b2eeb0541e0d0638517c8133a75fd26e4f1e8c8ae731bc995ce6ad3b80a835b6b303 WHIRLPOOL 6926d3afba79a93c3d4473ba66f9b8409d2d347ccd19fd54229c0b3a1376be0419599614dd75068c313162af303b81c88925ce8ee304178872368d3db0ae3f5a
+DIST kdecoration-5.5.0.tar.xz 34700 SHA256 2a276c1423b20afb5e0d785b4208b0c0b7d3bced29d6570b39b3c5dc86b4bcf1 SHA512 7dbf3974830c96756f52dd57e2e82292ad677a89a38d17f0b08bcfacb62de239451befa59b741c3f2beab3d4049f0b5632a2655d0a738961a0ba9519f0a42981 WHIRLPOOL 36b41e640c02103ee5687c251eb746ab4a627b30d4db32ac5445ac51675c1849beb5e14d7c85bd15d3b20d26b37572d4534f85e16cb95dbdc4cfb684f6fdb10a
diff --git a/kde-plasma/kdecoration/kdecoration-5.4.2.ebuild b/kde-plasma/kdecoration/kdecoration-5.5.0.ebuild
index fa967b59b00..774e3727af5 100644
--- a/kde-plasma/kdecoration/kdecoration-5.4.2.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.5.0.ebuild
@@ -4,11 +4,12 @@
 
 EAPI=5
 
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Plugin based library to create window decorations"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:5"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 7bb85d59221..0e4851247d2 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,2 @@
-DIST kdeplasma-addons-5.4.2.tar.xz 2075364 SHA256 d3cdfc957bcdde52729efa9b2f4d44c4981b01461b1494a9086bf85e2023c344 SHA512 f1c4b656246d1e1258ed9574641eb44cbf44098e054377e22944ae4a9914abe27da2123f0009f8200b70f23aa4638a02a0ba80b477b38a1b91224d4dadae1bb8 WHIRLPOOL 57481619de0d88f42258ae6dad0b72073044899d94b4f7f43c2cd8352c5dd5acba0ccae7557e7c031d85b4d7adee836571ff35c633f59335525798afb9b69dfe
 DIST kdeplasma-addons-5.4.3.tar.xz 2076536 SHA256 b7672cfea66f08d1fb8732157caf920788b3c5ace20cbe98e662a60a69e6d873 SHA512 6f499a19ad89c433f18977485730d27a4d553e2fbf8002772797e7ad08648f6b576848083ae53066b6b6c27ff4ab2d4569952b9427f72610e5d94d9cbe1a2c44 WHIRLPOOL b621a6db0c7cdf2c9f78ba050cd59b7ce1e856087eea93c187884d4f470afb71adc2ff514f59bfe593aef25ac9486a95852b91df020424ff034cd0bcfca7c8ea
+DIST kdeplasma-addons-5.5.0.tar.xz 2111268 SHA256 3fd3fdbfb8b11a4552f1d9607234e6c54a3a88120875717f158d88b7ee497cf8 SHA512 67ba7306f0b1e6e04e5a69906e1aff650d2fc502926d599f846c0f45bf8c1d24ca21d8146e03d79f6e7e2e691e7ab7949eebfe80dd32a4a5cd1824e04e68923c WHIRLPOOL 6c030f073c59a8fe2b9c8138f633971341aff4b7178ba666fc3e3eed1f8c8ec9b7035d08add25c2276461105031525854ce9f8c0aa00b839ca3137a6a04e4b72
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.0.ebuild
index e8d2ee77423..f34b6f1ad21 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.2.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.0.ebuild
@@ -8,10 +8,11 @@ inherit kde5
 
 DESCRIPTION="Extra Plasma applets and engines"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="ibus scim"
 
 DEPEND="
+	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -20,6 +21,7 @@ DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
@@ -37,6 +39,7 @@ DEPEND="
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	ibus? (
 		app-i18n/ibus
 		dev-libs/glib:2
@@ -47,7 +50,7 @@ DEPEND="
 	scim? ( app-i18n/scim )
 "
 RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace 'systemmonitor')
+	$(add_plasma_dep plasma-workspace)
 	!kde-base/kdeplasma-addons:4
 "
 
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 208530c7827..33eb3b5ff00 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,2 @@
-DIST kgamma5-5.4.2.tar.xz 60308 SHA256 7e74220e7ef981105eaa869d4e84af5483d7354937e04ebe481fc1dc33a5e60b SHA512 7b5fc9458b881a59608011fc54fdef2e8c3016730c4a2bc7e813e518d109e7c625360520735e2c0e1676e8a4c342fd9732cd9ae832f11f29a4ea2a29be0a3b06 WHIRLPOOL aed85ba00c9f67b76e8e4e9e4560083bf5b552ccdf2060d26d8b62d0e0acee4f6e97bfc36958b3cdd26861aba3a11a587a883d2e8b792a2da54d50e979613a8c
 DIST kgamma5-5.4.3.tar.xz 60308 SHA256 f9a143b29d862097d11ab497b8e672c9d27874e2ed92b971e4a3228e0098cb50 SHA512 9417d434a315c0debdec58ca1691babb002485184b5e02f21510dbdcdc4ef37614b96f69b625839efe6266aeb99ae21008a23734ce0201d1992130a29047881c WHIRLPOOL ce0f68e688a794d2959c1e0d0022f3508ab366198c81b2e5009f7745cf3cdb3bc9157a3cb8b3f565d141670a3e9e42c8c9d6d2f88e8a7be85cb948f01d6c0af4
+DIST kgamma5-5.5.0.tar.xz 60352 SHA256 0e2947636a4a8e1e4bb9b5f38eb557b62e6482b2ccb51c72027f88dc4005ccc4 SHA512 a10d8312559e84428a082ee1fb7492c9310bcdfa703951b7a39646da6c59972c46274c7d206762f0080f6cad3d23c20d91ed99e2d0756f369dd706341fa65623 WHIRLPOOL 55678f95a4885869efc762c9a9d6002a0cfd8860c2dcdea324db07b3e268ee67dd3af4619c121dd8a1a654044b72a3a1fcd952288e29539cab6375d1151ea93e
diff --git a/kde-plasma/kgamma/kgamma-5.4.2.ebuild b/kde-plasma/kgamma/kgamma-5.5.0.ebuild
index 6f8afba83f6..cf403950cc6 100644
--- a/kde-plasma/kgamma/kgamma-5.4.2.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.5.0.ebuild
@@ -9,7 +9,7 @@ KMNAME="${PN}5"
 inherit kde5
 
 DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khelpcenter/Manifest b/kde-plasma/khelpcenter/Manifest
index 443e233bb76..35329720ae6 100644
--- a/kde-plasma/khelpcenter/Manifest
+++ b/kde-plasma/khelpcenter/Manifest
@@ -1,2 +1,2 @@
-DIST khelpcenter-5.4.2.tar.xz 1801664 SHA256 66173f221a02f1a1f3531a0864dbf2927170bdbb0205270721aa5ba84e12456c SHA512 257bee203bec9acc3008f1e4135bfa3b19450d209b1c6e529df32068aba57efddb890db0fc2d4debec76fd189c9d479222b2923c7719a0c10bca419f818a9c5d WHIRLPOOL e896f3f3c895f81e22821fe0c0853f69c850f0c1d224be57f2d4ac59806f59b2d13a63b017da7fa706e8eb7095982507e4af082c8cdd5ddb59e67b9cee33adcc
 DIST khelpcenter-5.4.3.tar.xz 1797076 SHA256 02630934f3fa5c03d384808ef2daef38a49db836fb64d384a95e54865545c64d SHA512 63becef909a2c1631f606418b6d2c435797e8ab02b272372c89d214d9ea943eb286bd9ddf644ad956159844bb0996820aa9501cfaf02e943f8bf1093dd54a223 WHIRLPOOL ed6c484a70ff5be1fe8e57944460d8695316b2911a1bb3514485d5685c66d5c7989a3601820d7c5b06120ace611db853b5efb7608ec6b79dd40866407dab7fce
+DIST khelpcenter-5.5.0.tar.xz 1800740 SHA256 0930f4a75e7f49bd0cd39db0dbfc62f0e05571ff5023d6677546494388d23c5e SHA512 0c31b3fa86952453f5320041e9018242b2427a09c227e344ddccb4942f5bca8a29f418143a1d468b7f0a3a990ac0c51035a8379d90a602d6617aeb3d8ce8e2dd WHIRLPOOL 40a3935e8e4a327af0d5cb6cf4f79deab8e04a1a1fbef1b2bb8a6196ed29abaa8f8c5e97f2a4a400ef6c0c46fcde4f38ea303c2fdf9c93b5eb0b3c5c2601cff4
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.4.2.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.5.0.ebuild
index 55a182fd808..1ef61210e9f 100644
--- a/kde-plasma/khelpcenter/khelpcenter-5.4.2.ebuild
+++ b/kde-plasma/khelpcenter/khelpcenter-5.5.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index fb6786504c3..7867ee1e285 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,2 @@
-DIST khotkeys-5.4.2.tar.xz 607164 SHA256 63ec301a2549a13cf382929d093ebbf673bc50f4cc1067ce15f28fef48ca44c3 SHA512 2be730f01aa2f68cdc8ea04e7f140e6645ec3bf51666b159dffe024ee345f0d7e8203a20d74feb9a2f8619c204e73b16395be70943379889fe7cfd67af2fc83f WHIRLPOOL 9f6d5332da6cedebbe90abcf8f5f1bee97a7571817a1c6139bb0cb1171ec1c727c7f613ba5b456b274f6fb90508c9929d62a8959f647ee802cd0787a7d292e76
 DIST khotkeys-5.4.3.tar.xz 607124 SHA256 495c9ef896a550f076266099ad396f8bf4ee32b94575166acc0329696bd69624 SHA512 9e9bbec5b3e6c9e912b7679a5f8bdc3cd59a913c6af5da9dcfd866aafb3706b0edcc5ab13ccaa5a9bd356db2fc749c38b73128510e618de11f9edbdce47fee22 WHIRLPOOL b8cb7bc155d9bd6cd7f5e8fc2058f2acc580d756e14577d6b279252da24054911be08349f35eb4c1b942aeb0e609d2ed5da5d1ef0271f64d1d54364b569ba6cf
+DIST khotkeys-5.5.0.tar.xz 603560 SHA256 146a1c5ed5052a3ebff4da84f27eabf17667f5a71cb816d12ca6b21cea87eea4 SHA512 f93bdad84f0b34936cfa1db8de64ffd00bd02ef79f7b59a309ac68d9b6a6d1270bf86bceef6b0336cbbf534098245a863954287fd9b11c82f934d4194cdc972c WHIRLPOOL 8fe5f44d7aa6b445ef6d1a0c61255902668f39acb50804879389f823c4a8bee47e8d49496cc7c13882cff5719c180e9f906980d7854bb747d873f9705c394a08
diff --git a/kde-plasma/khotkeys/khotkeys-5.4.2.ebuild b/kde-plasma/khotkeys/khotkeys-5.5.0.ebuild
index e1c0ff8742d..eb9f299d8d4 100644
--- a/kde-plasma/khotkeys/khotkeys-5.4.2.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.5.0.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
 inherit kde5
 
 DESCRIPTION="KDE workspace hotkey module"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 084729ac29b..ce426b1f34a 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,3 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
-DIST kinfocenter-5.4.2.tar.xz 1132136 SHA256 187eb50cd473a64e382d5b3e918219e31ed58043b3db6802e0e1870fb5de2bdd SHA512 10b06ee821fcc182b61f2e8ab55cedc0840fe7cb3fa2e5195ab3676b1e71441e30764acf6a71d537dd61401b71e40a065ec3caa4374aa9f373eada457f73a828 WHIRLPOOL f2561b7ce8aebb46d50994b8c7daff26ac0deabf2115640017112f80e8a312b64f423deec33c94d3dcb9872211d1bb6f52511204aab65364c38a3b9bea1c3207
 DIST kinfocenter-5.4.3.tar.xz 1131908 SHA256 475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec SHA512 9ca50172136607e835be9dc7e9767988b11aa746d9c2236167d36c82858e0c0127f396c0d7a7884a33de025ce3a7f122eadbee0414bc5b4f7f138bea3c2312f9 WHIRLPOOL 419c49cddd263335858e70252809f5771f75ac69f76b0795ca1343195780a49951a6fdf0c42dd2d48e8bfd73b0a1613a6a56d7c335baabfd01f66d0056ba20ec
+DIST kinfocenter-5.5.0.tar.xz 1143256 SHA256 7e2b4446afc53985a21f5b387692a395bf1a17f42fa75e9e77c002f138a229f7 SHA512 8c9ab3a5878cf05fe8b40bb0b5fa3954c6cb9d841764dbe3d0da961d47332b9e28cbf20fbbb8079efea0ad7c05788952c86fd7dfcf475155f5c861ca567eef2c WHIRLPOOL fdf6c0d436eaa20cf414f06c8d338e50ea06348332d0155d1680f4b817d52e2bd35491aff2d35b1f049f25a6d29b46c723a82c20f8fef7f37d0c6261f9c6d1da
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.4.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.5.0.ebuild
index 16df1575c76..bf714cb2419 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.4.2.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.5.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="A utility that provides information about a computer system"
 HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X"
 
 REQUIRED_USE="egl? ( || ( gles opengl ) )"
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 26d98853a2c..39c527570c7 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,2 @@
-DIST kmenuedit-5.4.2.tar.xz 441384 SHA256 65279e8f552a605ec25215caebeeb70e9ecc7d901ca1069bc0019e1085f3624b SHA512 9302b2df1e7f319ec304a84004ac801c0231ab8c6cbf7334ba5971aa22624e802c469789957722fbbf0c24c8a6d1bc5e4d79053bbc1b6a430263959e9e168c80 WHIRLPOOL 578b883ece44d3e1f4fd19a4a11c8f844b8e59aa3ba2e83df3890c29e8cbfefefb15f58a422a6c2c6e178dbdfbe7b4d1a5423683726044d4a805c15da82fdb9b
 DIST kmenuedit-5.4.3.tar.xz 441376 SHA256 36ad27922d8a21a80646d4a9bfa2b93ebc6b1cad6da6dd67799200dec1dbfc7e SHA512 56f0e75b6a2de816bfd822053f4e61c5fb48cd63dc880c44d0d74780cbc694bf548153313fcb4d5c0e89d0e309670cb1bfe4cc051bfb5781c8089710b7a30ece WHIRLPOOL 67462c5cf5d3d00854873381e3c775a7c20fd312ea4464606eeb1331ac530e059239479be5cd46f5d8a02be22b61c24eb29706822e4520eb840b8bd73bee3d85
+DIST kmenuedit-5.5.0.tar.xz 441460 SHA256 96fc1411e0db3abacc585d8a9713969f042f35a996ede575fdc4f07ba17671c1 SHA512 609249e6ae04550b3dfec7f920b593185eb3513196816870aef966b237d36da26ff14136fd83d1bd2380c52267eeac8ea408d8e1a20088368c1498fb92c63b1b WHIRLPOOL bbb637254571cc95885a3a888802a5a49ef7ce47615c5affba6d56216be138ab8ca5f54fd0b8737ab13a00c06a028c3cf8818974188e4b55a26b0db589abdae8
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.4.2.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.5.0.ebuild
index 01c1c782244..76fec6414f4 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.4.2.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.5.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE menu editor"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="+hotkeys"
 
 DEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index a09afb381d9..21f76761eb2 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,2 @@
-DIST kscreen-5.4.2.tar.xz 100064 SHA256 97f216f19f36f96092276e06ae42c8c31d1464d10db88ee34e242e7bb18a3152 SHA512 07c29444b7e14a8b4ababa137b2a241da7d25316f4e6beaf918b84322a7f8c29221a09631f733df3687d8aad6ef3253d9c685108cb193e44fc98ae4091ffce22 WHIRLPOOL 65126b78b5a8751ee054635ac947903112f1333650ee84518a93ad8840d2580523add1dac23dcd4be0dceceebf8adcc948fb4fa0895966cb02b8c88b99437e77
 DIST kscreen-5.4.3.tar.xz 100368 SHA256 b95ba33840e950f2c71a601f6623a9acedce5f3b58e5e1eed395eee230266a05 SHA512 da7a7f49c0688a7c1a4b7cb1651efcad00467393521262f7f8c030d9ad3f91c67a46aacaae9a107a29f2bb2b1d2ca4eab2978be3f80f4c9a8654278fdd9285dd WHIRLPOOL a339c4f2693c054f41350d90b6e3678a567f41ef56132ea995d26b1d439fb4f367c0376a7ef5ec438f318b61d0b327530b667c37977c6031d990b323ecc6249d
+DIST kscreen-5.5.0.tar.xz 103320 SHA256 a6b3074461435b1303b669d6355c1c1a82cff4e15194b3b0dbc5fcb468baf657 SHA512 3c34d2e24dc94ceab5d861607cc8a96365003ad0b66035ff7ed9ffccac53e94224bd0115bac3f462a98a0671e4dbd57472ee78de0023063cf5cf696b90d55c3b WHIRLPOOL 6ab7581ae76132cb6aca729523ff0112b74642a50db45b6924ccdaaab098a91e3c48bd33e7ed11f3db65bc43458f479c9ba8b9dd662f4188e387066504417bc2
diff --git a/kde-plasma/kscreen/kscreen-5.4.2.ebuild b/kde-plasma/kscreen/kscreen-5.5.0.ebuild
index 6e6cb29b63a..b25ff22aa25 100644
--- a/kde-plasma/kscreen/kscreen-5.4.2.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.5.0.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE screen management"
 HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
new file mode 100644
index 00000000000..a85b0242db7
--- /dev/null
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -0,0 +1 @@
+DIST kscreenlocker-5.5.0.tar.xz 97484 SHA256 c90ec7a1ec3b27c557df134a25b358c6a56cb155878bbb0870e912cca61fddd7 SHA512 452c87358638196bfdd8372b7df7b56fa9b036a750a7316528e5963222d93187f124f6ffb2cc4325a3a562eb6e8c190edf4f373c2fe803edab853c4c4027323f WHIRLPOOL ddc8afe7cc172766896e60a6ac5aa3dc7cf99929894d691440fe75e2772c499a2ea07da642b3dbb54cf28004f401a8fea47fe3226835ab456dc803d31f76b447
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.5.0.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.5.0.ebuild
new file mode 100644
index 00000000000..cf4485c3896
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.5.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="pam"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kwayland)
+	dev-libs/wayland
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( virtual/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!<kde-base/kcheckpass-4.11.22-r1:4
+	!kde-base/kdebase-pam:4
+	!<kde-plasma/plasma-workspace-5.4.50
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.90-no-SUID-no-GUID.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	use test || sed -i \
+		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pam)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml
new file mode 100644
index 00000000000..22390bfb18d
--- /dev/null
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+	</use>
+</pkgmetadata>
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 55696f21a8d..f52f32b3d50 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,2 @@
-DIST ksshaskpass-5.4.2.tar.xz 19384 SHA256 2bd7ad5d1f0fc9664a9c2b406d987ff9c77b423f982d837dda7f1d5a7a4baa8e SHA512 b202898b757ed38817cd6be6bb3d77253498b3845d4490408cf6467be2bf4d14438120876974496b743ad1a0b3687884e814cb2fc0c5e12b08020ef0010231f0 WHIRLPOOL 6cfad7aeb9c58bf508ebad91afbfb51279e57d97bde7933a23c08915bdcefbdc41b8222090d7fad5bfa91b131b24203ae32986a3556ed938da95c84bb021d0a7
 DIST ksshaskpass-5.4.3.tar.xz 19476 SHA256 7eb6025e58e8cd57cab640ab42ff9670ae113317534001be94916610135127a3 SHA512 b8378263806014c225a3c7337c1fcf0a513cf508db718e6154304f49841e0d3744b61a58058093e021f4ace8b282842bb7d90ae5a9ad912af222cbaedaac0aad WHIRLPOOL ed0c6a399bc4338b1b17ea2c790f1f9490eb1f2de01aa3b1aa5dcb8a7c919f5b4895e0eea65c76b624d2071436f1a0c60cc1256d0a320a60b8dccd4ea1af1031
+DIST ksshaskpass-5.5.0.tar.xz 20360 SHA256 10c2c4bbfdab8eb340e1a59f9378178b2c76493f512a7ff7dfceeafd3643a88a SHA512 0449d4719d3ce6d686bfd91b96987bda7f5b83ba4653a408002be2f6d7875743693150d8b4ed77c2e26781091795f248d26d9969a8b5b86d6c8e453386239473 WHIRLPOOL 438bcbec379aee04d52caf41fd6f9f8c39470c2c40a68bb9d32efad7628d336336239d61d8b106f3b68e77f2e16da3a3a28c73837a36541441f3731af686938c
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.4.2.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.5.0.ebuild
index 137e1a52ffc..1dd193540c9 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.4.2.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.5.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index c28d66f7597..1caf0bb6d76 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,2 @@
-DIST ksysguard-5.4.2.tar.xz 481252 SHA256 d50dfc6f750404489b3759045ca727859678b65c085382c22907f0214ef9c7b3 SHA512 327302ec30d579be2ffa68e180c3cf6aef2ad3bbb39ae46f6366dbf7dfe61f525f75145d37d174500c9418437ca3d3b46bf729aa12dad486123ce48658b196a8 WHIRLPOOL 2220536117dd25a855e869d83c7d8472e6537e54fb0443fa4b37a8eacf37435d6023102e60e0b511dccc14d085d523ecf82aa6f84e6a962ebab1bca181124fd0
 DIST ksysguard-5.4.3.tar.xz 481208 SHA256 935633f75ad167cbdccfee453be9b65d12015db426576d434fd47fd797daebd1 SHA512 77f4d77c4df5ace23479d3cbe23d1da2d70e26c5530549bc24bc821ef3cadcaab38300b0fe211eb597448e9a453a58fa073b03ef798f6696d1a206800352755c WHIRLPOOL 1e40432a5b17bd9a99c933e5e6bc05055ba249bfc2dcdb3807aa02fe55ec732506b98c60e7d7e07174ea2bc397e1860ac851e4d28e262cf65cf0b4040032dd4d
+DIST ksysguard-5.5.0.tar.xz 481520 SHA256 7b8d1e0d76ac90ff08c31cdff2ffed0235588d65baa052e840d55bc6fc0052dd SHA512 cb72d188c2ead7941cf529ce938e34ef91f818f6a5f9f9ee560777d12b8b7ee91b145560776ef0c16f01fce4e8365410c2d464878f0a873e8f9407cdd47df56d WHIRLPOOL 2dbe052c96fadaa25ff2fe4ee70453cb150625b7b2768db734e613521eabdd85d6e819e823a7eb78a9d0159bc166f8e5f2bf28d244ac8b1b708931fd60e07ccc
diff --git a/kde-plasma/ksysguard/ksysguard-5.4.2.ebuild b/kde-plasma/ksysguard/ksysguard-5.5.0.ebuild
index 29409db6dac..18aaf1f0259 100644
--- a/kde-plasma/ksysguard/ksysguard-5.4.2.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.5.0.ebuild
@@ -9,11 +9,11 @@ inherit kde5
 
 DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="lm_sensors"
 
 DEPEND="
-	$(add_plasma_dep libksysguard processui)
+	$(add_plasma_dep libksysguard)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index b5d66b35ccd..9c312e69b5a 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,2 @@
-DIST kwallet-pam-5.4.2.tar.xz 15544 SHA256 14803fbacd84636a6e0d0e8f37bf8ea847b493653d452bbf633148614ba38969 SHA512 75708e4366bc0e6661258c709b9ff47747ccf6eb7fa399245a96903cb5cbfb7a3be42df6c47b8e557a41913dcc9592d4b3aa0c79a7a800cf8a219ff83f5b08ab WHIRLPOOL d8cbf0ebd2b28fc95db565c60f1a4403a540c2f21e20a74db31a156aaa8c22c93b448513d59026c3ac91af9f7694c6e11dae68237bdb7d60894bd58ec37eabc3
 DIST kwallet-pam-5.4.3.tar.xz 15540 SHA256 a15c1fe1f8b9dc3be2600b93876bbb15cb28cf65a935c066065c516518fabe54 SHA512 2bc79bce836d565aca07e7689d98cd44a20096991e1e57b6d6bf766fa518340421de7d7b47e6c8e8ae749a93af682a4722b6d5b1ce6167cf73248bc4d0795ef3 WHIRLPOOL d0a74950f94f7109ef4cef76726dc3f248795062da712832e69ed620c2df395e938112b9818ad0ff3d337bd68b005c25c08a9e2a53f86ec008a6a85b834fee25
+DIST kwallet-pam-5.5.0.tar.xz 16284 SHA256 0f98472e727cced732c51d3b76505adf941ac5fd5827ba66545e44006af69e20 SHA512 95a2cf4c4217f69deb7955465221153e8d69c6989fa418c97a0ce09dc83f433a6deb727d1dbe55a9d1a67be6b639ac29fa2bd6a10c99466b854837200a31b8d0 WHIRLPOOL 0ba41880168974e046bf3b5f29456606f4242026ab177fbb6ddf8caa8aa5a8272368364b49510620896d78a813d1a2838e11076a5b83b0ca02775d7fd23ee1e2
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.2.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.5.0.ebuild
index 7b8f75ef328..4aeb4a7e424 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.4.2.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.5.0.ebuild
@@ -5,16 +5,25 @@
 EAPI=5
 
 KDE_AUTODEPS="false"
-inherit kde5
+inherit kde5 multilib
 
 DESCRIPTION="KWallet PAM module to not enter password again"
-
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
 	dev-libs/libgcrypt:0=
 	virtual/pam
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 63cdcaf2b17..f09412d2176 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-integration-5.4.2.tar.xz 14008 SHA256 c9c57d48e55cb5eb660d715d63d57337da8abd940288ad6807cee6624cdb1021 SHA512 5d4ab0a6942c91c4b49c7231ce0f8a1da76d1df2c74ab791eac08045e637dd41abeffef299928d4888c9d22d89c11e08326fe244831d6a46fc8da810cd4fbad4 WHIRLPOOL 104a2f667f45538c846d75b96e56b461a66a2de5516218f5d3f76298e9ef60ea2e6a9e673ef6fc6747a41605f84787a374f5703f5db13dda2b0abab4e1a7acea
 DIST kwayland-integration-5.4.3.tar.xz 14004 SHA256 17d76337e10c268823be94bb9c7b1254ea435492e9325641e34f847a76b64c81 SHA512 e8ffa0bbe0338ea5e158b150ac6a04e2ce7ede7e9f14ddebab8694f062e6dc928f6e44772ebc26b03cccc9693a6a8f697bd3653877413ad3b87d1dcdb5aba37d WHIRLPOOL bf147fd651132b8d45d7df8617ee9f6b994c51de078857380653ebd93a493ac9b2642666316ab6c9af3975fbe036a0a7b73830276e67b1960f6f749b5a88cd05
+DIST kwayland-integration-5.5.0.tar.xz 17080 SHA256 c4c209670b7994724a67ab79cf41d44c2e12b49c3a36600de85c7f9b90c75374 SHA512 3149f3e3ff8939d771e1cc9d78533067c8c81e75311cade7fdd7caca16c1eb9c4fdbcd30cd812eb000edb9e126d5f5e7f1745cdf74f6676117f0d691ae5e853e WHIRLPOOL 72155fe9a3d4335a84a2382e6eca817deaca87a138215751781b449b1d051a232d1458d80191dc145444bb4d846e72719432135cb2dfca86b0bcda6ad70dee34
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.4.2.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.5.0.ebuild
index b36baaa978b..1f1422daa52 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.4.2.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.5.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -18,5 +18,6 @@ DEPEND="
 	$(add_frameworks_dep kwindowsystem)
 	$(add_plasma_dep kwayland)
 	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest
index 3ca8b6c1ec6..6b183b7aa6e 100644
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -1,2 +1,2 @@
-DIST kwayland-5.4.2.tar.xz 111632 SHA256 97ebaec8c02923f645a72ffa88a9e4e50c80b2830af0d7bf741d82defef112c1 SHA512 f82078f9b31bbbc89bc5d8c045c27abfaf72362cd918eb71ddf8d076a192c4fc4705e99606c29b9ea1cfc7188745ce52acdefb9094e0cede684cf3888fdfa8c0 WHIRLPOOL bd727d4ee77014d66b9b842e0ea978ccdc2672628a5c6947d2b76f4ea98772413b78cb5f0a871a13c24cf32d9d5efb5916340fa2d52105ce7477ac85fe5fd36a
 DIST kwayland-5.4.3.tar.xz 111608 SHA256 8085ef636c91c83c03eddaac0de7d8e7f56f08884ea8aa72fb63b9b93d7fd208 SHA512 3c247c75ff6d8cc469db0389caaad4b407e0aeac20bb4959689b3b40dc8eeccb03819d2fd2315c3074f9aa447e338ab2850743c2685913386dee7319a6558f72 WHIRLPOOL b55e4d103f671cc6f1d95d048b034d406d6435b8b53b337f976d4f7fdd61ce4dcc5b3787e122ec5ea5959423faf5cbe8ce546bac97c6d66b76c7766355daa8ee
+DIST kwayland-5.5.0.tar.xz 159732 SHA256 494364792100213be6d58d41497fbb20a4eaf9505e0a56dfe0d2a487671faab7 SHA512 0bf6f43c7daf9eb58896df2dd79955e7d3d3662e97360aab9cd5df991bf4dc511b7de1fc3fe014ed860deb6925b4155f4506db5a6b5c8277841fc4c7613fde17 WHIRLPOOL 7b2694a5b659934660399ba492f14c6440a3b58c5a8334118acc70b591c9274d8681df7684c0ff8cdd237297b01c86a3e802c6bc520349df4e12385923618f69
diff --git a/kde-plasma/kwayland/kwayland-5.4.2.ebuild b/kde-plasma/kwayland/kwayland-5.5.0.ebuild
index c030e9d51b6..2a9b634bd97 100644
--- a/kde-plasma/kwayland/kwayland-5.4.2.ebuild
+++ b/kde-plasma/kwayland/kwayland-5.5.0.ebuild
@@ -11,11 +11,11 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	>=dev-libs/wayland-1.3.0
+	>=dev-libs/wayland-1.7.0
 	dev-qt/qtgui:5
 	media-libs/mesa[egl]
 "
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 6aebe4fdfe3..b88a009942a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,2 @@
-DIST kwin-5.4.2.tar.xz 3787848 SHA256 204926490a95a060c66fa0367fc6d44e7d8dd582775d699f1616fc3a0c0d4191 SHA512 41179c95bbaa635479d43f11dcf3199a8c4983aa35b68bcc97ca41f46b7405966bcd4eb5159092f79f2eb227872c73ecbccbec92813385614f53a2639af9517d WHIRLPOOL 6ed4e190c9d7a3850375558eaf4657c8d870d281336ddacc0548a87fa334dfba5cf253cde1f3a7179025de9d8698c89c69bb30245dcdb4147f358a97d648ac63
 DIST kwin-5.4.3.tar.xz 3790076 SHA256 ab4842735dbee91e93f0d0dadb39df4aed234346010caeb3c2fcc230562ac366 SHA512 dcb4c006b06653950f52a9583dcf3a23cceec90fef7e629dde9fff4e683ac406b64425c136a3c9c774e4d2946a4619c263af93b87e803237ec618911c9d32759 WHIRLPOOL 8fdff9ed2204b810549a273a01c2bb39caaec2ec073262516f8cdf9e57c745d0d2d2f45a2a71fa820b26d5672d6558422adfd73575b0b6d2cd1572b68d2485d9
+DIST kwin-5.5.0.tar.xz 3810348 SHA256 34b02f5a1ef50390ed90f550e4d15ed806279072a34e7ded2475f32027a8f338 SHA512 092f513cf35b053a3ed995b6497727671f6099b03e828420a5202679728b025afc5eac60269b780484fc0e03b61fd8acc49a7bf218ae75bde5d5337dcbc9945d WHIRLPOOL e1f1503957f972469064329295074d9e76fd1065f5afca8170ac26e50fad57e2a08d41729979906adb573da505097c9f591f6ac77740c3570618381db40691b3
diff --git a/kde-plasma/kwin/kwin-5.4.2.ebuild b/kde-plasma/kwin/kwin-5.5.0.ebuild
index 83d38362a00..a172baa57ad 100644
--- a/kde-plasma/kwin/kwin-5.4.2.ebuild
+++ b/kde-plasma/kwin/kwin-5.5.0.ebuild
@@ -11,8 +11,8 @@ inherit kde5
 
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="gles2 gstreamer wayland"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="gles2 multimedia"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -27,6 +27,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
 	$(add_frameworks_dep kinit)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
@@ -38,56 +39,50 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep plasma)
 	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwayland)
+	>=dev-libs/libinput-0.10
+	>=dev-libs/wayland-1.2
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5[gles2=,opengl(+)]
 	dev-qt/qtscript:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
+	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,gles2?,wayland]
+	virtual/libudev:=
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
+	x11-libs/libdrm
 	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.4.1
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-keysyms
-	wayland? (
-		$(add_plasma_dep kwayland)
-		dev-qt/qtwayland:5
-		>=dev-libs/libinput-0.10
-		>=dev-libs/wayland-1.2
-		virtual/libudev:=
-		>=x11-libs/libxkbcommon-0.4.1
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
-	gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
+	multimedia? (
+		|| (
+			dev-qt/qtmultimedia:5[gstreamer,qml]
+			dev-qt/qtmultimedia:5[gstreamer010,qml]
+		)
+	)
 	!kde-base/kwin:4
 	!kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
-	media-libs/mesa[egl,gles2?,wayland?]
 	x11-proto/xproto
 	test? (	x11-libs/xcb-util-wm )
 "
 
 src_prepare() {
 	kde5_src_prepare
-
-	use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package wayland Libinput)
-		$(cmake-utils_use_find_package wayland UDev)
-	)
-
-	kde5_src_configure
+	use multimedia || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
 }
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 0921881b6ce..c5a665abb7f 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,2 @@
-DIST kwrited-5.4.2.tar.xz 19468 SHA256 47a330429f9cd6e84cf489ec5f05e6052d7c1dc4892d1d9be04308c891d88842 SHA512 49ad49fb9f08a2ca5b524ed1e8ba9fc3ae54c88114bb97f03c34a4fb19a9e2032eed147f423deb1ce8ed8a8aeec5b306476801d1b3a8e4fc008c48d619b9742d WHIRLPOOL 2abe110bb25be5df711881a870fd79ebdb014603e8eccec7044709efc35add5866e5bb5e9fb0ede864fc620385c431b4a4281d5975823885137489e4fa6c1859
 DIST kwrited-5.4.3.tar.xz 19484 SHA256 d3835c5f17c3209feb9d0abee0d179cdd78881c7c0d1b3fcc05a7ff3f5863647 SHA512 090895091bb9567f578d46880a86c62f9ac7f2b43167ac88ffb1422f0d89fa964a2a96ab237f3ea56f10411121a24f63e163691d5f140a6bf2817bfed335332c WHIRLPOOL 74a868f3d56bde4b9d3635ba3bcb7c314f4414ba922a1aff1dd3f2b564bc583201c74fcfdbd3d6b6dde03ade82e351c04baa91b90d1084d7396845631b547741
+DIST kwrited-5.5.0.tar.xz 19500 SHA256 484b534875ea88637f3b2b6cfad894667a5688eb2c5f7b48728e8dd6419d1fb8 SHA512 34b5a76238778b4b3d019af740d521ed0c45dacfe3cde00c5f603f3a55613fcb5c4cd2cba9547bc72e34cb3076045f804ce32170010c9f2e856f662283634f6f WHIRLPOOL fca396fb92011c2fcc8e01e6646f752759fcac2f836d8942fceea2faeb4a5bd229f76f6e4d3454e1e537f9888d3700a99579a8fc19662f2522a0c907fc4e0703
diff --git a/kde-plasma/kwrited/kwrited-5.4.2.ebuild b/kde-plasma/kwrited/kwrited-5.5.0.ebuild
index 6021b969f99..4df389ee41c 100644
--- a/kde-plasma/kwrited/kwrited-5.4.2.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.5.0.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit kde5
 
 DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 2f6be121f89..db92b7b66f2 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,2 @@
-DIST libkscreen-5.4.2.tar.xz 72248 SHA256 da2311e9cd4aac24f6545372b6084ed7d80b4e1adfd36836999fba7ea4105f5c SHA512 d475d6f1a7022d004f4dc3ccecb4c98c0d6392e46cfafcb2f76c8b1b1cdb9e6b77bcb23d814a038dc0b1eea0f977ebc1799fa2d1a072293daa710c7e00953c25 WHIRLPOOL 19f195464b500701733c912de24835187399f8750f7873922ebc4f42d57aa0943deb1ef8fd376e7bad6438f52cbdcf7b2cdc934283593109b267db1e0531a43e
 DIST libkscreen-5.4.3.tar.xz 72244 SHA256 1d2b17c4e10edc4bd7ce0f220f2b68eb3522c76c2708b0ddc0c2f6bda7794975 SHA512 483b65a55bf84f3ac7915e5e4d2224d71b86dc2a58697219bdc53af21df9cb65c5c950cf550a4b172e464bd7f9d3da93fb7283601d1e6fac8a5c18a4cb7bab90 WHIRLPOOL faca84131edd21d922c18040c2c294531ca16e82e1f516aecd7247be0039b4dfbb758b2f3b3533e769c59dd5bbcb658583418a98921f42515cf483731c78edb6
+DIST libkscreen-5.5.0.tar.xz 71904 SHA256 83f75c47336bf12815960010fb3e44238ef2af3ba76b72ff07a67f8599740370 SHA512 e884211ba5d59a8b3d8cbfe685540eee10aa32e09bec01d43f266d45b932c1596a258d82bbfb24e4de4b653540f06d447770aa470bd84a67117a4aaaf1ba14f9 WHIRLPOOL 7324c3f00a68704fc9d7f81d443d72fcc6346dbf7dd087b02d505670737657c25eb4c2945de9e476dee7013939233c8c602964327df1a32cfa34c7a3f61e3256
diff --git a/kde-plasma/libkscreen/libkscreen-5.4.2.ebuild b/kde-plasma/libkscreen/libkscreen-5.5.0.ebuild
index d76eb9ec7d2..36fedf0ce1b 100644
--- a/kde-plasma/libkscreen/libkscreen-5.4.2.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.5.0.ebuild
@@ -4,13 +4,12 @@
 
 EAPI=5
 
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE screen management library"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 0935834e835..0156873a5d9 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,2 @@
-DIST libksysguard-5.4.2.tar.xz 562104 SHA256 712376c169e7cb04237b77a5efcbdb26ae94ecfc7c8841836b79eaf8914ca90a SHA512 772e63e96fe9ebd12e2d8940db49c3d178f46a877e26bcb53fff03b29de735aceb8d8312c6f635950d92a585665a48bd9c9149a08bd18002a088ffe039bb657d WHIRLPOOL 89493c274fedeaa3b6dbb4fa0826c9327a35ec3ba4585ae023bc8d2163443a2787fb55927475e26a8246309bc081701ad3fece7584efe222272c36d7293a7db4
 DIST libksysguard-5.4.3.tar.xz 561892 SHA256 d1d858b60d83ab6acce176647a35dde98cac483f02ebdce3ca7cfd25e46cd6a1 SHA512 a7ed47c1ae6985ee213103f51a96d09bb93c6ab3693cf6aefb2f88db14c817943d7d1c3e6b3c38495557dc533b5fa7cc9f881a09002d16b7ab3d4d71a88534ef WHIRLPOOL 0390c0ca26795d07f2d6bf2c534c811650075ee3185c8a2327b24b6fe8ae4c763a4d4c84b08beec80a11e5d0f44a08e5981884036acb5ce410ecd366c469adfa
+DIST libksysguard-5.5.0.tar.xz 568012 SHA256 2826e8c2f68a8c28a9100d566ac2aa5eb5b00ece664e1b35711271cb938356dc SHA512 6a18df1d7c59e5634aa03fa6482f20855bb7f5ffacd2991dcc5b2a798135928cdcf3679ce15cc93ad2127b2592d25cd81efb4d0998f1b0e41457f45479025d28 WHIRLPOOL b2462461869a2b817a7620181065bcc55c66f52f9e98578b4e18e829b70c2a61b77ab656ecd719b955e93fbc91d1aed4d4100b77885dbddc8e808ecf456a7f23
diff --git a/kde-plasma/libksysguard/libksysguard-5.4.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.5.0.ebuild
index 3caea63c942..acc41a8de3d 100644
--- a/kde-plasma/libksysguard/libksysguard-5.4.2.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.5.0.ebuild
@@ -10,8 +10,8 @@ inherit kde5
 
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+processui X"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+detailedmemory X"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kauth)
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	sys-libs/zlib
-	processui? ( dev-qt/qtwebkit:5 )
+	detailedmemory? ( dev-qt/qtwebkit:5 )
 	X? (
 		dev-qt/qtx11extras:5
 		x11-libs/libX11
@@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package processui Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
 		$(cmake-utils_use_find_package X X11)
 	)
 
diff --git a/kde-plasma/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index 8946ef73c6b..076395a4937 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="processui">Enables the Interface to view process libs.</flag>
+		<flag name="detailedmemory">Enable display of detailed memory information using <pkg>dev-qt/qtwebkit</pkg>.</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index d6c18395950..f2b7e0985ec 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,2 @@
-DIST milou-5.4.2.tar.xz 51128 SHA256 3f31cab3200c034fdfecd9c63a60b85d856514784e19dc64906fbbb7ae395316 SHA512 d07efa6d921cc91290756b12ff3e7241dae4f671c6a603a3b600692dbe8dcc4efbbe8f095b0d6ab6e9830ffcad57b9adc3039b33cad13057adb8fb96c7d1ed1a WHIRLPOOL f9f3f516548474a1bedc81f54b92a87eb76d3c2eb0934df2db89a4ef60a10b33c8bd696609aae93dc537fe2fcf1f55693db480790794889b5bb1c593560fc8b6
 DIST milou-5.4.3.tar.xz 51492 SHA256 e1487fc818435c25830962e0cab9b78938de4d48c332583ace87681e6080c677 SHA512 cb1f983c9b8f83496ee8348f9dbd3c7fe4ec3c235b1acb21a32dd515cfbf00fcffa45e8ab4516e5a43779e41f23d0dd3a044be16127c65d3cb3a67eb8d662a54 WHIRLPOOL b8e0f23b591e4573836074fcc160972cb11a93ee10c033bd4fc8f33c9d4ce06e5cd9c108c4d00ca273a3a4b76b0a381304dde79cf3f2fe947fe62442a0587e18
+DIST milou-5.5.0.tar.xz 51564 SHA256 d53d33b8baf343a4f4d8ac36f01ed720ac62af620eb53c8f6c262169dc720576 SHA512 cbeaf0043face7678c340fb4eb55f8e82fb5f0b1ed9f6dac3e02774d7507ab948b95f4d6927c6799c1702d6492b40727cdc17983d9d14277d3f5534c7485148d WHIRLPOOL 8abd2dda3b088f1770c2d34034e00a1a0d02aba692dbed93af671683ac36cf3ebf98038f1cc1256dd22b30bf5f8e769abad4e1ee561019fa2fe33dc8e2547c18
diff --git a/kde-plasma/milou/milou-5.4.2.ebuild b/kde-plasma/milou/milou-5.5.0.ebuild
index d2b2feb50fe..71ce2b72712 100644
--- a/kde-plasma/milou/milou-5.4.2.ebuild
+++ b/kde-plasma/milou/milou-5.5.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Dedicated search application built on top of Baloo"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/oxygen-fonts/Manifest b/kde-plasma/oxygen-fonts/Manifest
index 1dd54676c2d..8abfdff756f 100644
--- a/kde-plasma/oxygen-fonts/Manifest
+++ b/kde-plasma/oxygen-fonts/Manifest
@@ -1,2 +1 @@
-DIST oxygen-fonts-5.4.2.tar.xz 161644 SHA256 74ce20431b825c7903a4a11825432c88a1a2537456314c260fca75fbf5a37db7 SHA512 40e3c59ce46e4353f7e3ecea02f406fa1df0e89d9baa9a3d66c17a6c01c247817d554b47b9d2a0d61318c6ef82ea60e25a4cf75bec015f6b7ecf7b5a7a066131 WHIRLPOOL 69b14e0d055a7ac634fdf9d420e1f537fd9f35c5b3bc92c9bc3cee99c213908b912385768f711f0e4f8ca4060401b32b57e01fdd9a70a0a1ea5fc529334bd6d3
 DIST oxygen-fonts-5.4.3.tar.xz 161700 SHA256 a02f6580e9a53cb16694a99adbb6dbf76f17584f3e97f469a22286299507838c SHA512 6dab7b2ef3f7540cd28e91435662f6c43ef9e972fe4ccd1e58ba8904d1b4e8f1ca562384d02df1fc7c5dd5366e9be1ed0a1590a9b9a182621e4bab26ffc3497f WHIRLPOOL 5dbe6fe1e3f33952cf6faae2a762475dc3ac67b46dd2206f99df83c0ffde4a20be698ac793af5d8d7963367e8c934b853b936acc685fe17a11e4c4366c851edf
diff --git a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.2.ebuild b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.2.ebuild
deleted file mode 100644
index fd95230a741..00000000000
--- a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5 font
-
-DESCRIPTION="Desktop/GUI font family for integrated use with the KDE desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts"
-
-LICENSE="OFL-1.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	media-gfx/fontforge
-"
-RDEPEND="!media-fonts/oxygen-fonts"
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	font_src_install
-}
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index efa6d5918e6..3a724120a5e 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,2 @@
-DIST oxygen-5.4.2.tar.xz 4507248 SHA256 66641df409c624bf12d4f40687906ccd80c8f25e834c7da431503fbb0de4223a SHA512 845bce0882ce64b8b57a42f16c3e914eddad52e70d8faa33cb4eac3bb353c1f8931334ab7b10a1def8051382790d6325b92bf02f7182ae2f1630836cb04409f2 WHIRLPOOL f168aaf71b37f4e56cc24f6fddd4644b782fc12db604969ec64eb102f91581f4d57a0cbf0c7cfb5fabbde9fdb18de651a13ccc73941676b0cde8813907c8f219
 DIST oxygen-5.4.3.tar.xz 4508180 SHA256 0510483df7c55afde204c1927bea3ea1f2135761d0615c44f204e127743166ab SHA512 822cd897869afad160439d41f847590314a0d6c3135533384d90880366d8fe098590c9d0edad28f600607ac1c1e6d666127d6ac2b0be05b8683277adbb66c2ea WHIRLPOOL 94d55efdd725f01d8afd47452e60ff63ee980a15cb4a561651e1bfbff9a896d5e77876a213ab2ade081156cf87edc430749376522711453e2d7b91e0ffe81388
+DIST oxygen-5.5.0.tar.xz 4453584 SHA256 fdc44fb86111ca9315d9f286ec2a283ea3376836add7126f7ee0a45696a8808a SHA512 056a06563814c91a03c053b57c89eb498e35d531b30c37a2413c6de3f2b4c0abb2551cd5985373f772334cedb601ca314146d9e863b93602fdfaad78d536610c WHIRLPOOL d8a4399e18a7b68f9c0f8d987466675988bdd64feca6f20f4a73f57b04a42fbc2ded4d749d2d8fd94ec3b7517ce0d2f5c29df20c53a102274e81aeff19f5463f
diff --git a/kde-plasma/oxygen/oxygen-5.4.2.ebuild b/kde-plasma/oxygen/oxygen-5.5.0.ebuild
index 9c3541d5cdb..871ffc45f4d 100644
--- a/kde-plasma/oxygen/oxygen-5.4.2.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.5.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE window manager theme"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 3e72d9bbb4f..c3cdf027ee6 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-desktop-5.4.2.tar.xz 6263608 SHA256 0f83fbabac177c222f1e8d209af8a69e968e3df20961cf46805a0934ab37daa7 SHA512 04a657b00d63d29cc6e684d67e55d643f99c3d7a12e16dd56c1b5f221102ea1ece8cf78d341913038a32456981b5195d92d1b69cc4e521738c6a7e01bd0ea487 WHIRLPOOL 121768040b06eaa53216faeefe8e914c2d0049e6cae571659fbf5930b7180ad674a9f1764711427fefdd95917e60409f57798eca71ed69fbb6df7d964728b45f
 DIST plasma-desktop-5.4.3.tar.xz 6263460 SHA256 2499741ae87166cdd5c2056dcc6a91aed6e65b9778f2c087169f6d666e44c043 SHA512 b3e7c7ae988dbddb16911443e75182f39c830a1128d39fe4dc69a0222b5f6db85df48af8f37efb955c5ed289bbb3a93b2bc2a8fc5270e9b0db889dc83e26e587 WHIRLPOOL 35f621a69c409a79c37605de6c335397cbfcf08d3fb2fa7c37b18f7ef98bb82b051b76a4c723bbfd17e841823c622dc212f2f7520931a42671eb092f113055b5
+DIST plasma-desktop-5.5.0.tar.xz 6294892 SHA256 846fc39cf73cc94344f1ba68a3640e586c513879820787aa06f5c528892453c5 SHA512 2b1b53b7b36b35ff6e63da31f8e10cbb770e8e89a08c34afee76633c767ff743df91bf96437c5077cc06c3ef25a4f2cc62ba58e169f9b0653b095350232348f4 WHIRLPOOL 7cd768a78c5d92276e916ad08780218603f1fbadb3e2f150d0bc7dae98ca621765d46fc4d826ae9fe6dab21022fafe68328c7e410eb82e629aca82fb26aaa1d1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.4.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild
index d4889920029..cdf749a0f5a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.4.2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.5.0.ebuild
@@ -9,7 +9,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
 
 COMMON_DEPEND="
@@ -37,6 +37,7 @@ COMMON_DEPEND="
 	$(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)
diff --git a/kde-plasma/plasma-mediacenter/Manifest b/kde-plasma/plasma-mediacenter/Manifest
index cdd73016e9f..64dcc27d4b9 100644
--- a/kde-plasma/plasma-mediacenter/Manifest
+++ b/kde-plasma/plasma-mediacenter/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-mediacenter-5.4.2.tar.xz 158460 SHA256 2e027f20d584f31b90b829acfe13d6f0af21779165808fa14dae1d971c50235a SHA512 7b6e2dc40b8aae46010bc5cd16771b633535c5e57f9312b2e871960d16c60252aed4897a1bec429bed9c3db35109fd1786c679618aea88750410957d046c3ba5 WHIRLPOOL 7ef21e91b6e36538e4f93249c6107d41083883b6d54ea0aaac19af4295429f271e627d6f1a358b6580244dfc95d2527174a4fe2b88e99ffad23a90d989774d60
 DIST plasma-mediacenter-5.4.3.tar.xz 158840 SHA256 6a13e0cab0f6699d45e75b77556fb5a8fd87c6e42803613863c9e1ee4782054d SHA512 e05291a61548b9c5b30523efc52238e40375f50159d99169520c433589943ba1514489887e20e2ce06f2139aa63ef02e1c89e5170477aeebd32a530ebce7efde WHIRLPOOL 5d16865356e928b9e8aff2b83ac45d3cbe92918371ca53102ac312dcc21003c62f7b0c769f4e46d3df3e77715d37c004efb387c340df281ee6dd722cecb14472
+DIST plasma-mediacenter-5.5.0.tar.xz 160088 SHA256 a2e01a6f1117848959d609e97225689764e7f38d3a0365b8e57bb85c875e5982 SHA512 95118f81a8f16150e9f8d166b816fc630afe055f00892ade6d6b820a764bbf7fafdb9e55468717cc49e7a43ae0587ba00930695b3d0f976da0cc160f862a27b1 WHIRLPOOL 2d21d72044efebc6661aba4d8be57a08fd50f877d5027490ece525fb5a368e6261c5d681d757ef5ccd798e4723d63e5cb707e6ccfd7aa75bcf1911208e965821
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.2.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.0.ebuild
index ba467554eba..86255d8cfb6 100644
--- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.2.ebuild
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.5.0.ebuild
@@ -8,7 +8,7 @@ KDE_PUNT_BOGUS_DEPS="true"
 inherit kde5
 
 DESCRIPTION="Unified media experience for any device capable of running KDE"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="semantic-desktop"
 
 DEPEND="
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.4.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.5.0.ebuild
index 115e4848580..e2375b44950 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.4.2.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="bluetooth +display-manager gtk mediacenter networkmanager pulseaudio +sddm sdk +wallpapers"
 
 RDEPEND="
@@ -25,6 +25,7 @@ RDEPEND="
 	$(add_plasma_dep kinfocenter)
 	$(add_plasma_dep kmenuedit)
 	$(add_plasma_dep kscreen)
+	$(add_plasma_dep kscreenlocker)
 	$(add_plasma_dep ksshaskpass)
 	$(add_plasma_dep ksysguard)
 	$(add_plasma_dep kwallet-pam)
@@ -36,7 +37,6 @@ RDEPEND="
 	$(add_plasma_dep libksysguard)
 	$(add_plasma_dep milou)
 	$(add_plasma_dep oxygen)
-	$(add_plasma_dep oxygen-fonts)
 	$(add_plasma_dep plasma-desktop)
 	$(add_plasma_dep plasma-workspace)
 	$(add_plasma_dep polkit-kde-agent)
@@ -50,7 +50,10 @@ RDEPEND="
 		sddm? ( x11-misc/sddm )
 		!sddm? ( x11-misc/lightdm )
 	)
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
+	gtk? (
+		$(add_plasma_dep breeze-gtk)
+		$(add_plasma_dep kde-gtk-config)
+	)
 	mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
 	networkmanager? ( $(add_plasma_dep plasma-nm) )
 	pulseaudio? ( $(add_plasma_dep plasma-pa) )
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 648543ad5f2..e220e6ccd56 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-nm-5.4.2.tar.xz 547516 SHA256 c868ae9e307895eedcefca399a0976afb9bdaa53c6b7b1de39b19edca53eded2 SHA512 cfcbfcf26a76d321a60323b74939e0a0177016b0f3dca66716d3a056342a050436e7c629a5c1e843391d6789a3ee348e38a6fec1dc324a7ffc86339300afdaab WHIRLPOOL fde1af576df7e9a9962771c556bce99453ad6cdfd468107c294e0a3427030fbafba29e60aa83412b6cf356559d1970d16d830f68ebf2d2cb15d7126080c564cd
 DIST plasma-nm-5.4.3.tar.xz 550868 SHA256 b9500cbd386868da566af58c6ae4b55b2a7ec95d3df3bd2258467c7d2cfc90f2 SHA512 013bf2e217deca5e1f00277f42622b46a7042416e2479b1cfcb1f64b598e29058c14314b65f9427cf9a54963b820d07077fafb21120ea17598b3579e95a6ac12 WHIRLPOOL 866167f470b4e741cb1e64016ddc1f977a08dfba43432e37f217dbe807c7d2e7b07c6e4afbc77b6a141a82235a052fead462f337c649b9388d211db8c2f15c3e
+DIST plasma-nm-5.5.0.tar.xz 605796 SHA256 a4391942d81dcb1a752ef5e7ec6e84b97c6af598dc2e6c9ad02f3c7464ae9fb2 SHA512 0f600c24cbdbe3d6d82656c4efa074ec4363b247c994744917e343ae7f0c28d4929adbc5b4ffbc58cf2baeb5577782e3bf26d146ec340be1fd939c5d4987ec1e WHIRLPOOL dcf576914fa37de2fac1f742d9ef2ff0bb98c4937047d4e7655a1271b5993122ddd9b78bc6c05188169a22fa9900df530fa680c586456a3feca298ecfca2dc93
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.5.0.ebuild
index badcd148ebb..f9cd638c53e 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.4.2.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.5.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
@@ -32,6 +32,7 @@ DEPEND="
 	$(add_frameworks_dep networkmanager-qt 'teamd=')
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
+	>=app-crypt/qca-2.1.0.3-r1:2[qt5]
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
@@ -50,7 +51,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace 'systemmonitor')
+	$(add_plasma_dep plasma-workspace)
 	!kde-misc/plasma-nm
 "
 
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index a6c398e6a0d..1e295f10f18 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-pa-5.4.2.tar.xz 43120 SHA256 91e8c80372ae6374c8f6b6a9b9264cf0788c559de6f155304425be1981b03926 SHA512 1a550fe5a2fd65bb8acf784757d7f58f70b351da48df641d8d49febaeb82958a34adb2da868788c41e2d9da387ddc9eb9e98f8dea86152d3ef9c7b2ec0734334 WHIRLPOOL 9f5388cd6a378795a3b842f0cb87b7b3fc200e68c356bc603b23c7fb5663128cecb13b270911a7566f898ee95a45a2982bf5681cfe13390a764fb314fcfe45f8
 DIST plasma-pa-5.4.3.tar.xz 44312 SHA256 2677af6636e84bfe8256fb23bbc00c0a0dbbeabeed15006604d0667ef75ecd9b SHA512 9a5073d2f661d4454a7bcc10e8f15b3bbceaecf46fb4f51eb94fb4be31b1d387e6c324ee8ff24f4e49000a90345e7315bd4c5c52c24f3c3d19cd3182be16699b WHIRLPOOL aa557495fd5aec275baaee58f921ccc5f0b3cf95931464a8098c3eefd531ec520b1d9bff2dc002d8bd13dd8273fb7b37b1c428947193ec77bd9a0890ab90dba2
+DIST plasma-pa-5.5.0.tar.xz 52080 SHA256 7522ff37433891ba1f999a8e9aedd4362d90f6fdfe514f3fe7bbd96e9cd5207a SHA512 78746a1c47b966c2a8603f62d7c6f67c1a1b415f04620886132429c8b1fa1a4959bbb6789568958d4a749a9f208a7e90500720d37da0c8977418620806142ca0 WHIRLPOOL bfd5d3762530969c37895967d15de6c60ce5b43be21bf8013012b0c367dcf687d5a78e7c3e91b37c0d93de4f14c8d0e7c98628d31aacc50d8482cee84aa059bc
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.4.2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.5.0.ebuild
index af5e1d6c6d3..b5034ac703c 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.4.2.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.5.0.ebuild
@@ -8,7 +8,7 @@ KDE_PUNT_BOGUS_DEPS="true"
 inherit kde5
 
 DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index e009c47c0be..984167ee439 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-sdk-5.4.2.tar.xz 646748 SHA256 a01c5e5272f76b54271aecdb09761ae30c70d8c8aba2881bfbb35502689593e0 SHA512 01220a9b760c758b37eccbcbf5599cabed62a85ea443fb2dccf453f0f1b60df2f27bfa01bcbdcc9dd7ae00d20760638047f68e857c81dbd95f02b74e24ae89d9 WHIRLPOOL 14e43df36f08f4fbe2a9f19ae3ac70cb5452a52f01b986929b680100eb85b65b3b692d366803831eb291e16b5b7f4ec6838edd21efe2f963615880d326416acd
 DIST plasma-sdk-5.4.3.tar.xz 645240 SHA256 68b5f4acf8614a097a45a39b9a589e3a6c2fe13fc1801e7d612e1233c00ba321 SHA512 fa8020ecf67ff2d49957691cecb1de4502914f7783d8e60ffaeba6543f9a7cad3b62804e7d90b20bf3b918c4523bcf017565f74cfd946a09f418b9273f12e0cf WHIRLPOOL 940eec0d9bcc468a96cd26ad556681d7a281e72c11d63f4b2f89182db8190a7e8060692b6e5adac8a3f948f752af151dfc6468bbbb2fa3c7fb024f53d06cf7f1
+DIST plasma-sdk-5.5.0.tar.xz 663212 SHA256 9b14ac59f8a387d4bc33605996c94d54b0d10aed26318180bf48e1f58bb2d4a4 SHA512 78495973caa0a7b85f2e25a8fcc9aa5fa85fea11c609668e7cd851017d1dfe18eeb73202e17215dbee6f9007f07c166d6ee98fee34464a106c3161b47e529a9c WHIRLPOOL 6e67a93f8cd93f37f13164268add3a9db28aeb742cd959afd611628407ce23cda88bc310d080c1cb2466ca75c7b55b1703e0cfab417cf022bb67ae22084146a2
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.4.2.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.5.0.ebuild
index b5b00a2f33d..213c37b559e 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.4.2.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.5.0.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 2131d0d40d4..2ba02083de4 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-wallpapers-5.4.2.tar.xz 56469976 SHA256 5a82417c6904b0f97c50428d0540bd9895fe3332605b2fabbaebb15665d3efa1 SHA512 68646885624ef677559fd538868968e8f84876f022901bf79de6f5a675a9105a8a0c5d571f9b59e51f73fc31a846ab361f32d063497fb14a01c6829bdd8c23c2 WHIRLPOOL 81459191e6fd16a05ba6bae57006c6ac372fd7b85043440fe54add322ae1af0d873cb58d68fd34b6d590a068bf70b11af1dcdc2065899e88be9f7e4d2651ba9e
 DIST plasma-workspace-wallpapers-5.4.3.tar.xz 50572248 SHA256 1de6e524506b00a2948c19175292dd02916e19fa9111c66a9dcefab3444bcb8b SHA512 976167fb283ac5176f189c63cbbdccad2908ef5e9bedbf5364ec7abf83cd2be7e80b6c19429cae65cb1d11946c8d308c55c1d540d19190328de32c5ad8b700df WHIRLPOOL df24a56cb1d8d8765fa2320f80b9f9e23f216116baab95bb2842e5be54f708e9e384a1fb758b012aee5dc4966804a8dc3bebf34e510d77db530cafe9c5070cc7
+DIST plasma-workspace-wallpapers-5.5.0.tar.xz 45917108 SHA256 bf11efae144e3e00623b565aedd5f48e24aba29ec03466d4f5b561e4ff214563 SHA512 21a34425874333c62226122effd75e2d5c15f88334c09f50d090509ded64f25a641c94cc1589ec516e40a346b243c540a426ca01d7ce7d9705701e823948fc29 WHIRLPOOL 9a707845f0088677e3b160b80a4696268d8db338e2c7b328ed2fbc08c4c6a4364c8c71a66accfbcadca02c59dca2282e493a4eec0f57d913d6dc5ae17f2968bb
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.2.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0.ebuild
index 42366be06d2..6e0b9970b87 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.2.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0.ebuild
@@ -9,10 +9,8 @@ KDE_DEBUG="false"
 inherit kde5
 
 DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-"
-RDEPEND=""
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r1[-minimal(-)]"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index a20f7ebe7d1..0f89774ed2d 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,2 @@
-DIST plasma-workspace-5.4.2.tar.xz 6959316 SHA256 36c7b04b30533b9b14440b1286f1130222f2212bfa8f2f033a4ff928a923d22f SHA512 48028fea631a8368386768f0ff1acf7717e0cde04a0861109a629bdfa4ce145a4e8abcfeaf486d5176a42a194f688e1503ae37c91ce7dde44df9b325853a74c2 WHIRLPOOL 0420e1f56b54ac27dcea7e5dbad96850a1b0828dfa3977c076f740cd945bd6c9fa45d0adeec2e09f73159c7932029241598e7c8c45f46a215aabf20e1f747fdf
 DIST plasma-workspace-5.4.3.tar.xz 8648136 SHA256 bfe459234e1bcd8ed5c3a64524061330e92e38ec693099d5007048a483c71d0c SHA512 ac407724bd8aebc9207fbd55a97ceb0eac6c9fcb3129fd2ad19264a120c6e33495c8be5cadcf428d109f163c5159e009f034694b90252a338ec888ca77868941 WHIRLPOOL 86d516b5193ccc83fb552742809b073cd165993fee48c4516d9b4a978ddee0e5be1a930e6dd8ff0b6f64ea9b90eca9c53ce74029d3204e143570913b01cd0394
+DIST plasma-workspace-5.5.0.tar.xz 7382184 SHA256 2338e8b35651c5caf4fe28c99e37e89d56538f8b7c80a367e26af808f4007f04 SHA512 7ed3bd8e0b3d9c2c5c7043afea7fc103f4a8fe80cfb97c0508fc666373379c9060ee2d41523f42ef43ae675f180779f1d6d576822a989c57f0f01892fa7ac435 WHIRLPOOL f7aa77395063bf575c3318cb12fcd5bfc858761db16ebb4f8529e3617cc991cc1f9e14aacf6dbe95bac2794d0303f4e7d8b26aaed17306afdc143c6642dc39d6
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.5.0.ebuild
index 30668c4d33f..2be39ca3fd7 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.0.ebuild
@@ -8,17 +8,13 @@ KDE_HANDBOOK="true"
 KDE_PUNT_BOGUS_DEPS="true"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5 multilib pam
+inherit kde5 multilib qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="dbus +geolocation gps prison qalculate"
 
 COMMON_DEPEND="
-	$(add_plasma_dep kwayland)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
 	$(add_frameworks_dep baloo)
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kauth)
@@ -58,7 +54,11 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kxmlrpcclient)
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
-	dev-libs/wayland
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwayland)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5[widgets]
@@ -70,7 +70,6 @@ COMMON_DEPEND="
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/phonon[qt5]
-	sys-libs/pam
 	sys-libs/zlib
 	x11-libs/libICE
 	x11-libs/libSM
@@ -78,25 +77,20 @@ COMMON_DEPEND="
 	x11-libs/libXau
 	x11-libs/libxcb
 	x11-libs/libXfixes
-	x11-libs/libXi
 	x11-libs/libXrender
-	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
 	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
-	drkonqi? (
-		$(add_frameworks_dep kdewebkit)
-		dev-qt/qtwebkit:5
-	)
 	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
 	gps? ( sci-geosciences/gpsd )
 	prison? ( media-libs/prison:5 )
 	qalculate? ( sci-libs/libqalculate )
-	systemmonitor? (
-		$(add_plasma_dep libksysguard processui)
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
+	$(add_kdeapps_dep kio-extras)
 	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep ksysguard)
 	$(add_plasma_dep milou)
 	dev-qt/qdbus:5
 	dev-qt/qtpaths:5
@@ -107,7 +101,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	x11-apps/xset
 	x11-apps/xsetroot
-	systemmonitor? ( $(add_plasma_dep ksysguard) )
+	!dev-libs/xembed-sni-proxy
 	!kde-base/freespacenotifier:4
 	!kde-base/libtaskmanager:4
 	!kde-base/kcminit:4
@@ -117,16 +111,12 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-base/ksmserver:4
 	!kde-base/ksplash:4
 	!kde-base/plasma-workspace:4
-	!kde-plasma/kio-extras
 "
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.4-consolekit2.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
 
 RESTRICT="test"
 
@@ -136,11 +126,8 @@ src_prepare() {
 
 	kde5_src_prepare
 
-	sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die
-
-	if ! use drkonqi; then
-		comment_add_subdirectory drkonqi
-	fi
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
 
 	if ! use geolocation; then
 		punt_bogus_dep KF5 NetworkManagerQt
@@ -148,16 +135,6 @@ src_prepare() {
 			comment_add_subdirectory geolocation
 		popd > /dev/null || die
 	fi
-
-	if ! use systemmonitor; then
-		comment_add_subdirectory systemmonitor
-		pushd applets > /dev/null || die
-			comment_add_subdirectory systemmonitor
-		popd > /dev/null || die
-		pushd dataengines > /dev/null || die
-			comment_add_subdirectory systemmonitor
-		popd > /dev/null || die
-	fi
 }
 
 src_configure() {
@@ -174,9 +151,6 @@ src_configure() {
 src_install() {
 	kde5_src_install
 
-	newpamd "${FILESDIR}/kde.pam" kde
-	newpamd "${FILESDIR}/kde-np.pam" kde-np
-
 	# startup and shutdown scripts
 	insinto /etc/plasma/startup
 	doins "${FILESDIR}/agent-startup.sh"
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index f2d4fa05c2e..370c4d54e43 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,2 @@
-DIST polkit-kde-agent-1-5.4.2.tar.xz 39496 SHA256 b031c11a7a2219da0128137f59fe392ae8c3f916760490b3991be8eb66071f68 SHA512 af886663d1f91b510f9d3b5802798b40ce4d28aadf6696dee41e7bd0f3b80612aa3d2d585995f011a220bc40c869c5343c4feed9b1112ad5f4075dcaef4d748a WHIRLPOOL 8ec26d6d1791cfa0e27b1c33079db10deed258fb424e7a15d91dc44863a5e52da9235536a3b812d8456880ea241773e0cce73a3d68b8cc3c5ab43ed177956c45
 DIST polkit-kde-agent-1-5.4.3.tar.xz 39560 SHA256 d6a782f95916d2e82bd6de94e5f54f36102d2cf3fca91984d914bb9e5be5098c SHA512 aac51aeb7f87943eb98fd0183779a6dd38ac490e8c2d57591868608ba5e72dcc56e820a546adce794e83a8ac37c62672be103508666fefe4fe8438befc723a42 WHIRLPOOL c9d7859c27cc0b84fdac427be4e3d3c3b2ba7e514fec3a6e1614e97f8ce6b3b6b49c12413d575e52d199230eee5d522733ced26d401a77ebf5b1f69700e2f74d
+DIST polkit-kde-agent-1-5.5.0.tar.xz 39708 SHA256 2c386293d23bd7b6e5f11bfbd2654ebc11c223d2e7f24aae0e5910e9bf401b2a SHA512 6f5b971c16345249c6861d76034123f3d952f3af218ee481a1561f5b6f592c7f7344bb753ba10736eac79897e5ac5bdfc11ad1478163cad38a572c0de79b2695 WHIRLPOOL 984537df8a00ff90dc7496944e1f9cc950a63a37b87c269ac5cb93d9ed7d86e3d584c62a996ddd0e7d31ee697f7a57ef7bf2acb272dc4fb9336836cb3c749752
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.2.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.0.ebuild
index 22b72fa8eb4..4a77936e1bf 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.2.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.5.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="PolKit agent module for KDE"
 HOMEPAGE="https://www.kde.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 249cb974ce3..6ece0c24544 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,2 @@
-DIST powerdevil-5.4.2.tar.xz 346520 SHA256 5caabfe1672fb0d1838eac2b06199465d8bf665c669a0f17d5c6cbed17a81a07 SHA512 5c3141462b320830da01952405d4906b2c2e7aa46c5612d83dd193318a4d4eea599b638b9fc90be58a9e0c4efbf0039431d5b7d05ad00b1150660ed36836483a WHIRLPOOL 2661c8a14a1b5a9aa6aac8b2fd747f135b6d9b9ee27097c53321fc36ce683261e08618e0eab8cb0ec5686275532ae4b634a345c6b6f0347d180a912f3d11bb0e
 DIST powerdevil-5.4.3.tar.xz 346732 SHA256 4085e4c3c7429c72502a0b4e204753e5087df88bbac5ac1f531806a2d8eb40c8 SHA512 458731d78fc7fcfe80ef77badc63ebcb76dfc5870addcbd0a588e93f799f416a7c2f9888a0785759122455e40b8e76bfdc75fa6e4655166b01b19611a9f1871c WHIRLPOOL 725864cfe2e954747668a54b4d79c538b5e0c8cf1c462cd660b049ac89aa3d418264809b2faf743ecef8ddc1804859b49b1048ac65340a2572776d44a10298a6
+DIST powerdevil-5.5.0.tar.xz 345484 SHA256 8ef0f17ca326b839c60cbb59d71b9c8cb94d9c040e94a620291477053ff3ea0d SHA512 f8947d592c9017bb9c5da28de8d203df6a5fcfece437905641862270cd207277aedb7663464be9c87d7e2d075f20daeb522531ce96dae708d772e5e252320bc3 WHIRLPOOL 0ed8ee1274333e0c2f62fcf8eafa9416ce08d0140fd54b5df7ae430177feec4e5e94f3344b7784334188865143ceb09a99984d5f4e39bd0c0bd0161a33180099
diff --git a/kde-plasma/powerdevil/powerdevil-5.4.2.ebuild b/kde-plasma/powerdevil/powerdevil-5.5.0.ebuild
index 615361ea11b..f7a911a6889 100644
--- a/kde-plasma/powerdevil/powerdevil-5.4.2.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.5.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Power management for KDE Plasma Shell"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="systemd"
 
 DEPEND="
@@ -31,6 +31,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
+	$(add_plasma_dep kwayland)
 	$(add_plasma_dep libkscreen)
 	$(add_plasma_dep plasma-workspace)
 	dev-qt/qtdbus:5
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 5d4f8827610..e63e70cfdbb 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,2 @@
-DIST sddm-kcm-5.4.2.tar.xz 47496 SHA256 12e80c564b9a951c3f65ccec6174737973de5a6ada4572afcb7338efe915c674 SHA512 5a95626fc7bc4e0f831a0c191441f7389866cf3af9bbddc433301cfb18d8dc4349461f57651173fc0178fae604da32d893c7e96013898106e4a457ce0b155298 WHIRLPOOL 42510257c1b3b2542067c7a04c66cf87503185c98aa7a922ac105264b0ffe3f027b0c65c019fcf67cb5bc4971b2c3832939fe5e6f7ca61e99734d4b6b5ca1cd8
 DIST sddm-kcm-5.4.3.tar.xz 47700 SHA256 d32cf16e254f216f3477460229d5500fd63944630d073c4eec5cde400af5f9de SHA512 10ce1ce02897a50cc4e465e13a11e9ea12cd267bff92330660e99b7771026bb7ed3c5386cabc83b98549d7346e6060b76d08c3d5f0715300f83908d7c0321ea4 WHIRLPOOL fcf958ad26d9aca77deba14d091c9b2522aa37f8daa9890a16aaf66bf251fb1c0fce8ca795fae6502b885f61dd1d59a219f9111d399231b8bb5133a87c70d39b
+DIST sddm-kcm-5.5.0.tar.xz 47820 SHA256 605ae336798642dc267cf09d4ea96bfe9e7630fde6d8821f0ff2f7353e897df3 SHA512 11d51f7d6406fede787f9c646ce8862c6aa2f514287a5d37bbef73807054f407db73dabb05ee35339e06b334851c045c951a958f0350db22772e947370d0a9fa WHIRLPOOL a683376ddb3ca78653330bc78277312a7d3e0142e99afb98a7aed4354c5fdf3dc892894dac96b9bc3e7f14e1ef34060160ebd8f228d6bc308a8bb6484cea8488
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.4.2.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.5.0.ebuild
index 98794a3d43e..bea72c30ca4 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.4.2.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.5.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE control module for SDDM"
 HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index a167808523a..314b4888c9b 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,2 @@
-DIST systemsettings-5.4.2.tar.xz 157268 SHA256 7a31b58523fe6d9094644026bdd7eca279021b3887949e52f0131fade6580733 SHA512 5956c9ca402e7aeec2638301e334163c8380ac19c7e96f0dbd715782ffc9820df9aa5f33a4a1cb4b2102446e08c7ac7e85cc9a473c1d4d25298dbcf034b4fe58 WHIRLPOOL bcf3e90f2676035252843192a11ea0b2b76cbfd7f532ed02e73ab9128515b14a1b72c5879884c868fc9f0e8008411c752df2d6bfeb1f69a53c76d53560a32789
 DIST systemsettings-5.4.3.tar.xz 157308 SHA256 6b8716d12eda9f27a4c26a96ea8d034d3bfff501e93ddc4e4057d3ee7229e412 SHA512 1d9e8595331c8ca366bebd7f68391b4d0c8e94f903986ca12ea32ce8620548ea7b030c52abc4d0b530eea1de82caa5da00aa80e00f637acf3c22c24b4db1087b WHIRLPOOL 5655758dab4f0b4e41e49323bfd24746d4680e6790f15b185761d5f17a71de8714a7e732ff1364bcf828556d1604a8e5dfb8e5b461abacafc73aef31a588c53c
+DIST systemsettings-5.5.0.tar.xz 157632 SHA256 21776796c35c7fea2ee899f4b7c81ff1d903eae04a23813da4e29220f047f8ab SHA512 b8bfe50181705aaadba3614671790aca4bf56b913defe374733fa1fed36a928a0d2f399770200347310b44114b8b9fac8f1ced652288fc7c6baa3e76a33c540d WHIRLPOOL 71ab27ee206fc251df41dbbf216bd6608fb83c9ebb879a6389110640bdbd9d078bdc8a9f5ef60262bcda6b03a645937b2e31678bde19d3d53a3a66b72ce0a5d8
diff --git a/kde-plasma/systemsettings/systemsettings-5.4.2.ebuild b/kde-plasma/systemsettings/systemsettings-5.5.0.ebuild
index ea615d75aa2..a216c26f48a 100644
--- a/kde-plasma/systemsettings/systemsettings-5.4.2.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.5.0.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
 inherit kde5
 
 DESCRIPTION="System settings utility"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index c7506eb16a2..b23a52d6cde 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,2 +1,2 @@
-DIST user-manager-5.4.2.tar.xz 55084 SHA256 f5d34359134eb0687a5ec60d8888246242e7d3fccbb78a90231239ea7c297dc6 SHA512 28bd727474e0b96cfda4ca3c8d79dd777d100ed4f0aa590686b4acf6dc0ff59ec9932090da6cffb23c4e90b0085bee6004f403456defcd156a49fff70d41eb04 WHIRLPOOL 48c68273b93008426dff43ccc5d63fc09ffa57df64a06757e7ca6bac2f7f890467267eb81502c6d466b3443ef6a544656d311e2f574d3ed48db1698a7878d3cd
 DIST user-manager-5.4.3.tar.xz 55356 SHA256 4831b9c82b826ba5fd1f392a40f2ebc15fd04e4ee02c9d1d205a3e877081ce6e SHA512 3d364a6c5502e4f038336a3f4c37109c2ca66177293c84afe899a5c76fdef6b83bc039db77746568dccc0eb5c0de8bd38c56dae7628fa6b28dcbe68450159603 WHIRLPOOL 912f02b9b04ebab67974c757bd9fa88caa8d693ea17b2be101cfac5c0115e9ab54ccd5e08031c4afb938189e0a79f1d33c9ccf014da7bada42882fc91367fcf9
+DIST user-manager-5.5.0.tar.xz 57208 SHA256 491cbd4d9d611a101b808226269a503c11093101eb939f04d211e1eb784e6423 SHA512 e83fc215ed3541306224f62430cf054ef619268e2a981126469bd6a2aaf45b04fd4d5f586ffd6a199e1f6db81c85e6d79d2f87060088e22a9d7ea72a45a60034 WHIRLPOOL e69116f9a76f748765b941396ea224f717b524c45e30fa48a1f9db113b16150fd37fcb276bb38249aa57c2b6d93e09ea560f3b1db3ec71e5b20023e330450558
diff --git a/kde-plasma/user-manager/user-manager-5.4.2.ebuild b/kde-plasma/user-manager/user-manager-5.5.0.ebuild
index 4c3aabd8cac..0f43764f3bd 100644
--- a/kde-plasma/user-manager/user-manager-5.4.2.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.5.0.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit kde5
 
 DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=" ~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
index bf166b4541c..7f1005f53c3 100644
--- a/net-irc/bip/Manifest
+++ b/net-irc/bip/Manifest
@@ -1 +1,2 @@
 DIST bip-0.8.8.tar.gz 220232 SHA256 7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7 SHA512 acd62a61379290088320567b299b9d2e236c24aea7c83c4bfb7dedba9727868fb931d7e2eb663c9041794c26583bcc923072049cb42eef0d13702f284bae2b34 WHIRLPOOL b2e5f7a1328832fce7b3c7eb706ec87e7eb023043e714dbc554126730d2e9dc37af2d127e15ef024fff1e95b9dd22351cd48b3b115b58b9fd9ecbdd92f20cda1
+DIST bip-0.8.9.tar.gz 256711 SHA256 3c950f71ef91c8b686e6835f9b722aa7ccb88d3da4ec1af19617354fd3132461 SHA512 572adb6e0982d74a39b0380ef6af51ba7f55b880f78e110b93e09616e6345bb4a9a60475df644ec891cae368287d502ba00bbf734370ba50c57b29de6934c138 WHIRLPOOL ffad5a0a525a09e6d31537dd4238353ac820a874f18a9590f039419e9d2b7aff4f92a1882f02db450e9e88957adbc4bc4eb993fbff01f7327bcdd02d0b1b6e6d
diff --git a/net-irc/bip/bip-0.8.9.ebuild b/net-irc/bip/bip-0.8.9.ebuild
new file mode 100644
index 00000000000..bfa178e41d5
--- /dev/null
+++ b/net-irc/bip/bip-0.8.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils
+
+DESCRIPTION="Multiuser IRC proxy with SSL support"
+HOMEPAGE="http://bip.milkypond.org/"
+SRC_URI="ftp://ftp.duckcorp.org/bip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug freenode noctcp oidentd vim-syntax"
+
+COMMON_DEPEND="
+	dev-libs/openssl:0
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND="${COMMON_DEPEND}
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	oidentd? ( >=net-misc/oidentd-2.0 )
+"
+
+src_prepare() {
+	if use noctcp; then
+		sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
+	fi
+
+	if use freenode; then
+		epatch "${FILESDIR}/${PN}-freenode.patch" || die
+	fi
+
+	sed -i -e "s/-Werror//" Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable oidentd)
+}
+
+src_install() {
+	dobin src/bip src/bipmkpw
+
+	dodoc AUTHORS ChangeLog README NEWS TODO
+	newdoc samples/bip.conf bip.conf.sample
+	doman bip.1 bip.conf.5 bipmkpw.1
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins samples/bip.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/bip.vim
+	fi
+}
+
+pkg_postinst() {
+	elog 'The default configuration file is "~/.bip/bip.conf"'
+	elog "You can find a sample configuration file in"
+	elog "/usr/share/doc/${PF}/bip.conf.sample"
+}
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 9fef697f97f..6f175d76580 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,5 +1,8 @@
+DIST kicad-4.0.0-i18n.tar.gz 2269856 SHA256 cfd0814a553c117de5a2caba7e366bb501de5d5e408d22b05efd5c66946cc3f0 SHA512 51844fa140b93ed65c4699b79e24a846a546c3d395397893838ba067d82ac9a40dc57c5960cfc935396d6e1b3cd1db3899bcfe203d32bd10422f81eaee6bebae WHIRLPOOL cbbc6e5f8ecb6d6246a320d6cef27bec12171e53ce3baa768c2b2d118e0a4640348bf7b0da96694d0a4c02c6a23e01f9abe68fde66e586a99d1fb58812de061c
+DIST kicad-4.0.0-library.tar.gz 105069103 SHA256 e1f9770e624256e6760a2fa9dc57f3f52fd42589d50fe0225fe14565cf44ecc7 SHA512 1cdf7d90a97a0303330896e8c92346766a2192f78361a48c25bf3ee126a9b43bfd8da39c465c62193bead378f7a8540083cb5113f18119f8268858c91fcd00b1 WHIRLPOOL 732c925ba4878c9173d64cd3f62c274945901c563e65a7ee04f3660a7a85acfbc92af7717a5fde9ada828c8bf7c84b24aa4200c13b3e46434b81ebd10e3814ac
 DIST kicad-4.0.0-rc1.tar.xz 10951000 SHA256 62c2e95a2d6b8a3cf30bb91146c3d2b1c0df0cbfc070b6e54bcfdf0da2df6973 SHA512 f158906b85e3c4032086c4a75563d47f75f183bc354e1f2fa55e157083005b51829c141e14171dea9092b9b24b6b5ff1c71e3ae485dd1d2d44fe7e63179c1ffa WHIRLPOOL 755fde28cf45196bb60ffb6af7bc0acb92148310ad74807ef71404c418557bc2c6243f41e9040c0217dc970061df09a4092e2a5e52e016888660e4998153c95a
 DIST kicad-4.0.0-rc2.tar.xz 10749964 SHA256 c2312441ddea82a3cf93a32828871a96311df59498ea16e23422e4104b3d794a SHA512 9fddc075871d3fc1ee6d6be1fd0f74246e5c5f6b782155493774541d8d6a9f18776454dd45a5673971e7c3faf673dd0bc720fcc42248673959917afaa9901b3e WHIRLPOOL d58f89c6167fa3bf39887ef02e27e391e638c5c56282b5dba1abb7bf7cf9fb23926c8b720cffaadb6d06d9ee6f112780db0bf678d33ddddd4aa59d3877529c3f
+DIST kicad-4.0.0.tar.xz 10840448 SHA256 fdc1368dbbe3f5e7981741e4870883ce3cd89c6081077828411ef044b5e93862 SHA512 db929a7c90af406e4a550b4f5e2333c44f0b8ac06219a5f476d46d10c6e284e117e652d6a1df864a909945ba0469447a7a82ba8ca72809f165c7cd1ae655c86a WHIRLPOOL 248cc15e1325db833a50cc456bf80254e7074ae46eadb43553f80c54bc154491b9d5fade07e9a27dfaf08ee5af84d29097690a453e9c2bb1b1eaeb644c072054
 DIST kicad-4.0.0_rc1-i18n.tar.gz 1959024 SHA256 5fbd037e4a76a83ed6be7554ab1add98f7d93dce0db5fea6a0bcd58ef61486bd SHA512 85c2db5d193cd4d1521eb9f454a13892680cb5340c3b86b264bceb36ce0c996f818b64c3edd9dae3ff51046c97ba33702649a1083a36f27a80d316f64465f630 WHIRLPOOL 8141fb59822fdda2bf46a9b8af7fe75d6557a1c3f384e5e2b03e58c5e4c9eca4f167a262f2ed9fd3479c64a8730ff1ba3f46f6cb72c680df9c6d6173ca611ada
 DIST kicad-4.0.0_rc1-library.tar.gz 87967616 SHA256 09a9e184e19b6072efdc00fabb65e3c0d498858c17f5fa5ce8d255b21eab3db4 SHA512 f611015a8760d3c9cf26fd99a043d69fa75d398fb287af7e6fe7cfbd70d3ff1aa67abcedeffa00fef60434e3944ac6b59fa4ac9ea50097d910fbabcb6f288165 WHIRLPOOL 83585bbc772da122139dfa643c4045bfef207ea8dbc4a83a5458be6227ff976fe9c48cea2388f9ec0b20e7c697579701b75231b852161b33a9c51ddef480c6f4
 DIST kicad-4.0.0_rc2-i18n.tar.gz 2230967 SHA256 1c0db5a10f81855b4270aff3add5914aebda86c6d492d64968a853bb71ba0126 SHA512 2877a5045183bf81544912a843ad4493c4ede998c71087d56ec68f0cb618427b9589fcdbf26ed0412eceec4dee5fa7ea7cf278f211f5e1eea39620283dd8a747 WHIRLPOOL d37d058a1de14668144d734a4079043dff39a593d24039c806da890d34df6064d33e308f21fee815b39ee7e6fca41afa810f76b859e0bd4ec17783bfb8ee81d2
diff --git a/sci-electronics/kicad/kicad-4.0.0.ebuild b/sci-electronics/kicad/kicad-4.0.0.ebuild
new file mode 100644
index 00000000000..c414a5283c2
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.0.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils fdo-mime flag-o-matic gnome2-utils python-single-r1 vcs-snapshot wxwidgets versionator
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+
+SERIES=$(get_version_component_range 1-2)
+
+SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
+	!minimal? ( https://github.com/KiCad/${PN}-library/archive/${PV}.tar.gz -> ${P}-library.tar.gz )
+	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples github i18n minimal python webkit"
+LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh_CN"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+unset lang
+
+REQUIRED_USE="
+	github? ( webkit )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
+	python? (
+		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	>=dev-libs/boost-1.56[context,nls,threads,python?]
+	github? ( dev-libs/openssl:0 )
+	media-libs/glew
+	media-libs/freeglut
+	media-libs/mesa
+	sys-libs/zlib
+	x11-libs/cairo"
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	doc? ( app-doc/doxygen )
+	i18n? ( >=sys-devel/gettext-0.18 )
+	python? ( dev-lang/swig:0 )
+	app-text/dos2unix"
+RDEPEND="${CDEPEND}
+	sci-electronics/electronics-menu"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# remove all the non unix file endings
+	find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix
+	assert "dos2unix failed"
+
+	# Handle optional minimal install.
+	if use minimal; then
+		# remove tempaltes as they are not needed to run binaries
+		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die "sed failed"
+	else
+		# create a link to the parts library in the main project folder
+		ln -s "${WORKDIR}/${P}-library" "${S}/${PN}-library" || die "ln failed"
+		# add the libraries directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die "sed failed"
+		# remove duplicate uninstall directions for the library module
+		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add internationalization for the GUI
+	if use i18n; then
+		# create a link to the translations library in the main project folder
+		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die "ln failed"
+		# Remove unused languages. Project generates only languages specified in the
+		# file in LINGUAS in the subproject folder. By default all languages are added
+		# so we sed out the unused ones based on the user linguas_* settings.
+		local lang
+		for lang in ${LANGS}; do
+			if ! use linguas_${lang}; then
+				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die "sed failed"
+			fi
+		done
+		# cmakelists does not respect our build dir variables, so make it point to the right location
+		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+		# we also make from the master project so the source dir is understood incorretly, replace that too 
+		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+		# add the translations directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die "sed failed"
+		# remove duplicate uninstall directions for the translation module
+		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Install examples in the right place if requested
+	if use examples; then
+		# install demos into the examples folder too
+		sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die "sed failed"
+	else
+		# remove additional demos/examples as its not strictly required to run the binaries 
+		sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add important missing doc files
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	local mycmakeargs=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DKICAD_DOCS="/usr/share/doc/${PF}"
+		-DKICAD_HELP="/usr/share/doc/${PF}/help"
+		-DwxUSE_UNICODE=ON
+		-DKICAD_SKIP_BOOST=ON
+		$(cmake-utils_use github BUILD_GITHUB_PLUGIN)
+		$(cmake-utils_use python KICAD_SCRIPTING)
+		$(cmake-utils_use python KICAD_SCRIPTING_MODULES)
+		$(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)
+		$(cmake-utils_use webkit KICAD_USE_WEBKIT)
+		$(usex i18n "-DKICAD_I18N_UNIX_STRICT_PATH=1" "")
+	)
+	if use debug; then
+		append-cxxflags "-DDEBUG"
+		append-cflags "-DDEBUG"
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die "cd failed"
+		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
+	fi
+	elog ""
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+	elog "For help and extended documentation emerge app-doc/kicad-doc."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sys-boot/grub/grub-2.02_beta2-r3.ebuild b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
index a43dd0b29e5..63fe13a0b2d 100644
--- a/sys-boot/grub/grub-2.02_beta2-r3.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
@@ -87,7 +87,7 @@ DEPEND="${RDEPEND}
 	grub_platforms_qemu? ( media-libs/freetype:2 )
 	grub_platforms_ieee1275? ( media-libs/freetype:2 )
 	grub_platforms_loongson? ( media-libs/freetype:2 )
-	grub_platforms_xen? ( app-emulation/xen-tools )
+	grub_platforms_xen? ( app-emulation/xen-tools:= )
 	static? (
 		app-arch/xz-utils[static-libs(+)]
 		truetype? (
diff --git a/sys-boot/grub/grub-2.02_beta2-r6.ebuild b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
index 57daa39c312..6ff525d1693 100644
--- a/sys-boot/grub/grub-2.02_beta2-r6.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
@@ -87,7 +87,7 @@ DEPEND="${RDEPEND}
 	grub_platforms_qemu? ( media-libs/freetype:2 )
 	grub_platforms_ieee1275? ( media-libs/freetype:2 )
 	grub_platforms_loongson? ( media-libs/freetype:2 )
-	grub_platforms_xen? ( app-emulation/xen-tools )
+	grub_platforms_xen? ( app-emulation/xen-tools:= )
 	static? (
 		app-arch/xz-utils[static-libs(+)]
 		truetype? (
diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
index ed6aa18a417..7c320db8459 100644
--- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
 	sys-apps/help2man
 	sys-apps/texinfo
 	fonts? ( media-libs/freetype:2 )
-	grub_platforms_xen? ( app-emulation/xen-tools )
+	grub_platforms_xen? ( app-emulation/xen-tools:= )
 	static? (
 		app-arch/xz-utils[static-libs(+)]
 		truetype? (
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 628843d0bef..78178578385 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -82,7 +82,7 @@ DEPEND="${RDEPEND}
 	sys-apps/help2man
 	sys-apps/texinfo
 	fonts? ( media-libs/freetype:2 )
-	grub_platforms_xen? ( app-emulation/xen-tools )
+	grub_platforms_xen? ( app-emulation/xen-tools:= )
 	static? (
 		app-arch/xz-utils[static-libs(+)]
 		truetype? (