Sync with portage [Wed Dec 9 09:00:38 MSK 2015].

9 years ago · 8225f03681
parent f668a39678
commit 8225f03681
557 changed files with 2458 additions and 1624 deletions
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@ -1,3 +1,3 @@
 DIST keepassx-0.4.3.tar.gz 1368766 SHA256 cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 SHA512 8ce1bc252694e11a8b0da94bb00a4e5ca2837fe099f2f992aa9a93bacc4d94f33970cec687bd73a7a7762e86220a0541fe85a6708a2d4ad1bb3aef5f19935ccc WHIRLPOOL e2f54832eeb8eb3c7b7874e2deb97843a9ef1a92f027ec540fd197cf850d313be5d8959595e122b24a286973747d3b71bd33537de601b31ba3d45a16a095747b
-DIST keepassx-2.0_alpha6.tar.gz 1366929 SHA256 592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0 SHA512 76cf2e9617217b4f38ecd0027a88768c5a06c51e796f32e4939ba3a4506583ce6793c107293ee87c0ff1d18eaf6030096cab4da644cf0bef35ff09d5a46cd5ca WHIRLPOOL 37283e66bb285656ff2992552ce6e745603f27685a8a2e87fec42e391b484b2bf1697da011ec0ef86ff1ba5053abd803f38ad8ba77f0d295d901bd5ecf38d1e3
+DIST keepassx-2.0.tar.gz 1524638 SHA256 0eb40fac3a44d8283dfc1ee28cc6de5c660b22ab975472de82c2b04675c822e6 SHA512 6c8b8ee6a22cab5da5f262b281ed914e9cce99607312124b068a3386d9da560a3584acea4ce1be6700e40087febcc269273ab67ea472b99e6d3f75048d164788 WHIRLPOOL d325c491687b70e256f9312548451250dadfdda0c659b9b16a6fd8e0d39bdf5ced905e11646730619cf217e3afe3ad885428bf4cff3204dcf68bdd33510cb467
 DIST keepassx-2.0_beta2.tar.gz 1479599 SHA256 5828261226c441856bd12e2f4f73af1a5fc3b1981b2cff40fbc2403e344f4e52 SHA512 e63431a55536fccc8dd4e441863081f533cac6608ce393ad4d641fc57fce815232aff1fdf777374464b3ad6bedb16392d578ff39bf9230d4cb0cd62b11869a5f WHIRLPOOL 69e1de023b5090640747b332642559ea0d0fdbe04bffdf4805475f29eb100c2e8d2744c3b9222c3c63a938e33e470ad9b5a6812d09c249eb09af7006728c7866
--- a/app-admin/keepassx/keepassx-2.0_alpha6.ebuild
+++ b/app-admin/keepassx/keepassx-2.0_alpha6.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -18,7 +18,6 @@ IUSE="test"
 DEPEND="
 	dev-libs/libgcrypt:0=
 	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
 	dev-qt/qttest:4
 	sys-libs/zlib
--- 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
--- a/app-arch/arj/arj-3.10.22-r5.ebuild
+++ 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
+}
--- 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
--- 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>
--- a/app-arch/rar/rar-4.2.0.ebuild
+++ b/app-arch/rar/rar-4.2.0.ebuild
@ -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
-}
--- a/app-arch/rar/rar-5.3.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? (
--- 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:*
 "
--- 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:*
 "
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@ -1 +1,2 @@
 DIST hstr-1.17.tar.gz 37289 SHA256 9e4b6e74bb7852945e25727105c5339c49c9ce1218481845c8d0205514d85e70 SHA512 eb89496c8554eb29ebb30430aa01179f7265a8ec15b0b9452f7e3ac4867ae4349e6141e11f0af01a4d15ba06131c18ec9ab760c8e68100fa2b8f2a793b237f9b WHIRLPOOL 2b33f485525b2cb033a82b249976d7c670d8f02948e84e73f350b19bdc955e551014f14ad4cfc845144ff0e0d8c3690c50b4444a414c7909f0106242d13a9cc2
+DIST hstr-1.18.tar.gz 43672 SHA256 85eb071938c2e7314e5fbd245a81c7b0cd93a8864bf9cba5b5041acb5052ba73 SHA512 e0684a694a514a341c30bfa7fc596f858658f3be9db6c490f628b4c48d1bf08acd8b4b03361ceb6aef65d42a5b01a1c0a8ce94698b5f7f5193ef030d7dc896c4 WHIRLPOOL 1bd00be28623ea8e05c1cec3d95451b7f92e6b17bfb5bd2853560955fc5ace9226edefdee820e9cee6c3542180f699b56371b9766a65a8efc669987dd5e961fb
--- a/app-shells/hstr/files/hstr-1.18-tinfo.patch
+++ b/app-shells/hstr/files/hstr-1.18-tinfo.patch
@ -0,0 +1,47 @@
+diff --git a/configure.ac b/configure.ac
+index 9cf6a53..cbc649d 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -18,17 +18,21 @@ AC_PROG_CC
+ 
+ # Platform specific ncurses check.
+ AC_CANONICAL_HOST
+-AS_CASE([$host_os],
+-  [darwin*],
+-    [
+-      AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+-      AC_CHECK_HEADER(curses.h)
+-    ],
+-  [
+-    AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+-    AC_CHECK_HEADER(ncursesw/curses.h)
+-  ]
+-)
+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
+  PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
+    AS_CASE([$host_os],
+      [darwin*],
+        [
+          AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+          AC_CHECK_HEADER(curses.h)
+        ],
+      [
+        AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+        AC_CHECK_HEADER(ncursesw/curses.h)
+      ]
+    )
+  ])
+])
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5765613..ee411a9 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -15,3 +15,5 @@ hh_SOURCES = 									\
+ 	hstr_regexp.c include/hstr_regexp.h			\
+ 	radixsort.c include/radixsort.h 			\
+ 	hstr.c 
+
+hh_LDADD = $(NCURSES_LIBS)
--- a/app-shells/hstr/hstr-1.18.ebuild
+++ b/app-shells/hstr/hstr-1.18.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Shell history suggest box - easily view, navigate, search and manage your command history"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
+SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( CONFIGURATION.md README.md )
+
+src_prepare() {
+	sed \
+		-e 's:-O2::g' \
+		-i src/Makefile.am || die
+	autotools-utils_src_prepare
+}
--- a/app-text/refbase/refbase-0.9.5.ebuild
+++ b/app-text/refbase/refbase-0.9.5.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI="2"
-inherit depend.apache depend.php webapp
+inherit depend.apache webapp

 DESCRIPTION="Web-based solution for managing scientific literature, references and citations"
 HOMEPAGE="http://www.refbase.net/"
@ -18,7 +18,6 @@ DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
 RDEPEND="${DEPEND}"

 need_apache
-need_php

 pkg_setup() {
 	webapp_pkg_setup
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@ -1,2 +1,3 @@
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
 DIST sigil-0.9.0.tar.gz 17446877 SHA256 39887e1f76236e796d29c679f327c7183907c47b522794a00090eb1aa04dac92 SHA512 f83e5e8ae233e8784ad25345890a33424cf951a3d385d26a69b0efbabe87b22ab9466a6faed93f1106875642ef395c6f20c69b556661b6fe24388946d677746b WHIRLPOOL d6cca23116a428fc032538ab7fda1ab1d2afa703b8f665d58c03bcd5568e6174f1efbc43b7c5cb7f9e8b91866ea93d8cf01428fbd47748a26b4906152de972c8
+DIST sigil-0.9.1.tar.gz 17451106 SHA256 7ef13ae9f570ac51aa8d80890ff31bcdf8d1b488c1c4bbb315f1ca4b75237a63 SHA512 41327a67aea80f655f8662c0fcf7159db7d44a5cf89274777c719bcff2960e8ef11788c767c8ffba095c1fb4be320b055e1826bff8f6d0ca89999d52e750f7e0 WHIRLPOOL 49d3b4d10abebce045e55fac7350d7a7e09ebef9293593db6b5bc148507e289a9ab26ddaf6f0b53dfe7252be78f53fbcdc0c760b78ed642c74ee8f73a026a302
--- a/app-text/sigil/sigil-0.9.1.ebuild
+++ b/app-text/sigil/sigil-0.9.1.ebuild
@ -4,11 +4,11 @@

 EAPI=5
 CMAKE_MIN_VERSION="3.0"
-CMAKE_BUILD_TYPE="Release"

-# This ebuild could use some python checks, as sigil contains python plugin architecture.
+# Sigil supports Python 3.5 already. Include it when our deps support it.
+PYTHON_COMPAT=( python3_4 )

-inherit eutils cmake-utils
+inherit eutils cmake-utils python-single-r1

 MY_PN="Sigil"

@ -22,10 +22,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 RDEPEND="
-	>=app-text/hunspell-1.3.2
-	>=dev-libs/boost-1.49[threads]
-	>=dev-libs/libpcre-8.31[pcre16]
-	>=dev-libs/xerces-c-3.1.1[icu]
+	app-text/hunspell
+	dev-libs/boost[threads,${PYTHON_USEDEP}]
+	dev-libs/libpcre[pcre16]
+	dev-libs/xerces-c[icu]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-qt/qtconcurrent-5.4:5
 	>=dev-qt/qtcore-5.4:5
 	>=dev-qt/qtgui-5.4:5
@ -36,30 +44,31 @@ RDEPEND="
 	>=dev-qt/qtwidgets-5.4:5
 	>=dev-qt/qtxml-5.4:5
 	>=dev-qt/qtxmlpatterns-5.4:5
-	>=sys-libs/zlib-1.2.7[minizip]
+	sys-libs/zlib[minizip]
 "
 DEPEND="${RDEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sys-devel/gcc-4.8
 	virtual/pkgconfig
 	>=dev-qt/linguist-tools-5.4:5
 "

 S="${WORKDIR}/${MY_PN}-${PV}"

-DOCS=( README.md )
+DOCS=( ChangeLog.txt README.md )

 src_prepare() {
 	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
+	sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"

 	cmake-utils_src_prepare
 }

 src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+	)
 	cmake-utils_src_configure
-
-	cd "${WORKDIR}/${P}_build" || die "Where is the build dir?"
-	for i in CMakeCache.txt src/Sigil/CMakeFiles/sigil.dir/link.txt $(find . -name '*.make')
-	do
-		sed -e 's/-O3 -DNDEBUG/-DNDEBUG/' -i ${i} || die "sed failed"
-	done
 }
--- a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -37,6 +37,7 @@ pkg_setup() {
 		LD="$(tc-getLD)"
 		VERBOSE=1
 		DESTDIR="${D}"
+		PREFIX="${EPREFIX}/usr"
 	)
 }

--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -37,6 +37,7 @@ pkg_setup() {
 		LD="$(tc-getLD)"
 		VERBOSE=1
 		DESTDIR="${D}"
+		PREFIX="${EPREFIX}/usr"
 	)
 }

--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jakarta components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang/"
+SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/lang/"
 SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"

 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 SLOT="2.1"
 IUSE=""

--- a/dev-java/commons-lang/commons-lang-2.6.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit:0 )"
-RDEPEND=">=virtual/jre-1.4"
-
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt NOTICE.txt || die
-	dohtml *.html || die
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
--- a/dev-java/glassfish-deployment-api/Manifest
+++ b/dev-java/glassfish-deployment-api/Manifest
@ -1 +1,2 @@
+DIST glassfish-deployment-api-3.1.1.jar 86511 SHA256 e45d07481c68a53b615ad064bdd4612ab08beba443b58147b4122799ca4c2bbf SHA512 9325d44da2258c84b879360fe92314b49c0b3ca7be2dd3b9016bf884e79ed66f9bf3fcec2b99a7b8baf3847e5d15376d10e3013bd4dd0f0cfaaf7859fa83a6ba WHIRLPOOL df7f1dfbcc7d9ecb86bc97f619bce4bffeb1c060d082b5caed8d22b5dd8bc3561c98be375a3e8e97a7f89b78a4ed90af6d49b8e902d508ab81898fe976a0fc40
 DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
--- a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
+++ b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="J2EE Application Deployment Specification V.1.2"
+HOMEPAGE="https://glassfish.dev.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/${PV}/javax.enterprise.deploy-${PV}-sources.jar -> ${P}.jar"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	>=virtual/jre-1.6"
--- a/dev-java/jsap/Manifest
+++ b/dev-java/jsap/Manifest
@ -1 +1,2 @@
 DIST JSAP-2.1-src.tar.gz 1281840 SHA256 5146bf75cba18fdf9299462a4127e95919c884494aaf3ed023cb2950217a0862 SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352 WHIRLPOOL aecdc479d5d088429ca10a24a90b8aefc849ff7eef03276e9c2667a28420a2fefcf6d6541b1eee5d8c7891c3aa2c7392dc9e943084aaeac86bcc48d4a4d1dc78
+DIST jsap-2.1.tar.gz 1281840 SHA256 5146bf75cba18fdf9299462a4127e95919c884494aaf3ed023cb2950217a0862 SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352 WHIRLPOOL aecdc479d5d088429ca10a24a90b8aefc849ff7eef03276e9c2667a28420a2fefcf6d6541b1eee5d8c7891c3aa2c7392dc9e943084aaeac86bcc48d4a4d1dc78
--- a/dev-java/jsap/jsap-2.1-r1.ebuild
+++ b/dev-java/jsap/jsap-2.1-r1.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="JSAP"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Java Simple Arguments Parser (JSAP)"
+HOMEPAGE="http://sourceforge.net/projects/jsap"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/xstream:0
+	dev-java/ant-core:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+EANT_BUILD_TARGET="jar"
+EANT_JAVADOC_TARGET="javadoc"
+EANT_ANT_TASKS="rundoc snip"
+EANT_BUILD_TEST="test"
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	xstream
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.xml.patch"
+)
+
+java_prepare() {
+	java-pkg_clean
+	epatch "${PATCHES[@]}"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "dist/${MY_P}.jar"
+
+	if use doc; then
+		dohtml doc/*.html
+		java-pkg_dojavadoc doc/javadoc
+		dosym /usr/share/doc/${PF}/html/api /usr/share/doc/${PF}/html/javadoc
+	fi
+
+	use source && java-pkg_dosrc src/java/com
+}
--- 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
--- a/dev-lang/swi-prolog/swi-prolog-7.3.12.ebuild
+++ 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
+}
--- 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}
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@ -1,2 +1,3 @@
 DIST libressl-2.2.4.tar.gz 2966157 SHA256 6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e SHA512 390fbf4f531976c873a0a1163fd57f33097686c6956ec4d3eb69e8271a4e40abfec76d65172b34ae50af8936dd8b5c3ca5fefee9d8686ca468a5577d432c3fe5 WHIRLPOOL 44d36b582efad0cff8015e507ea7c95befd5a44f2beaf69b534454cee4288681d55390a9d4c41ded8a535f0ad6c210348f365534fe3d82725e6b918a89b99e43
+DIST libressl-2.2.5.tar.gz 2966527 SHA256 e3caded0469d8dc64f4ca2fe8e499ada4dd014e84d1c5a71818d39e54e6c914b SHA512 501d04cb966260854082d374e60aabde21bcd65a331ff7c76044f2053b22ddab4914710b223b400a3a181873c6af5e2e7da5f04bdd9028fddbf420e259a2863a WHIRLPOOL 47f7d35ceff5004af0c2f79509678c4826eabe05225dbcf5cbe1f9cb358d1657ff288a702e14bfd578fd03e38256d2aa2c79ec724a05c98aa91317e6a9a5f9d4
 DIST libressl-2.3.1.tar.gz 3014881 SHA256 410b58db4ebbcab43c3357612e591094f64fb9339269caa2e68728e36f8d589e SHA512 ac70d2f09035d63765bb980422c6c6b55ef07f6af4a93fce54748ff3621cf08ef87acfd438797d562dc21ab9b4862992876792deef9310aafdb927e20e27d453 WHIRLPOOL 52f46016cf07e598b7117de1cc90617982de0ad020b55c4a2b402de317d8b52f8a381c9ebdff787421dccd3e47294305863ceb9f2c1c2a9080818fec16e7e177
--- a/dev-libs/libressl/libressl-2.2.5.ebuild
+++ b/dev-libs/libressl/libressl-2.2.5.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="http://www.libressl.org/"
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
--- a/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="redis"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-4 php5-5 php5-6"
+
+DOCS="arrays.markdown README.markdown"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="igbinary"
+
+DEPEND="igbinary? (
+	php_targets_php5-4? ( dev-php/igbinary[php_targets_php5-4] )
+	php_targets_php5-5? ( dev-php/igbinary[php_targets_php5-5] )
+	php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] ) )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	my_conf="--enable-redis
+		$(use_enable igbinary redis-igbinary)"
+
+	php-ext-source-r2_src_configure
+}
--- a/dev-python/django-cms/Manifest
+++ b/dev-python/django-cms/Manifest
@ -1 +1,2 @@
 DIST django-cms-3.1.2.tar.gz 4031123 SHA256 b59c89b6f7c3a802e74fe16159eb663df4b49fb676b6931d678fd5261a5fdb9b SHA512 ef8c2f25032f784b4f4a3d6b595577ee890fd249c54a71207eb6c2c7b3495164171db6f0e2f4aa49ed4b8e3ff5e682757ea2f396b69ff46d93419a35489fd213 WHIRLPOOL 85a22c9679b84fe04e4b29606328a50373a1d7aaa8174ee54e82d0cca08ef62ca8e3b946cf6ed0670f52253697046ecf65e2a8675ba9820286390b7af59dc143
+DIST django-cms-3.1.3.tar.gz 4035531 SHA256 f0b2122e33dfb9f52247365855712616d61b5efecc87eb8fe5bd5eb1399f982c SHA512 261f1321d5f47ce6931b4bf89a1f4e1183a6353793537c840e61ea9200169889f4712b6eea77a5e15e58b065b48a8911e1f643af487eeb93519ec8ff1b46310d WHIRLPOOL cfeaf1e47730effdf2312687a0213bf7341512b8d2a6e4ccd1f2a54981b28b3242c36af0ea3e7ce4635451ca9ff4dd548025500e5f68d359ea34ade346bceec2
--- a/dev-python/django-cms/django-cms-3.1.3.ebuild
+++ b/dev-python/django-cms/django-cms-3.1.3.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django application for managing hierarchical pages of content"
+HOMEPAGE="https://www.django-cms.org/"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+admin-style +ckeditor file flash inherit link picture snippet teaser video"
+REQUIRED_USE="admin-style ckeditor"
+
+RDEPEND="
+	>=dev-python/django-1.6.9
+	admin-style? ( dev-python/djangocms-admin-style )
+	file? ( dev-python/djangocms-file )
+	flash? ( dev-python/djangocms-flash )
+	inherit? ( dev-python/djangocms-inherit )
+	link? ( dev-python/djangocms-link )
+	picture? ( dev-python/djangocms-picture )
+	snippet? ( dev-python/djangocms-snippet )
+	teaser? ( dev-python/djangocms-teaser )
+	video? ( dev-python/djangocms-video )
+	>=dev-python/django-classy-tags-0.5
+	>=dev-python/django-sekizai-0.7
+	ckeditor? ( >=dev-python/djangocms-text-ckeditor-2.1.1 )
+	dev-python/django-treebeard
+	dev-python/html5lib
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/django-filer/Manifest
+++ b/dev-python/django-filer/Manifest
@ -1 +1,2 @@
 DIST django-filer-0.9.12.tar.gz 762305 SHA256 75dffb0df161d25edb5b1bee3ceaa308223264e35fb87517d733fa2eb1eee5c5 SHA512 141357b6a039fdd018bc843a8be6c130b31dd246632522bd3b61c35232406fcc1bf8c28862fd2d2466f355240afa4062afb435707ce341112d1aa049aca6bb4f WHIRLPOOL af62b42ded639037c4f39bfabc594c08b447c6bc7808dcc3a1cab23a5442d6cd0818d8dfc0f56f5d531e18217d8f98a653a07ab0c2b6cd1e71f82a5865936c62
+DIST django-filer-1.0.4.tar.gz 779330 SHA256 be18c8e568c4e01cb16268e04292c119dd3da18c72812bec0ab818aded40d9a3 SHA512 a8c527be1d706c0f305a7019155eb9a2d197062b0a37632cbb50b2ed946f6ab05d694325eabe8fcccf183d8a4cdd79da1c0621f5fcda71326f3bac2b659140cc WHIRLPOOL eebb54f463fc98c39574d4078777f48efe426636aeea19230d4cf1ffc85053ebf435815f813a4f86506ff231e43e5ad8333fe537f6d3d09914970d48ad6e080a
--- a/dev-python/django-filer/django-filer-1.0.4.ebuild
+++ b/dev-python/django-filer/django-filer-1.0.4.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="File management application for django that makes handling of files and images"
+HOMEPAGE="https://pypi.python.org/pypi/django-filer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.5
+	>=dev-python/django_polymorphic-0.2
+	>=dev-python/easy-thumbnails-1.0
+	dev-python/django-mptt
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/django-sekizai/Manifest
+++ b/dev-python/django-sekizai/Manifest
@ -1 +1,2 @@
 DIST django-sekizai-0.8.2.tar.gz 166925 SHA256 cab1a4f445a9544036ba0b04cafd3102cecac1b313ab2e6a51bff773751298ae SHA512 dc9f8d38df4d2e61d285683e3922c480c8defecf1149d727db9e0d480c80efa488c4c192c54fa7edbf6e98111b460cba46ea904bea72dbfea567aef77a24120d WHIRLPOOL 9ddc8d345cdc1abbe8ca2f48102eb908b23a33fb09a3c9a720f9c7e278b59ecfe2aa9c2528fdcb47e10c35d86822898f188d19f79656b1c6e9ff2d933ad4c31b
+DIST django-sekizai-0.9.0.tar.gz 895007 SHA256 1fcf80f1238fe911a795bce6424589075fadc15200a121f493774b232aa334a4 SHA512 3ce523dacb08826fd1dbea6d3b3df966043983d127982e14fcd2322e1513224802a84102e9d5650f849c780b238ded9fa41d6c134f1bd29e90a735af7d589d99 WHIRLPOOL 9e11cb9d5542412ef08a52a3d39a44634ec2d94f6a43ff3e268bf6607f18d71944a56fac96afacc53ab3a429af2751ba8c4627608940e7cd2afb4fbc56f1e92c
--- a/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild
+++ b/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django Template Blocks with extra functionality"
+HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.python.org/pypi/django-sekizai"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.6
+	>=dev-python/django-classy-tags-0.3.1
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- 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
 }

--- 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
--- a/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild
+++ 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}"
+}
--- 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
 }
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@ -1,3 +1 @@
-DIST dwdiff-2.0.10.tar.bz2 76285 SHA256 67c4b9fbbbf8ea25335a07c7f4107028649dcd04136a3904778c7a767b843f6f SHA512 670ab12560e3aa98f44a9cd53e87ba8c553807f7864190f9da6db59cc3b152fdb486429b7316e9d0a58d61afc478353924330e984218da52d5017cb6932a6ee7 WHIRLPOOL cad6313439bb885987d593eb6058022937f6370e5ef3151bbdcd341179a033184a16e62f8ad9d606f812d02da90718c513017bba1688d8cb57cbb1bae6c989c3
-DIST dwdiff-2.0.9.tgz 86521 SHA256 c1c9217825ad3fac9936129cc26b73fa5479fb079e5c34522fc7066e74e31ef8 SHA512 73fe43dcc7ba6d3a4e773c7a8b117c359c0470b7b00d7f5bd53781dd046e06b5e02c5adfc7f877bc4ded289a767de3849bacea7cf03883f72046c2d0e7877f1b WHIRLPOOL 9054ef46bfa1f767a2fa64e195afaa7150d2895e99c7bb63cb9380463ce72d5d2e0e9bac336fb677d1a7dfd4c97f98f3e3541a267e1c4ea7096e6f61c4e09b0c
 DIST dwdiff-2.1.0.tar.bz2 79224 SHA256 45308f2f07c08c75c6ebd1eae3e3dcf7f836e5af1467cefc1b4829777c07743a SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021 WHIRLPOOL 74ceba5cc7c20e0ab6ee09b62f7e8b07a1b8321bbe60ca7c3791c35176ba7137ddf17b1c471ff5ac0586ad0455e67968c71bf00f2de7cb137720b88a85c8f181
--- a/dev-util/dwdiff/dwdiff-2.0.10.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.0.10.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="dev-libs/icu:="
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/diffutils"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
--- a/dev-util/dwdiff/dwdiff-2.0.9.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.0.9.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="dev-libs/icu:="
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/diffutils"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"

 COMMON_DEPEND="dev-libs/icu:="
--- 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
--- 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>
--- a/dev-util/pkgconf/pkgconf-0.9.12.ebuild
+++ 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
+}
--- a/dev-util/scala-ide/Manifest
+++ b/dev-util/scala-ide/Manifest
@ -1,3 +1,4 @@
 DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz 232347349 SHA256 1d7054b49195b598d469a2d56971f67aa219c6043cb8209f8c8608160c4df7ad SHA512 f3d8bff300ee772e07f9c9287c37428d5ddf50bd750dcc86b6a28d9ad5a0b891fa8ce810599e754ac06bf48786a9c58b981055c29976c37b2c530466591d171a WHIRLPOOL f584d8d6e129f5464f9eb44ab7137e230dc0b701e07d3569a7975e35a5ecc2a4f6b81e085486f36867b00a9715e1e25b5cd29294c638abe195f4a60677aa61f9
 DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 232491001 SHA256 d3e9efe1176d979dc0fe2a9457f70068b5a3fd23635a07bcd5639e2345897aca SHA512 d5b8fe3cb3d6623e2f29e0ad5d279b363143c9b392ea5d91092ecb9de765828ac0c50c74ff879f7c825099b22a833ad3acbb0c2cfcd51c769ee19082905b63eb WHIRLPOOL 8007d41e9695c6ae5c3094906ebc6fba263d8d005f6763ce70eb4398db266ea1aff64bc4bc24bc216d0e869e839a92298bb3f85f8149608dd2986d36a3863def
-DIST scala-SDK-4.1.1-vfinal-2.11-linux.gtk.x86_64.tar.gz 234952144 SHA256 8cafc34e8456224dcfd23b0405af8f50ae1cc03587d5efbd1ec27082a7b797c1 SHA512 e44ea7d6d9d03ef1631fb839a63453870997309861bfe25434c256730b3fa28c7eb392489140473e4844a49e64f009d88093f501d8fe19f8d2e5e06bf36c437a WHIRLPOOL d614acb12faa7e56671ff74fe60f5044e94e5ef51c983fd916e74b76c2a23e0e34cf640f4063590f371e5129e82c5928cf955fbaadf36ec5caa6615205cfa978
+DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz 237898838 SHA256 3f46b5576e72f8555b322bf8a1ff8357372c5ec159f9171f2d81f78c5d753f78 SHA512 b8fcac4e0eeace0d146028e2f1551cdd3f58d38830430080e7aa5ccd581ae6a31992a5d1f39b6e8fcb30979953f0b9777166d2de73d7310621c9e7fa2e620f3d WHIRLPOOL 05756a8be2e23d50a84ea36a786f5b442c18da94e40b14c199c034880b226e0fdd8a06f4c2fbfa7238c5ab4343ea68bf71ea91830f05cd7226aba40d5389c05c
+DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 238040666 SHA256 bc6b9289ab318a4eb7e273a2990351cc051a00051b208192591c0a6fad5da20d SHA512 70f3a481065f79532a4a0463e2549e4ecb0590e6d6e1ca7704629eced4393a7e4f7b22cd7c368a852c1d8f63cff949db02a7dd7f1be71cd30f52219c5cfbefd5 WHIRLPOOL 11dddf53d364864198629dfefdc84202fc19876d325e7738488402b7614faa5d6b88e8f2867810c854e9110fd3596043529a2e6f588107af519ae807a9d711d8
--- a/dev-util/scala-ide/scala-ide-4.3.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
@ -11,8 +11,8 @@ S_PACK="${PN/-/}-pack"
 # scala-ide -> scala-SDK-${PV}
 S_SDK="${PN%-*}-SDK-${PV}"

-SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20150728/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
-SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20150728/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
+SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
+SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86.tar.gz"

 DESCRIPTION="The Scala IDE"
 HOMEPAGE="http://www.scala-ide.org"
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@ -402,6 +402,10 @@ kde5_src_prepare() {
 	# only enable handbook when required
 	if ! use_if_iuse handbook ; then
 		comment_add_subdirectory ${KDE_DOC_DIR}
+
+		if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+			punt_bogus_dep KF5 DocTools
+		fi
 	fi

 	# enable only the requested translations
@ -435,21 +439,11 @@ kde5_src_prepare() {
 		rm -rf po
 	fi

-	# in frameworks, tests = manual tests so never
-	# build them
+	# in frameworks, tests = manual tests so never build them
 	if [[ ${CATEGORY} = kde-frameworks ]]; then
 		comment_add_subdirectory tests
 	fi

-	if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
-		# only build unit tests when required
-		if ! use_if_iuse test ; then
-			comment_add_subdirectory autotests
-			comment_add_subdirectory test
-			comment_add_subdirectory tests
-		fi
-	fi
-
 	case ${KDE_PUNT_BOGUS_DEPS} in
 		false)	;;
 		*)
@ -462,15 +456,18 @@ kde5_src_prepare() {
 			;;
 	esac

-	if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
-		if ! use_if_iuse handbook ; then
-			punt_bogus_dep KF5 DocTools
-		fi
-	fi
-
-	if [[ ${KDE_TEST} = forceoptional ]] ; then
-		if ! use_if_iuse test ; then
+	# only build unit tests when required
+	if ! use_if_iuse test ; then
+		if [[ ${KDE_TEST} = forceoptional ]] ; then
 			punt_bogus_dep Qt5 Test
+			# if forceoptional, also cover non-kde categories
+			comment_add_subdirectory autotests
+			comment_add_subdirectory test
+			comment_add_subdirectory tests
+		elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
+			comment_add_subdirectory autotests
+			comment_add_subdirectory test
+			comment_add_subdirectory tests
 		fi
 	fi

--- a/games-puzzle/quadra/files/quadra-1.2.0-format.patch
+++ b/games-puzzle/quadra/files/quadra-1.2.0-format.patch
@ -0,0 +1,11 @@
+--- source/net_list.cpp.old	2015-12-08 21:41:16.782404098 +0100
+++ source/net_list.cpp	2015-12-08 21:41:33.153114600 +0100
+@@ -693,7 +693,7 @@
+ 				//Drawn at a total higher or equal to end_value: suspense!
+ 				//  or maybe timer just elapsed and the game is drawn
+ 				//  (still suspense! :))
+-				sprintf(st, ST_GAMETIED);
+				sprintf(st, "%s", ST_GAMETIED);
+ 				message(-1, st);
+ 				{ Sfx stmp(sons.levelup, 0, 0, -1, 18050); }
+ 				{ Sfx stmp(sons.levelup, 0, 0, -1, 18100); }
--- a/games-puzzle/quadra/quadra-1.2.0.ebuild
+++ b/games-puzzle/quadra/quadra-1.2.0.ebuild
@ -29,6 +29,7 @@ src_prepare() {
 		-e "/^libgamesdir:=/s:/games:/${PN}:" \
 		-e "/^datagamesdir:=/s:/games:/${PN}:" \
 		config/config.mk.in || die
+	epatch "${FILESDIR}"/${P}-format.patch
 }

 src_install() {
--- 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
--- a/kde-plasma/bluedevil/bluedevil-5.5.0.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="
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@ -0,0 +1 @@
+DIST breeze-gtk-5.5.0.tar.xz 257560 SHA256 fe7cd9cf38bc39f8b6f7dbed5b4b2f3f684cfe70c504de75a2d7c01edc925a30 SHA512 5cc1fa912534f2591f7cc919f4ab7de830c00f2c152349d445e782540b68458fa0f9fd4167af3459bdce9fd1689dcd5eedfa4efa91936263b5ec3d7f9a41ff2e WHIRLPOOL ebb0258adbf5c4baceeae335e7bb3cc9ae440696dd842065aa42c7301b7ce3a104176a2161a91398ba17c83b772f3824e6c81b19dd0be3ef886967962ffd1427
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.ebuild
+++ 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=""
--- a/kde-plasma/breeze-gtk/metadata.xml
+++ 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>
--- 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
--- a/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
+++ b/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
@ -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
-}
--- a/kde-plasma/breeze/breeze-5.5.0.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)
 "

--- 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
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.5.0.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="
--- 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
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.5.0.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="
--- 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
--- a/kde-plasma/kdecoration/kdecoration-5.5.0.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"
--- 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
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.5.0.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
 "

--- 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
--- a/kde-plasma/kgamma/kgamma-5.5.0.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="
--- 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
--- a/kde-plasma/khelpcenter/khelpcenter-5.5.0.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="
--- 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
--- a/kde-plasma/khotkeys/khotkeys-5.5.0.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="
--- 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
--- a/kde-plasma/kinfocenter/kinfocenter-5.5.0.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 ) )"
--- 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
--- a/kde-plasma/kmenuedit/kmenuedit-5.5.0.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="
--- 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
--- a/kde-plasma/kscreen/kscreen-5.5.0.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="
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@ -0,0 +1 @@
+DIST kscreenlocker-5.5.0.tar.xz 97484 SHA256 c90ec7a1ec3b27c557df134a25b358c6a56cb155878bbb0870e912cca61fddd7 SHA512 452c87358638196bfdd8372b7df7b56fa9b036a750a7316528e5963222d93187f124f6ffb2cc4325a3a562eb6e8c190edf4f373c2fe803edab853c4c4027323f WHIRLPOOL ddc8afe7cc172766896e60a6ac5aa3dc7cf99929894d691440fe75e2772c499a2ea07da642b3dbb54cf28004f401a8fea47fe3226835ab456dc803d31f76b447
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.5.0.ebuild
+++ 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
+}
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ 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>
--- 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
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.5.0.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="
--- 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
--- a/kde-plasma/ksysguard/ksysguard-5.5.0.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)
--- 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
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.5.0.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
+}
--- 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
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.5.0.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}"
--- 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
--- a/kde-plasma/kwayland/kwayland-5.5.0.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]
 "
--- 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
--- a/kde-plasma/kwin/kwin-5.5.0.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"
 }
--- 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
--- a/kde-plasma/kwrited/kwrited-5.5.0.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="
--- 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
--- a/kde-plasma/libkscreen/libkscreen-5.5.0.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="
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST breeze-gtk-5.5.0.tar.xz 257560 SHA256 fe7cd9cf38bc39f8b6f7dbed5b4b2f3f684cfe70c504de75a2d7c01edc925a30 SHA512 5cc1fa912534f2591f7cc919f4ab7de830c00f2c152349d445e782540b68458fa0f9fd4167af3459bdce9fd1689dcd5eedfa4efa91936263b5ec3d7f9a41ff2e WHIRLPOOL ebb0258adbf5c4baceeae335e7bb3cc9ae440696dd842065aa42c7301b7ce3a104176a2161a91398ba17c83b772f3824e6c81b19dd0be3ef886967962ffd1427`
				`@ -0,0 +1 @@`
				`DIST kscreenlocker-5.5.0.tar.xz 97484 SHA256 c90ec7a1ec3b27c557df134a25b358c6a56cb155878bbb0870e912cca61fddd7 SHA512 452c87358638196bfdd8372b7df7b56fa9b036a750a7316528e5963222d93187f124f6ffb2cc4325a3a562eb6e8c190edf4f373c2fe803edab853c4c4027323f WHIRLPOOL ddc8afe7cc172766896e60a6ac5aa3dc7cf99929894d691440fe75e2772c499a2ea07da642b3dbb54cf28004f401a8fea47fe3226835ab456dc803d31f76b447`