gentoo resync : 15.10.2017

764 files changed, 9177 insertions, 4058 deletions

diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 8d962a4e5999..705a9d1b1fe5 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -4,15 +4,9 @@ AUX augeas-0.10.0-test.patch 1991 SHA256 42fcbbc1c8dbbe5c5ac3d1e04bbcb3eccce460d
 AUX augeas-0.10.0-test2.patch 1713 SHA256 d8efe22028a65fc5346742fde4bf27550db06c43a030da83f7c2eada54cc0b0e SHA512 8c8b5d0e1d182a30db1cbb1c61a7594109e569dcb280433314eac4879ee6fc10bb415ecec1d10f7b0e85e5b0c1703774a16b9d4662e2b6c18767d94f37d60eb2 WHIRLPOOL 889923e71151c24b2742307bdead8bfa2c49f70689567028bb9b204c98883510ce046d432f9e7893f58db968d6c239f408b1c0fbca18eb7fdced898393a592dc
 AUX cve-2017-7555.patch 5771 SHA256 c82638220c1136000539db1e084abf10efd0d41e0d02a226e6b6bb8f5bbcce6e SHA512 209364d6d8af5b755f8675b2eff8fa8e240ec364fc97e7a4644f320aad94f64600120d3da7d67a7a4f243acace4a41d13b1dbccfbe0c2021853adb7f3949c8b4 WHIRLPOOL 7714fa4be323f5ff7c8b50fedb48c95bd9f10f2ad26d0480ff2a73eaa3785e206963cc3e44c2ba1207a6e05ddc18a85bd65ca68bc40ec5108510c5ed7f64a74d
 AUX cve-bunch-of-them-symlink.patch 2415 SHA256 4db27194c976fedec981d8db6129422ad03456d80026d4a707b7ebcf74af072e SHA512 a702cce3f448cef9ce42e56d3ce7e6ceb8c5054031e6b1a9465639b4462ab4c7427f826a2783e12e4dc90f2bc6896f473ffc0e4d8d37e6d55cdb0192315eddb1 WHIRLPOOL 2791834ba2eed688451983c4a2544198e81d1fdf16cd6a9fde811cbb075643e0b534006e06561c6125543db1dc00731bc297330c91e1e4dc0367318e96c2a188
-DIST augeas-1.7.0.tar.gz 2156168 SHA256 b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763 SHA512 d2a5580ffa69c0229cfae85261cf7740b268ceac35f076aef6a7e8631497e5726530adfdb85f715ebb102f28af98861b4fa29d7e3eaa37a5dafff8eaf817befb WHIRLPOOL 29a8aca382592a4492e0d5153525fe26998729f1a7a482dede5275af712dce49ee08f700549dc8f96790ec6031a0a32e5017e059cf4feea0067f1424b80021d5
-DIST augeas-1.8.0.tar.gz 2164146 SHA256 515ce904138d99ff51d45ba7ed0d809bdee6c42d3bc538c8c820e010392d4cc5 SHA512 bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c WHIRLPOOL 5f5dffac092bc241bc81b853ce05dd57530aab54e83668007e67dd29ca95583d7dfaebae75f96a822d5231d6bfd16aca30dc17b5b4d7ee6c2096fb9b917a4536
 DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0
 DIST augeas-1.9.0.tar.gz 2199534 SHA256 2b463d398cabc9b42747aa61d3e83ed6a93ce03d9074cf8e7a7bd3107a668343 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 WHIRLPOOL 226262afff83c9e3421928b24d0ca067b9971f353d152a5de6fd74d8bdf30259acf63881fe761d4c538f36865c8dcd6679583c12649e2c4545374e30a226b568
-EBUILD augeas-1.7.0-r1.ebuild 1170 SHA256 0432c3bdfd73a440ce3873616a9d6a9d48a0687cfb1c75f1a0d866abc29f4faa SHA512 9062ded3c443b8dac190875bb5da2f4cc34f7ff0d1104a98c9099874a891e954eae42e09747cdde53ae7bd3af8a82090d4b3739405945e387d8ddd6621fb09df WHIRLPOOL 0493638832f0513c44c26727c0134285cbbbe106a9e57db4b8e4372159ad887dc4830b1eebc447715aa24257382bd642552c28deb589cd40bcae5965af6df1ce
-EBUILD augeas-1.7.0.ebuild 1115 SHA256 2761bed4c806366633eb5edee079a21b9418967b78701b5c11c2a3d6d0c8dcd9 SHA512 0e4dc7451ce05186ff17d922680663cde318714d0e5b41bd3e32d01c75cc58f8cb212a942fd5a415b447f4f9248e850f51a18a5033f05e44e1e85ac9c82ffd13 WHIRLPOOL c94314c26316db85e98e5698efcb16000052e1d243d7036e541de54875b92167a8ebeb2666cf5ad3580da56f1372ea809ded873519a72e9834d4ac3a86421b74
-EBUILD augeas-1.8.0-r1.ebuild 1037 SHA256 79964179da157f1a2e18f8b6c87b3a14644c750115a8dcd0abf684e7ed4b45a2 SHA512 74c1fa2664b4181b3dfbc09303e2d67a6a02e05583dd908b440671f16cd419641f1a4d7c0c21f076a1838c6ff1e5018af4a3eb80847bf889aff68b56aec86d17 WHIRLPOOL 15f4e28d89e832831af92f5b9e364af2dc224bd7d75b5f5239a8864fcff460a74c7fe289c9eda8aadd63d6a2e56335b373f4afd24058e2b439bb2c336349e053
-EBUILD augeas-1.8.0.ebuild 962 SHA256 50da0692da3b7e89743e6c2a174d9575368f3889d711c0f6bbea74f7fff56238 SHA512 af15f06ecdb8f98214e2d99923cfaa57e7154c9b1995a59e9c1fd52940a65cd817ed2e277d302d3ad8680a5755393fe9e0dc8a3defa03626f351fec0dd6908d6 WHIRLPOOL c999185e2a597931fc805417089e51c6225ca0016262184b602441be35be4ca8bfa7e9c8a9b1ddac182f44954768d4aebe6e4ad92a5625f29896259ccdac7973
-EBUILD augeas-1.8.1.ebuild 1001 SHA256 710e3968949e419325da3f8c1fac68f911c3e7ec3b7e0f1e42bf87e2e0f29da0 SHA512 be32c8020994a750511da6da39518b9ec493bbc1802ca8767a1b4b191c29cb628831c7a551425270cff84f5d952b8cc963d47d4393dd150028a028387939fbd1 WHIRLPOOL a9904b3643f766bedd565d34fe7ff10324cf6aa77b57944682428471a37353dc201fe39ce84c02d55283dcb1038371389f129fbfed46f3bb690aa1591280fdb3
+EBUILD augeas-1.8.1.ebuild 1000 SHA256 6a112f872b20c583f7cf1d7acd019f9918a057af2c4f937b69ce5d40506e399e SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0 WHIRLPOOL 95be95ed87eebccabb97abef577d88ab1fc0db4cb3e807b8bf8a7e8dc0fff80cc59a68c8150a4601060d36f6ced58adbd70cfb18ea552975e59ca30d05556993
 EBUILD augeas-1.9.0.ebuild 1007 SHA256 2c7fa7d3ef04a292e16b1338da985f3bbcb2bc77f1203a362994033769c6959b SHA512 2cbfcc1006e5330d61667fcc4c01f12b7220ff9602f0b3933fd291cc1f054950554631d1e86cbfd577101ad07672bd81aff9e074cab41e96379d9e60df53e2db WHIRLPOOL df9a3056ae5580b9a5100c8930966c53340f9b0f39c6f0ab6c3ec2e3f63b665529ae5458e73c0ad36d8882315624e41939f407b183a233577ff034cd854c6a60
 MISC ChangeLog 5096 SHA256 a43458b42603d43012d5331d5e373c03b92a75c3b88b9177d1238bf283bf17e1 SHA512 bf7e92ebbb1d714c13995ff12020d08d990a359c2772269d39869dba387e98b37caa4802ea14a09540ac0166b0a5d43dcef83961bfd74f2e2dcbdc1332995340 WHIRLPOOL a724244353b9c7cbb239cdb9e18c04fcbfa27e0c40990c3ee58c21389b8ecb7c3ac960ab2ed8861da2902be95d6cb1b062f0a2ee02ebdbba58dc87b9bbd9af75
 MISC ChangeLog-2015 7867 SHA256 2179c62fc1afc98a4902b960d3b945c6107fb5c7c12588bf81063d81f9d386cd SHA512 1467fb11d900332b57f356b58c470f7fcba3ff8b17a16b744cdef519922c561099a2c5c4e7c0dd0763c2333e548c8fb8428eec644944c241a639055788d35daa WHIRLPOOL bf03260b28195b879bafe06f584f824c24b9c353f9544baeb559f9f30dd20212ded555245b03e4ef16088bb7f249ee23485f4829920a37ace2d54d0e3ca04c6c
diff --git a/app-admin/augeas/augeas-1.7.0-r1.ebuild b/app-admin/augeas/augeas-1.7.0-r1.ebuild
deleted file mode 100644
index f3291efef372..000000000000
--- a/app-admin/augeas/augeas-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-PATCHES=(
-	"${FILESDIR}/cve-2017-7555.patch"
-)
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-gets.patch
-#	"${FILESDIR}"/${P}-test.patch
-#	"${FILESDIR}"/${P}-test2.patch
-#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-#	)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.7.0.ebuild b/app-admin/augeas/augeas-1.7.0.ebuild
deleted file mode 100644
index 2cdf509377f1..000000000000
--- a/app-admin/augeas/augeas-1.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-gets.patch
-#	"${FILESDIR}"/${P}-test.patch
-#	"${FILESDIR}"/${P}-test2.patch
-#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-#	)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.8.0-r1.ebuild b/app-admin/augeas/augeas-1.8.0-r1.ebuild
deleted file mode 100644
index 3d268f6e33cf..000000000000
--- a/app-admin/augeas/augeas-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-PATCHES=(
-	"${FILESDIR}/cve-2017-7555.patch"
-)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	default
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs="--without-selinux
-	$(use_enable !static-libs shared)
-	$(use_enable static-libs static)"
-	eautoreconf
-	econf ${myeconfargs}
-	default
-}
diff --git a/app-admin/augeas/augeas-1.8.0.ebuild b/app-admin/augeas/augeas-1.8.0.ebuild
deleted file mode 100644
index a2f7b89a9d9b..000000000000
--- a/app-admin/augeas/augeas-1.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.8.1.ebuild b/app-admin/augeas/augeas-1.8.1.ebuild
index 846c917c6019..bd87d5c497e5 100644
--- a/app-admin/augeas/augeas-1.8.1.ebuild
+++ b/app-admin/augeas/augeas-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index ca9462a09fa1..119d9f414499 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,7 +1,9 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 SHA256 63d191355c78e1d15ae8d4ca995b492f610a75537b1e245a1a640a39974da0c4 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae WHIRLPOOL c5d43eb0a45f80aac0607473029f67f30c0d46cc2c5434d953097f66170c611b06b548db4f4b6a3bc1689714ec02e579505ee9c0ef6dba86fd5c8bf51153c64a
 AUX keepass.xml 275 SHA256 14e15149e0b9177008cc1fb67e57ef83e2c8663846403dfdf2411c77ebb3ee3f SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb WHIRLPOOL d0ee272ae608241ca67a0a2d1365d37e19b86ce4a7baede55f7094f8b1b58671935a753fa3f9859777c0bef2ee47a36b418165e5e6c894bfa6e634f965abd57e
 DIST KeePass-2.36-Source.zip 5063221 SHA256 de7e3e9d9bedab13e4d66b0ee941b2ebedaa08d8090f7cd78bd0fc019187d8c8 SHA512 16d51ed6bc437172765f69d1d67862afe7219a0898d13b4609198bbd7b5107620f1be418f5ea6ba23a5e3c7ca12d45ba3f0f3778c516eea6b2b953bc291cfe41 WHIRLPOOL 1d9fbf662757e09c4854010da9f6960fe4bf794eb694b37a9f63d813c1e1d1471257a66f01eac761fed5b06831f659cb81f11eba8858ee4e128cd578a19fcae8
+DIST KeePass-2.37-Source.zip 5080663 SHA256 1d8ffdd8ce1050939755311994ea3a491052bcb54d772bd7fc748567a5bbcbf1 SHA512 d094793a3216181ae375fb1343a809a20c358786bdf369c0171e5b7ca17a74bada314875cf410d84efaa4fa2b13e199de9be3c60f5f4e2c189241e4fffec8ad8 WHIRLPOOL 341140bf316d5750e0ad02e3edea9254471dbfe9c78e5441687847ed02fc0b4f44ae6ea310f523b7ad1ee6eb1af36f27568e17de9df5fbc38c16070ed20af8bf
 EBUILD keepass-2.36.ebuild 3036 SHA256 839222f8fea99ed61a96a96bfccc46d0918c1876895383071e01c3ab2f7c9ab2 SHA512 d4320aae524fe146ece9b319d5e94382197012e3f38f18a7213c5b6b82ff4d68f0bb36a1eb57cb978c7d6ce04339cefdb4e751127c53d470ed27c086e8389174 WHIRLPOOL ca26d85275da05db045048789519fb602d908b28cda5c5758d2c9d63ab0d5266537e611691faa170f56553931572c4ebbc1bdf458581764394c2944e521f93f7
+EBUILD keepass-2.37.ebuild 3038 SHA256 afcc189cd7c1cd30bfd656b1b443f977ffa1ef308266690fbe1d8b3c540c0129 SHA512 65b39e26f54deb365bb6783615e7560ac858bf4b0b66f680699844ed4ff46b4ff26007cb19dbabcf2bf761865b9e950e2de38d09e531962e0b6f5ebfa54b7a13 WHIRLPOOL 688dd822f62af7271b61506c7d76bb85cb814a319dcb3840d9ab2e7d6e4d9e9118e0da325035d11b0841add6268119d7b73f4a305458a5804e5806797fcc0c1b
 MISC ChangeLog 6059 SHA256 e0725a5fa8ea7ca71a5b92e12ed0287b4e8ca1bd6a6b9bb5ec5aa05316a2a548 SHA512 acca1aeda8273a603089ef8f6395ed061ee0a7da45f92aae6b8b260da0601c53d05d0fdff1a391627b64a3b4fdb33ac41d915cfd581f44cc439b8800d6808a07 WHIRLPOOL e5a81e4561e5af4bcbc63c9ab39809383f45ee89c381178ba872fb381aeb53740922575454b2eb0273658faec88c2000ebd05dd1dedc411e0d07828a156c3374
 MISC ChangeLog-2015 3407 SHA256 634db193f86f7ccd6253c9a1e835cfac555c1849e8fee09a61f37e9ec1c3ea61 SHA512 614843ebf42b19a145f6962b9bc54c55700471165acbd2a2e009e6af833f29cf82865743c9905a6967eb1068ff01e93dc1b4542be91ca0c06ff08b5f721f88e3 WHIRLPOOL 70e5a29adee5527c7b00bdd8a433ba979aa4ffd45e428e406f4522caba9fabfc866bf564ce1641ca518cdcb57e59210031e21bddd618e55f1858f73bb8b56a5c
 MISC metadata.xml 791 SHA256 18c672f1ad673aa1fe0b4a7575f39dd70abd7d3807e6b8bfe4fd138497f6cf44 SHA512 fb4fe73e3a2f4d36f36ecae7b9c13dc48db967cced94f0741bd6a2ae91d2a1d502ef9d2c9ace534c866268829d430f91a79f1e7ead89d03cbdfd4a94b89df861 WHIRLPOOL d99d26c16df2713cdcc93e4b5f32abb793f5ddcdd57f1e4b2d11eee1feb0bd12c00905a7ed991fa90b1b6687b67745ea6fecefb95a7edbd0b86c11445da9749b
diff --git a/app-admin/keepass/keepass-2.37.ebuild b/app-admin/keepass/keepass-2.37.ebuild
new file mode 100644
index 000000000000..4cdca74eeb1a
--- /dev/null
+++ b/app-admin/keepass/keepass-2.37.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	cd Build || die
+	source PrepMonoDev.sh || die
+	cd ../ || die
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}/"
+	exeinto "/usr/$(get_libdir)/${PN}/"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 8cbeb931bd04..7d8cf83e1934 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -7,6 +7,8 @@ AUX logrotate-3.12.2-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b895
 AUX logrotate-3.12.2-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
 AUX logrotate-3.12.3-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
 AUX logrotate-3.12.3-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
+AUX logrotate-3.13.0-fbsd.patch 855 SHA256 22618ce2fcf3555f4922ea98e90bac7846a840fe4da76d1c14d66614b13b21b0 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed WHIRLPOOL e78ea306458781dd88f3efbea57bc1d42f761aa5b98a286608be661a2904d91fbf53475740304e5a5f9f47bb361d87588c829900f90c2b7764fad2b066dac0ad
+AUX logrotate-3.13.0-ignore-hidden.patch 542 SHA256 5e5a1fb4b560d9a8d88f5deefacf09fcfb071144f9195fd5953146b26439adcf SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589 WHIRLPOOL f9642e6482982ae51f44807bef77a21269fe9f1449d8c8bd16ca845b0e3c9e2b7ef0428daeead65940c7fe4b49c39982c7874e585a6b781076e78000ee4de282
 AUX logrotate-3.9.1-Werror.patch 344 SHA256 63ce419252a8e2ed52c78b018bb1b2247e02f5c2c322168a5772d3faa957bd88 SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493 WHIRLPOOL 808769d911f49ed40c572e6f21d42e578aba056b3815017f25bb66d5d14a9fd78c16a92f30874346324ab1e0e7af57f6fa678707d88e8b3f69055c25b4b9a81a
 AUX logrotate-3.9.1-atomic-create.patch 1253 SHA256 f5a93032a0d7f48b4eb295fd40400d527a66804e3f959d391f895cebd86ef7ad SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99 WHIRLPOOL 29b74ceae23035e4423753042375f1fc713fc780b3ea31d166034746c0d4c89ec1be7979c570f13437902ba7c155299eb870510742fa73656517f5accd43d100
 AUX logrotate-3.9.1-fbsd.patch 1393 SHA256 543a7e7118f66cda16446d5bfd7abdae1c72e786f49f701c515ea595e72fe7ef SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822 WHIRLPOOL dd34fb0f8070e297a6f760d9d77ed3191ff3e91b152710ac6acaaada70236b12e6cc192259c06e15ef0d54f75a28de23dd3052a3c37d20b888c8069b77794a07
@@ -17,12 +19,14 @@ AUX logrotate.tmpfiles 16 SHA256 5624b71671928b2d5a076c32172b65b679b8502aae66b28
 DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
 DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
 DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
+DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff2a0429e4a0a2d881e740160e4b0 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 WHIRLPOOL 952c5eda18870876ea5109d4c5ae7ac1048d3ea07c89b4a0320a48baa8170fbc200f5b4a1cc193da0f6b0e1ef8dbdcdb82f74f23d4f12e5a19bb98650c1e7d5a
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
 EBUILD logrotate-3.11.0.ebuild 2005 SHA256 101653a12e2243dd4253abbc24becfeef0d2bae5037ae848a1f4848bec4a163e SHA512 eb0392730a076565c459a2645b6497b86d3a86d0096661eb468b00cbb909ffbed7db762adb866a9cbfca40ff339d90ce0c970404b718b8f8a4d084dbf51a1ddf WHIRLPOOL 0317478d7fc84c7d1716d2b449298b382a2349a5ed746c458a9e47a129fdbe9d4e7ec330bc36c07e9be0ae2ca041518424f1ce7ef3333e547667947eec5f6c12
 EBUILD logrotate-3.12.2.ebuild 1903 SHA256 d909fdef412279a0147a2f9d02986cafea2c4bd63936ab0fa0538ecad797483e SHA512 78ae7250c4c26ff7f702746535bace0f34b68d2ceb9d6cc3744975d1842781bb2037fa520b873806659db2e5acb8b58ec14996865be82e62d1d892acdae3b134 WHIRLPOOL 728c71c61e3ac0830ea100d891bcaf7fa8c9cf75e7c8f455862442d31a0f83b459d50ef54101a31745c84d6f491473404ded5c9372cf551a8499eff60893a49a
 EBUILD logrotate-3.12.3-r1.ebuild 2487 SHA256 e1871fe019ac5de8ef40c4e4b33e6e2a2b14ff52f39fd7969b3e547551dba63c SHA512 b085e9bbc3a21814f7d12bdbd37b38094527e04253bd64e5a90ecf366b58b1a9aae98752508f0f59a2fcf09f548bfa5c7e65436c4ce80918eee78df978ad34cc WHIRLPOOL 90c109fdf4396b723ecee00ebb676b0d8718d7fe9f72bdb5a87782355c411cfe72af86994c7564cd16c6f26397f2724eb63bcd04e3f767c5e318e59340681416
 EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.12.3.ebuild 2479 SHA256 f5bc883c099160493f924e3b72aa304eac5d23248f21137876b1f774a24539e8 SHA512 4e0b4b99277ee692318a6d6f4358a5463f11c339cc1e610040a9a436b412d5f8ba22ededee3453a4dc6dccd66067ee04931a39d3b27f08189592c2366f0c0365 WHIRLPOOL 9d71a14ec8ba93fa742d20d1275e757236b37413947248614fdbcf723a49dbaf700e20145e6523ac759d637a795355af1f636227db0803b04f994bbbedaafaf3
+EBUILD logrotate-3.13.0.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37
 MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc
 MISC ChangeLog-2015 31549 SHA256 9a573fb1c828c7902f5b51a4f331a7df387a331c49509396799505c3e7c5c323 SHA512 13817496f0b30b421db6c36d2f044b7165a8282420d5124c52a6e5220cddc30ac774b63a43b395f0c0392339e67bcf6a855e16c666de34ad13004ec1d0f056fa WHIRLPOOL 4a957803bf090890dcb9ad77152e87bba98952493f97e75a00718ff024e5b774baca23c554e7ae2995d499d3791a38eb4b83f8126ab295fd2ed7c97652ed8687
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
new file mode 100644
index 000000000000..028dc0551f17
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-14 18:52:56.829467653 +0200
++++ b/config.c	2017-10-14 18:54:57.049467139 +0200
+@@ -25,6 +25,10 @@
+ #include <sys/mman.h>
+ #include <libgen.h>
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2017-10-12 17:19:41.000000000 +0200
++++ b/logrotate.c	2017-10-14 18:56:23.419466769 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -27,6 +27,10 @@
+ #include <limits.h>
+ #endif
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
new file mode 100644
index 000000000000..f3ade248d38c
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-12 16:05:41.000000000 +0200
++++ b/config.c	2017-10-14 18:52:56.829467653 +0200
+@@ -432,7 +432,9 @@
+ 	int i;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++  /* Don't include 'hidden' files either; this breaks Gentoo
++     portage config file management http://bugs.gentoo.org/87683 */
++  if (fname[0] == '.')
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
new file mode 100644
index 000000000000..f0661a39594e
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.13.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ignore-hidden.patch"
+	"${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md examples/logrotate-default
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/lsat/Manifest b/app-admin/lsat/Manifest
index 3e8e96dfa03e..7bb7566831b6 100644
--- a/app-admin/lsat/Manifest
+++ b/app-admin/lsat/Manifest
@@ -2,7 +2,7 @@ AUX lsat-0.9.7.1-gentoo.patch 1484 SHA256 f76f127f56139d8d8cf20ead7dd3e72b0a91b9
 AUX lsat-0.9.7.1-segfault-fix.patch 1695 SHA256 ffdd87e42c0e7cb83f38e5c2876fe539b3af303bf7df041a7d86e49cecd0cac9 SHA512 8be007761729ed7b0162cdba3d90a86ccb4caa10064f64a0fe3c10434227b3a5e185c9ca4509ea877a605161bd0482d8ce8758c1cb853756fe81ac37d41832b2 WHIRLPOOL 28db1025c2db54cbe34e6bab69e40f14d57f14dcd03e1765d41da6c5b27a1c31aa57cf839bf4fa82b02cefc1a8e161d8b800df3a28ed310c2b705ee1f5ea7a20
 DIST lsat-0.9.7.1.tgz 86077 SHA256 825b4578e7e90f937c492722801fd6b35785264747cd6e7e45bded2545d2d956 SHA512 fa67b5ebb03d11e3ee023c921977ddb64ea1fafca1d4cdb4b0fc5dbfa6edf46d57e488e9702175afbbde360a63d02ee5839fdf6576d974354a3b1d57f8860ffb WHIRLPOOL 81db8c06bf9bd8ae82a29ca751e378ffbc051e8184e7dac208e43064960949fe9483522600f023d064411338ea76d83e0cbc8b5d1f7f8d7861a2d73581fbc71b
 EBUILD lsat-0.9.7.1-r1.ebuild 1034 SHA256 b460bddd630e07af65daf7b4ac904c580fd00f6ac3c82b52f079738f61a3c3d8 SHA512 4912b221df15b5bda32fbf5269bdea29259b25785e07b3c30dc1043934d9441e6c81edfcea4d0cb5f0191f22976a1335e167de6c5ae87cf805089094f17b292c WHIRLPOOL febf456566200f07fa308c298db03eed9f87cab06bc8967f8faee7d8bf997b1f7687064c365c7495f10bf11d1829a80c7a505e9d4f080695ee96a94fa5f419f4
-EBUILD lsat-0.9.7.1-r2.ebuild 1005 SHA256 964647ca94f428e7ffdbdc6d5d69f14a0f9289ae99415a775c913243840c07cb SHA512 5b912cca76ecd34375b71c7dffd1341be6936e5998d1f5cc3a3933889308c1982e5e6044edf1a769835a102e88c11e39e6904d744c9fda1bfb39a48a103f450c WHIRLPOOL dee88e861267deadab348a8d2cfd01ac0ae91e7808a4f60e9c13dd83fbf901dce4aa09ac00b8dfa6bc0cc7d628a3417543285b9b286e36d21ca1f6b82023579e
+EBUILD lsat-0.9.7.1-r2.ebuild 1004 SHA256 0089c5cec57de57f6a2740b22406066b4ce68c647ffaca3225b5d1ae58df13be SHA512 c34b4e6717f5ddfd686b3a9de4dff5713fd27deefe5362b6eae0578eb1af1f97a68eee61720368464179e226067c1ed6e91df98fc2a0d8796fcf84d831270666 WHIRLPOOL 019d7ba6e40f026107763db8e43a2a3b8ca7bf1051b1e6f893c9a4bfd30ed28bfa11a9c50c5803f18316536a85f312c805448267633cc7dc25352c99078580b6
 MISC ChangeLog 3146 SHA256 010b9fb14d1940293eb57e49873b4935a9e4849b36196837bbc9980cacd98acc SHA512 bd6ffe74138743c0214b25bfe30677656ec77063fcbec94ecf8067920be2d210e6a1855ec1edb9f4c1880280f9a1ae2f13537b8b1749c1ea26d2ce578d66f266 WHIRLPOOL 32726ba6d2f1390ea964d0ccc08df181b757560b9fae1fcb49e42920ba6ad9bf1f959368f67782820d5e29cfe22a390bff5ba6a3215742fc64dc4d1bf4143b79
 MISC ChangeLog-2015 3982 SHA256 25b25af260af6e45ba1fb74dd1587cfda19e1fee97d551cf4bf23189d21d3b8a SHA512 259aa7f99549c2f2c272c355f323790362c1dc2e249319a3f6d7b54e23ef1e8efcd07bb6f122e1463ed9ee7bf2b9479d3a659b7eedb73ff853fe5ec4185ad6dc WHIRLPOOL f6ce1cc2c0afb7a4448a9b1972b3406a262a7edaccb7392b654dcf3d9685fb7e3575e1cc9df0230bb5249ab43ce357e5e7cd67eb773d4b522d929a6fef914b40
 MISC metadata.xml 608 SHA256 d2f0c6de69d5254deb78229fcbf6f865e5f135be3b8945948a580b32f3a57d39 SHA512 05e9c4d8f92ce5ffabefe6ecab78023c2b0df2c6cc83e7e9c6db837b94b5c3c0f8248d5a3179641eec3513cd646557d2a1028283a03059c722be42c2f230481a WHIRLPOOL 2845a1c38f3b52a0f1201001b4ef6319dd93913379e1cbfb720cbf8a1b012f9273da065416c7f4ddff7d62dd67fd157a3b0ad612d9b27c90e1cb7c5aabe67325
diff --git a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
index ca91252d82d5..40fbb009cab6 100644
--- a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
+++ b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="minimal"
 
 DEPEND="dev-lang/perl" # pod2man
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 28ea9eb26afc..b23b8c2923f4 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -2,7 +2,7 @@ AUX libscrypt-1.21-build.patch 2460 SHA256 00b2c3a5f2f4692d25e3e6c411e146aca50b7
 DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac
 DIST libscrypt-1.21.tar.gz 19425 SHA256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 WHIRLPOOL 7fda5f5118c981d595f9f624ae40674c29fba6ee529ec8f4861b88d9bf11321b7a1285fabd1218356b59e889ddb96c4018513441fb4cebd302639085fcc097d0
 EBUILD libscrypt-1.20.ebuild 722 SHA256 1ab36b25bee260ef3ae5026e0a303fb92d82f7d072e4cbe98b402d78e3b52870 SHA512 482d125da9d0f3a062c84ef70452f6da4c24d3b6fac1eed53b2ffae2faf6b15e14216b8d95522d3fa45306a64a97ddf0e0b5e91f15d0d9319caf174182ca07ec WHIRLPOOL 88ef5dc28d4cc45db4fd515b6e83c090adcd5eb006d995a2db89bebcb823af6cbff87ad429872d70de9c12e2cb5bd209e2764dc50146745f049cddc2618f4bca
-EBUILD libscrypt-1.21.ebuild 712 SHA256 7d067c5d9056ede1c25711c588c596c4629136d15606a2ef1b6bf972c6f15cab SHA512 a370183447611325dbb99fc3706764eb78ea321d09c80d57eb8870ddda76dce0a02f0254fe2bb1259a426eb9cc7439a4b1ffca703ecf1b07fb80f1ce433a33fe WHIRLPOOL 3ae71038cf9454f08ccf1c6bf05b83742db960bc4bd29ce7b115ded9d19e22adb4c9d03168b33f5b5f94e2c5a15c3ce3d65214fa837b3d0893fdd641999ec638
+EBUILD libscrypt-1.21.ebuild 711 SHA256 82be4ba258c8907ff2bb9a4dfdeb30da5bfc9a7b7c3de4e672aca3b2970331e7 SHA512 b5bb5c5eaa5c04da9c8f046589938e5bc40f28ed5e4c1b3c4970dd20bca9cab2ac045a99849c6544a788774cefa6b6e130a70b24f457ef57a9f9b799c0e3630f WHIRLPOOL d2f824e0cb4702e9b9dae242c4913fadcc04546fb6c9b3c0a6290972c830643e73db832e7db07ca2d11332dbcf4659fba28690bd7428d28448cad06abaeec5de
 MISC ChangeLog 2235 SHA256 21a74e80d7dadde6500f36f2081d49630f95ae0b1c3567ae0b4171af45128369 SHA512 5b1798c1479023fe7c895ec5be6db22e40937415b296066de34d0ee02df7750c2d2bfbdf4f4bb3ff738fedccf64b5603d4d1796ffd63525491628727981bcae6 WHIRLPOOL 64021d97cd706b62d3056db19c4336573d55e55043bc581daeb96114be0bcc981d82619283fe02e93f8df51ab65dc18a974e43aa96400572fb446c2e840b8245
 MISC ChangeLog-2015 1140 SHA256 a4212ea3aa533d9b211b3e83f179f0e4d09b0bebd48ef69a1df2e3f736ee4afc SHA512 606ad54de1d822941fa5dac04d6c962ae5eb3059a0819bf26d19ba985b3ebdf0768ae66d7ff02c722711bb216bec08a6c6c5cc55c035622b995b19db1905b14a WHIRLPOOL 028fa99a6acbe34a196e6d3ddf14ec422ee0394dee5f1a0a39e5cbf8282ecc9c388cc249629522bfd32606b4c91ad91218e573c1847d7a0beb5bb7ec596cf399
 MISC metadata.xml 345 SHA256 2b9eaf348e1fb04d7b556aff418828ed4fd94c3f97391cf82d2185822f766091 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383 WHIRLPOOL 7f355b8ac2c2547ea7ae61e0c17adc027216cf63e468a133a523432189ddf72d51ebba4400ea9ea23a991e2ceff43ec819c0c7230a70c1667fe38048f2f98b24
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index 62eb7435c9c6..bd109f48244d 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index d23f291f57dd..39382a4bf7f7 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,6 +1,6 @@
 DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e
 DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
 EBUILD rhash-1.3.4.ebuild 2642 SHA256 e9823e366370edf45b8270b31aec98ad33c175bc25e2d52057eb4a1b9c71fdeb SHA512 a869ce272ad55fc586fcd7ec563e9856ff0a87757914756e1ba46fd3da34ba3a467d5e0454e8d530c9c72975bd5e06f5b42f072ba8301546d01226753dd1d52a WHIRLPOOL 4bde3bb3e0a8a2f815e166ff91dd606434d2026024c9d889479df2982cadd17b45196f05906570926123e65be153a8f1cfd74ab8243df1e0294c49c8c814b66f
-EBUILD rhash-1.3.5.ebuild 2596 SHA256 e34ce948a51bb05b0c446bb8a778f9984228f2973c6ef688a36d3eda811d8143 SHA512 076cf92487af952f3d6b33bda4c7a865eab74c8398b39b53ba6c616887d96e2419e7e23710e37a4beb42466981943d3b7454bedcad88e39259a2e8ab321cac3b WHIRLPOOL eac17557de772e3bbf916a88504569805ead3e32eab22fa737d44aa6b600b969b80c20de070602a552b3fa039cc48b280a5b52db57aeafd323ac1a49129db5f0
+EBUILD rhash-1.3.5.ebuild 2594 SHA256 5031b98fb6d9154ee89cc8ff637a5f97dcb7c021f4ec30f006b9208ec93b9ada SHA512 ab5718c2d1209d090b5b6281b122678098e25b5deed08a5b2915d580140b370a562fd346b4863f0bdcf4d17383dab6dc7e4bb3b5f4dffbd10ff44868c911c28a WHIRLPOOL 265bc2fe08b35a765672447e4ea6faf1131eb65ff606a75a5e3a492a0165bc613ad21dcbfccda675b49cfbbe19970884a30004046ec9a5fa6f6ae010809c97c6
 MISC ChangeLog 1898 SHA256 42a9aa251be9c53c86632be46f1a40bb42fccdc94077e44e67f137f16898c43c SHA512 3c7c8dc6b1497db03e2e09c856cd0cde5947e94bbaa1116d088148d01901459d61b4ec50579dd165fd6a22edb2e28f5ca05b62413a0baeea5b47580b89d2e8f6 WHIRLPOOL fc96a4e7ad467ac1a07d19736becfe148f718979e14ba6fee1d037d6901c0601a60444de8c5f232d4870c91c91e54e9cd8c4fd34c6768209977896a34599f2a9
 MISC metadata.xml 843 SHA256 89065f6503470d30fefb7f8c0edb4d8acc8fb486e2f9c4f0e68756ae073bbf7e SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f WHIRLPOOL b56ecfad838655183ee34037e82528f2a839309a03a26726fbfb6b4868813b9785db132b5f54acca7e400692dd27afff7733518353ada932cb3efd27322cd1a5
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index 15cb69b26dab..fba37fd9835e 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"
 
 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index a4ed8715c5a5..0c77babe19ba 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,12 +9,14 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e
 DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
 DIST vim-8.0.0983.tar.gz 13292263 SHA256 5f3d5307d7055e3a55811546f6c787f1c65d209ae5b83e36c0de16d64fda8bf2 SHA512 985cdcf134c3513a973b4c91a899684a563fca4c347afba2d51892d737c8b58a2008bbf8573a98838da6df16552096e437a5064dc2ef653c7222bbac59ce6136 WHIRLPOOL 98a1ed102182f07e1dc2105b9bae73e1f6c0f7522b25ab91aba4767a3c9d805082a89bd964ab6441fb4185f4076b046a25ca92bf08f0446e4d2a53b0298bb3e0
 DIST vim-8.0.1056.tar.gz 13309986 SHA256 c061d1ddc0f4001415e68678780eac7121d08877a852fae484e6a93f633aec0c SHA512 19385736d4d97a66a2fb3fd8ce725d42c435da09a41e8b40234048626b28d2fa96c4db96a4313bd30f1c2d3733c52097e147c90e4bc11be80d3fcbf12fa4d13b WHIRLPOOL d81b3166f028867ebf48d43bf249675f16cda0118a2e443606a8cae01b0932d3f8a29ca568d088953d4b9d8afe8299ac207d0213ad247e1c10b9c52ed18514e1
+DIST vim-8.0.1188.tar.gz 13363260 SHA256 cd92e56493584128bff13d3104631d3d38e66264101a3c5d59e2488f74f738de SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b WHIRLPOOL 7b19600f086d2f2908fbee5c44876a1775881d9a1cbb54428d4d1db254d14cdbcfe243fe055a754f58027c0166f7dcb1dd13b4db5662793bb7fc014bd76ea504
 EBUILD gvim-8.0.0386-r1.ebuild 11301 SHA256 424739f3da30efe9ef687346cb7cabed45c1eb53b684b92bfc4374506706aa99 SHA512 1d82d7dabaf33fd64236f4235c82d63c3aa872c333aa4969cbb2c31da7cf1ddf019a0fb629568d99f92630b3321ed997eb338bd25eea081e1bdd7d48220bc2ce WHIRLPOOL abcfdf71198ed0ec2652c7b081b63a6e95b83c88080e9f887de0df2fe575dddd96854b3002d9670537e039f7b79c3c64a591b3e81034de31e5442d7aaacfc28c
 EBUILD gvim-8.0.0386.ebuild 11569 SHA256 69e77753590eb348468c401faf7be30133a685586fbaf394ee29b14b997fd7e9 SHA512 93d54860172f0e8caf22d129d55a26276e4ba0d68f91c74dcc969fb2f738f3197ee77de983d65c9533029a04e0cd74fbefabf6802ecba6bb0d4ba0807b68783c WHIRLPOOL ebd0fd418a11c5cfc7bc8c1edefa9c4df7543d7a57955883c1a3e927f775ff71008fda70deafcf0e809e51f81ab5bb6904c49dce27db6816b29c34f5ae7c4a6c
 EBUILD gvim-8.0.0938.ebuild 11285 SHA256 4b694ebbd3757820bab3292265b8cd7f84d31835230e1f731252553e8238c26e SHA512 e734f25ceee65705fcae7354b6e19a80899460315eab3dba1d4258c0915d69df648ddba6a352413e62ea7aa4f552525abe613363fc244a697c0a60cfac46cb78 WHIRLPOOL 8574349e4262adc3cf0942301e00c3898cfb47ededa8385694f19e11ad92777a9d8be8851623b002b70e17cf9e838ccbf1d79bbb1e7cc74608ce62c91d7857f2
 EBUILD gvim-8.0.0983.ebuild 11293 SHA256 76692868b4133172fa58ec6fa7c63b0ba384a134aef1d71edb83082a5afff466 SHA512 16db216752f731bd29624504a113654ac8067d915ff42f96bb304815fbd828504c5934e48ec1bf294f4540453bebd65d0f14719ec13e1d24d9afa3c41e8de343 WHIRLPOOL 2fd94c13e0115e97a34c09816fde05336cc51a98dcfcb1a7396580d697d1bb5ca740d0bbda941ccb1b73dcbd407caf95c37e62dd3f347d2a4ad165b9056f1ce4
 EBUILD gvim-8.0.1056.ebuild 11293 SHA256 76692868b4133172fa58ec6fa7c63b0ba384a134aef1d71edb83082a5afff466 SHA512 16db216752f731bd29624504a113654ac8067d915ff42f96bb304815fbd828504c5934e48ec1bf294f4540453bebd65d0f14719ec13e1d24d9afa3c41e8de343 WHIRLPOOL 2fd94c13e0115e97a34c09816fde05336cc51a98dcfcb1a7396580d697d1bb5ca740d0bbda941ccb1b73dcbd407caf95c37e62dd3f347d2a4ad165b9056f1ce4
-EBUILD gvim-9999.ebuild 11293 SHA256 76692868b4133172fa58ec6fa7c63b0ba384a134aef1d71edb83082a5afff466 SHA512 16db216752f731bd29624504a113654ac8067d915ff42f96bb304815fbd828504c5934e48ec1bf294f4540453bebd65d0f14719ec13e1d24d9afa3c41e8de343 WHIRLPOOL 2fd94c13e0115e97a34c09816fde05336cc51a98dcfcb1a7396580d697d1bb5ca740d0bbda941ccb1b73dcbd407caf95c37e62dd3f347d2a4ad165b9056f1ce4
+EBUILD gvim-8.0.1188.ebuild 11275 SHA256 9b0ec93799e9ed994ac3a34c8695ab677d32a0ec34fbe2f7e698fab6ac49484b SHA512 ccac725f57082baf12dadd5e0d6098c8a4c00079a24bcf2ee2f32813efc97a9c782e986f73bbb875fcec46e418437fa07d4e2ba9776af425f7b511732b2f72f5 WHIRLPOOL 07ad0e05189c020af505fa1cfb2cbd4134053789e8a5641dba721dfc43dbabddb35ac5f235e7dc9ac86cab5a9b85f63dc862b34758063f3797ee3a9b3b8cc34a
+EBUILD gvim-9999.ebuild 11275 SHA256 9b0ec93799e9ed994ac3a34c8695ab677d32a0ec34fbe2f7e698fab6ac49484b SHA512 ccac725f57082baf12dadd5e0d6098c8a4c00079a24bcf2ee2f32813efc97a9c782e986f73bbb875fcec46e418437fa07d4e2ba9776af425f7b511732b2f72f5 WHIRLPOOL 07ad0e05189c020af505fa1cfb2cbd4134053789e8a5641dba721dfc43dbabddb35ac5f235e7dc9ac86cab5a9b85f63dc862b34758063f3797ee3a9b3b8cc34a
 MISC ChangeLog 7715 SHA256 5666aeab068ae894e72060f7623f040d7ffde343a06696249b565fd245865a8b SHA512 c473588caa73e7d1874be8fcf42878b8d5e3530ee73c073382368208b6b0126ab0586e2f5d7b563152be359f891db97a89931dcb65921857629530df6543fb4d WHIRLPOOL 6fcb0617e6f2bf3f8d937828558d86aa9da4950b6fe31c80134bbcea1d6f91ffbb10a7d5d00cfedb5f121837b34d31d8ce464844af6862d00193a521f312bf58
 MISC ChangeLog-2015 64168 SHA256 fd464c76716730dfb6349ce37fef75a93302770ffdceaf00928590215337e659 SHA512 8f0ff5bf344c451d2657c153c82a96e65e5ffac317dd560e08e38ba05ed857aefd0d4bc2e23bde7eb2cfae36de678390c3cbda517f9ee3619ab6b3a3d9821311 WHIRLPOOL 9f83a19841c6c03bf21f58514f7cffea4bc7554aeab23d742348f854a19465727fbedf763f1a70f1db7dc75af0e2490b36c8e7cba83e2780e021dd7af7b633a7
 MISC metadata.xml 675 SHA256 14f61375d274e0ef6f46387961533ff04f74f8f82c26ef0ab7555d4b49667939 SHA512 df75c9e935ae47b8961c8b6b984483b8032e39d3833ffcf4784e2630cea870579d45ef5f104b71d6b35f4128ef689394edd72510fce82a76e596749ce69d835d WHIRLPOOL 9962e6a64cc56f1133041a6e7c023800990b5cc38ca296fd9c364c301db19e237e272097ee64a29e43b2b5be0230ce62ef5415215ce5a6f7aefafbcb73d48cb4
diff --git a/app-editors/gvim/gvim-8.0.1188.ebuild b/app-editors/gvim/gvim-8.0.1188.ebuild
new file mode 100644
index 000000000000..a43f58ae6ed1
--- /dev/null
+++ b/app-editors/gvim/gvim-8.0.1188.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk3? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk3? (
+			gtk? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+				gnome? ( >=gnome-base/libgnomeui-2.6 )
+			)
+			!gtk? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3 ; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk ; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index ec9f6848cec9..a43f58ae6ed1 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -66,7 +66,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
 	selinux? ( sys-libs/libselinux )
 	session? ( x11-libs/libSM )
 	tcl? ( dev-lang/tcl:0= )
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index f86aa9c189eb..404e11acea1c 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -6,10 +6,12 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e
 DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
 DIST vim-8.0.0983.tar.gz 13292263 SHA256 5f3d5307d7055e3a55811546f6c787f1c65d209ae5b83e36c0de16d64fda8bf2 SHA512 985cdcf134c3513a973b4c91a899684a563fca4c347afba2d51892d737c8b58a2008bbf8573a98838da6df16552096e437a5064dc2ef653c7222bbac59ce6136 WHIRLPOOL 98a1ed102182f07e1dc2105b9bae73e1f6c0f7522b25ab91aba4767a3c9d805082a89bd964ab6441fb4185f4076b046a25ca92bf08f0446e4d2a53b0298bb3e0
 DIST vim-8.0.1056.tar.gz 13309986 SHA256 c061d1ddc0f4001415e68678780eac7121d08877a852fae484e6a93f633aec0c SHA512 19385736d4d97a66a2fb3fd8ce725d42c435da09a41e8b40234048626b28d2fa96c4db96a4313bd30f1c2d3733c52097e147c90e4bc11be80d3fcbf12fa4d13b WHIRLPOOL d81b3166f028867ebf48d43bf249675f16cda0118a2e443606a8cae01b0932d3f8a29ca568d088953d4b9d8afe8299ac207d0213ad247e1c10b9c52ed18514e1
+DIST vim-8.0.1188.tar.gz 13363260 SHA256 cd92e56493584128bff13d3104631d3d38e66264101a3c5d59e2488f74f738de SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b WHIRLPOOL 7b19600f086d2f2908fbee5c44876a1775881d9a1cbb54428d4d1db254d14cdbcfe243fe055a754f58027c0166f7dcb1dd13b4db5662793bb7fc014bd76ea504
 EBUILD vim-core-8.0.0386.ebuild 6754 SHA256 8f75d89c4ec220644790a21dcc4abf31764a22d8dfd9b064f57f2ae00c693f13 SHA512 ecdaf79298f242819af450ea366cb51b428f4d0054203dde424bce6ffd754954273f59802a3b1f582ad1d3455d2b844d3b6613f06fe3b17fe43e19102984b118 WHIRLPOOL f0f460dd828f67e5a34056c6610c273a4ff8f1fa06561e6b891adb8b54a6c33a21f1bdfa2e2ac957bbaac78c4a61d471fd67c077e96b67308cf2e9c72be5ec70
 EBUILD vim-core-8.0.0938.ebuild 6764 SHA256 1dc003559e492075c9577d13514860bff86440a114b16149c58569ef5ca7ec83 SHA512 ae48d1c1afd8a62f8f32afe6c6d9c6a9b52352eb594a6c973efae7f42ac480575c1e1f95b1527f346e04a6ad52f649c966daf98a97c684d6419fd9952a4e8e61 WHIRLPOOL 0136e67cd20a20e3d55e33ef92aef3af347eede30079180dcc62b93da218b7cc8f304d1a849c434f3c1f47980822bb67dfb7fcec97f2be689aa59a5d136e2943
 EBUILD vim-core-8.0.0983.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
 EBUILD vim-core-8.0.1056.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
+EBUILD vim-core-8.0.1188.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
 EBUILD vim-core-9999.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
 MISC ChangeLog 8466 SHA256 568fecc9d283b1c6af99b67c5a0ba20fa02cbdfa3cdf7c869054c9ae13af394b SHA512 fc31c71c500181b09cfa36f324531392057e5b28c4990346435e9b7002083e15238fa16661178081122bdf58a5adc8ffd2f10b9527e6ddfcba79263ed58cdd83 WHIRLPOOL ddc6b0a57525d743a7e79dc67354b87f4a3ee054023d29aa976cd475373bf7d24501d51686d48257dc8cf67249dd7bb18b418e650d78ce706298c1647b8d6ba6
 MISC ChangeLog-2015 63585 SHA256 fcbf2e79dabadcfea37e13f90bd1a0da5060f06fa4676551bb5ae5c15b140d3b SHA512 f5431dc90fecae587bfe51915711f2cd117505a034dfa821d412e29898d2046feb7afa98762878b9554d602c4a24dce8807b75613ba7b01fb5747ebc5911fe54 WHIRLPOOL 2410b2440a6eecee31ac1f8b2ccfc0ebc5ffbaf043e95fb4734fd1e22fd4b29093296d1a6b63a8e6e66c5d845a3b300f7655c31e2397eddb2a582033796b680c
diff --git a/app-editors/vim-core/vim-core-8.0.1188.ebuild b/app-editors/vim-core/vim-core-8.0.1188.ebuild
new file mode 100644
index 000000000000..a009ebab1f38
--- /dev/null
+++ b/app-editors/vim-core/vim-core-8.0.1188.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index e43cc04059ea..bb155df67fd7 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -5,12 +5,14 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e
 DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
 DIST vim-8.0.0983.tar.gz 13292263 SHA256 5f3d5307d7055e3a55811546f6c787f1c65d209ae5b83e36c0de16d64fda8bf2 SHA512 985cdcf134c3513a973b4c91a899684a563fca4c347afba2d51892d737c8b58a2008bbf8573a98838da6df16552096e437a5064dc2ef653c7222bbac59ce6136 WHIRLPOOL 98a1ed102182f07e1dc2105b9bae73e1f6c0f7522b25ab91aba4767a3c9d805082a89bd964ab6441fb4185f4076b046a25ca92bf08f0446e4d2a53b0298bb3e0
 DIST vim-8.0.1056.tar.gz 13309986 SHA256 c061d1ddc0f4001415e68678780eac7121d08877a852fae484e6a93f633aec0c SHA512 19385736d4d97a66a2fb3fd8ce725d42c435da09a41e8b40234048626b28d2fa96c4db96a4313bd30f1c2d3733c52097e147c90e4bc11be80d3fcbf12fa4d13b WHIRLPOOL d81b3166f028867ebf48d43bf249675f16cda0118a2e443606a8cae01b0932d3f8a29ca568d088953d4b9d8afe8299ac207d0213ad247e1c10b9c52ed18514e1
+DIST vim-8.0.1188.tar.gz 13363260 SHA256 cd92e56493584128bff13d3104631d3d38e66264101a3c5d59e2488f74f738de SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b WHIRLPOOL 7b19600f086d2f2908fbee5c44876a1775881d9a1cbb54428d4d1db254d14cdbcfe243fe055a754f58027c0166f7dcb1dd13b4db5662793bb7fc014bd76ea504
 EBUILD vim-8.0.0386-r1.ebuild 9843 SHA256 46779ed099d073cdaf90b68c6a6afef3de1954a4ad1dee680e3f3040577e97b4 SHA512 08db4fae98cb400f9c105d1cc2e6938de2e64035e78af6fc95dad9e0dabac7faa46c5eeeb481310a8e6854181e526d6cb2e2521234600e77a482a159eddd26ea WHIRLPOOL 3d75af738e603a9518154a57f4159d44b5db95c6b0a0c4b5aa22b1195415767bce2c41aa2c9f5520c95ad260a83eb217144ea330d204b2f62b311f94a82efb2e
 EBUILD vim-8.0.0386.ebuild 10124 SHA256 bf05c7d3c48a49c8ee2ab91799e2258681d3d8cceb631eb0a002c8382e4e9032 SHA512 df3604a0c5025cc34bffa597107e7ee0013a4aa691ad284cefbef701ede72d0db5648d01d20ddd4791b1a30b5359dd2cb1a8f70b0e75e57fcec7b4f045c8d040 WHIRLPOOL 99e4329f7c78df2b274676805d08224440e10144d8ad4e4ca2e45ab7ce3c91fc10efd3dcafa6373920353b21c2b6999b68e3a6bafda31047adfd93138d18fe8f
 EBUILD vim-8.0.0938.ebuild 9862 SHA256 5f9c53f531439dfe1736f8ac12524c8c4595d9b89ad6facb259837a098f908a6 SHA512 bde375f135b25a2cdbb2fd6c267f6fdb8510c7d1dd263e86b5a8afa1f72d58da7cad91c73309e29e4ba0ca7fbd866b6c18da1d70aa479623d5671b0c96cd3f06 WHIRLPOOL 2991cb67ad280b04c37ed8255003f4e4fcf8fff15dcb8a7efdd3cf0db34bd7faf4c7710f78b00787da4ae345f7dd76ea95936499db394e02dd65197baa82b3a3
 EBUILD vim-8.0.0983.ebuild 9870 SHA256 36d1bea04e71cc0e7f0b978d2254c1543f78199349fcc1697f4fdf906a6fd34d SHA512 a35b7c35b67c493879f19db7aa1d4c401b3673798e4a4bb474ee4c9395d87d53fddde7f384631efeb1497fd17d6f5ac0177091f133a396a81b41098a9ccd8c8e WHIRLPOOL 54e8274dd5ec8ec511641c476020d3c0d940dcd2f7afafc53ec86771df1fd8fbc789ea13819b70458952ae372c8ab6dea1d6ce430ec109c1d5c99712cb53f86f
 EBUILD vim-8.0.1056.ebuild 9870 SHA256 36d1bea04e71cc0e7f0b978d2254c1543f78199349fcc1697f4fdf906a6fd34d SHA512 a35b7c35b67c493879f19db7aa1d4c401b3673798e4a4bb474ee4c9395d87d53fddde7f384631efeb1497fd17d6f5ac0177091f133a396a81b41098a9ccd8c8e WHIRLPOOL 54e8274dd5ec8ec511641c476020d3c0d940dcd2f7afafc53ec86771df1fd8fbc789ea13819b70458952ae372c8ab6dea1d6ce430ec109c1d5c99712cb53f86f
-EBUILD vim-9999.ebuild 9870 SHA256 36d1bea04e71cc0e7f0b978d2254c1543f78199349fcc1697f4fdf906a6fd34d SHA512 a35b7c35b67c493879f19db7aa1d4c401b3673798e4a4bb474ee4c9395d87d53fddde7f384631efeb1497fd17d6f5ac0177091f133a396a81b41098a9ccd8c8e WHIRLPOOL 54e8274dd5ec8ec511641c476020d3c0d940dcd2f7afafc53ec86771df1fd8fbc789ea13819b70458952ae372c8ab6dea1d6ce430ec109c1d5c99712cb53f86f
+EBUILD vim-8.0.1188.ebuild 9852 SHA256 b2698b1f10dfab02e758184b408b0784032de7cb196829fb33e7a48862cb00d2 SHA512 553222b37211dafcbf874c7418cb25e2c9729951bd30afc9ca05b6fba74a0af3dbaa86d61811e249eaeaa7e71db468492c33e55cf1f00e08cf75a679e0f1f352 WHIRLPOOL 53c7bae5aaa659c1f502eb57a2671f8434047aaf426f4d66802b39a8707fb2c338bf2e83c7b822e4963917eec1f261824551190e2930997eb484662be9845006
+EBUILD vim-9999.ebuild 9852 SHA256 b2698b1f10dfab02e758184b408b0784032de7cb196829fb33e7a48862cb00d2 SHA512 553222b37211dafcbf874c7418cb25e2c9729951bd30afc9ca05b6fba74a0af3dbaa86d61811e249eaeaa7e71db468492c33e55cf1f00e08cf75a679e0f1f352 WHIRLPOOL 53c7bae5aaa659c1f502eb57a2671f8434047aaf426f4d66802b39a8707fb2c338bf2e83c7b822e4963917eec1f261824551190e2930997eb484662be9845006
 MISC ChangeLog 7848 SHA256 6fc0792ca6d0bc4bf25efefac019e1938db855deffd2a47a02de28f848e29c48 SHA512 de0459f63bb4caad161089ec6e662cb6f5aba4fc8413de18f205ed5e5ec3b1576fe6d3ad9c5799c333bd3435857801a80eb63d77a9ac3e30c1e9ea44580076d8 WHIRLPOOL d8df884c001bb4572d0c50a0b69ce2cdad81abefc95a66769cde7c34eb50a52db31bb192de1015f8927d123102e0c9c4e1222e02b5955f8aea88d1cca19410f7
 MISC ChangeLog-2015 67669 SHA256 86ac1b2a4e92a9eab943636dde488ccb9351b509b3775e8e11f30e5367d48732 SHA512 f84c582b834fdb2907730b9f409f243e10d98777083a8b9a5b689a803d974f2181a93c7de6d197f4482e6b054992f1324d5e0e9d580f7cc89d6d48947a3e9ed7 WHIRLPOOL 047df580ce408d600fd30222ecd55b24414ee3aaea8cd156728a371a878ee0da86ec18843699bc961a911429c57bbf578bd2d4569c2d116f8cf1bac110ee79b4
 MISC metadata.xml 849 SHA256 ae82c0df451d25d22197d773eb096ca82cf1f01c839f7abc2543f22feb476553 SHA512 a4369827eaaa72339f17b1c673aa5f71625b657afad9d2f6079ffc6fd23775aa8f6c52aca0cb193b4815bc6ca9918617c251767343f7044ab79b83b69038c58b WHIRLPOOL e185dee8e1424534b777c9aab3f39659c97bf24e401e83ebacfc6c2cebd35d7bae4e3d6ce2be7162edb9fc91e84036a51909fa3bd9c149c60eadb1f2d4e1d11a
diff --git a/app-editors/vim/vim-8.0.1188.ebuild b/app-editors/vim/vim-8.0.1188.ebuild
new file mode 100644
index 000000000000..288ed95e5ccb
--- /dev/null
+++ b/app-editors/vim/vim-8.0.1188.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 1514ffa1b1dc..288ed95e5ccb 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
 	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 0bb188bbe35b..73a9787ff165 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,8 +1,11 @@
 AUX 50ebuild-mode-gentoo-1.31.el 649 SHA256 d50596cd7ff2d7e3e3315fedf48181d0d0afdd2e23e628160b37ffafa6f38664 SHA512 59c1ca3ce148d037d16b06cfb5de56cefb608c514f942f9dbbdd8655ae65b438cc04d395647def321d85d7685a5f8ec5e5cf487edf9a5074d7972f489e8eafc2 WHIRLPOOL 713416284066135c0e3fe1d9b51b63f35fde272858fc6c197d847428c0efe2b7b9460b71435052ac281c834e596ca49f5dd58aeb09278886fa6ca5ea3677a7f5
+AUX 50ebuild-mode-gentoo-1.39.el 805 SHA256 1ca8b5002c5ca56bece6798b2f5e94ae6d6a9ae9fe4fbd9a005e0e27d6bee476 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629 WHIRLPOOL 7c26ff47ffbd7e2d9697560ef9cab105bc9f3243946a375cf7f108a6b4bf1ea27be750518ce9404d175573740d63abb264626024796eb10745346dc0f4339684
 DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
 DIST ebuild-mode-1.38.tar.xz 30744 SHA256 63f39bb1a09e29b86e5048f162f4779f287c8825e161a092e74530962947d3c3 SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349 WHIRLPOOL ea61825ac0fd2d50ec9722088b03ed9664708dd6fac076ff3db8323bfdf8d1b2e351c7059f2f77471ea200b7a19d9f67ab233ebdb743ece80218f0e940fb0706
+DIST ebuild-mode-1.39.tar.xz 34476 SHA256 15ed940d9cc600a9058ced8dcee0e88e0cd635cfe85c385e84a4b738ed70e051 SHA512 ba4f082c5b9bf8e80077f31d8134eb06d927d1f34b505a43b093832b3763a84f37136f8458d863b28d31c0512ffa7c460c1f7640f2e107f3eec3f5c95eb80da7 WHIRLPOOL ae2c4cf6783adb1dad058a84794efdd510d972a81961da21adeaf5f36cc9870ecfa80c1aa1ae8fe79e2c10c8082f9f6dc32e6e051f846dce1787843e9f0e78f5
 EBUILD ebuild-mode-1.37.ebuild 740 SHA256 ea837984dc74d7027a9b9136a118f5c94a86ce7c1db2a70ce87e563b389cbadc SHA512 63813337bf774b92901a4b2443cb70587c9e548cdbb2e0e1e210bac256dfac49ee69e2edc34e8f0529b8e251991e0398472ac7d393f3884b95973c15dc1790cb WHIRLPOOL 4aa850e0881a510f045070c0c6211ec73ac349ed4040680f1b5555cf3eed98deeeb8ba41ac88f75aa119502ea05466326bf9a326c784fdaf37d2311513173208
 EBUILD ebuild-mode-1.38.ebuild 749 SHA256 4640a73095d22835815c4ab851deea0bc2e47c7c8832a62414954f39e498b972 SHA512 670ae3060b78111c3b0cd8db1c5515eadf7a08cd177929d2d1505742a76c78b28feec76b073d6c6ca38259abe03430efb7d5002d5ba67ecb39933f5c0540880b WHIRLPOOL 7b37aaf0e5687b29c1026b9685700c90302f38b05ab73426ac56088c60ba36c416ab6117dadd8b2f0dc2223652b383d69d8f2cfa78d307520500f863340b2f10
+EBUILD ebuild-mode-1.39.ebuild 788 SHA256 a19bdf44bffd75311bae9bbff2d30bdd9ca40c0d7bb3d1280e36653359f37a5c SHA512 1227b7747bff1bc0055e7ecd2f1779aa3434c20935728d5ca4ec77124658b5b3c92bec82d8413933f8e2e99798752bfe03bc718b467b961fbbdd177e20728dc5 WHIRLPOOL ff1d7b8df17b59febdf8b58616fdf671434217975e1bacce76696c22481398d59011561573a0a486b0cea82e123121fec3210965b21b6babe35c2bce53bfd797
 MISC ChangeLog 6182 SHA256 534ab954443483d271e0034a7c8f0f4b7fcd31227cf935a43a38ca6c2f529198 SHA512 204767fddb3cd77cc6a43eb28757cf63426093cd418f5543e7470aba36cd2ad151833db54ea5fded0e967733c622dff49b7eda0537c8c13a2bc01ddc61b42fb5 WHIRLPOOL 75f30cba80d3ce29b168b987d57d2ab635ac7882ad2ee7e17ddfdb7205dd2e65f220ac1bc355409158a5eac94e142dd2a96d6980cb39bccfbf117a6621a06b1b
 MISC ChangeLog-2015 21811 SHA256 b971b78ec16e0a9c017e5bd39296c419f794c0321c456f40418283b89ca741e0 SHA512 7cf0456506133464789eb9d40a7f7aee257c7ac43db7466f5f6a9f4bbbe2e72a72ad8a4bf2643dee4cdca30de1825ed0bf39afb1c8507be56a11442a70aef17d WHIRLPOOL b8a63cf919e294ee265fa46dcfb4b1c5c7439d1d7cd934eb587310fad7ff7e60cc88ae4e0003e544bf11a885b2e88710268350bc2b7ed070298c30dc2a5aeda6
 MISC metadata.xml 403 SHA256 242dbd8dcc9a66dcc32b17fbff6a579ec4287bca3e00a0153ad19026ba73cdc2 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239 WHIRLPOOL 419be6da400846e13dfdbd1f4c74b32e82c2bf9b0c7ea620a907e5f5ce84b383a3550a9fe93922cd431cbd51e787f99269587305ff3dbaaa2a05aea20d65ecb1
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.39.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.39.ebuild
new file mode 100644
index 000000000000..6d63bf881edc
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.39.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+ GPL-3"  # GPL-3 (only) for glep-mode.el
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+	packages, like app-portage/gentoolkit-dev for echangelog."
diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el
new file mode 100644
index 000000000000..8683a654d3f4
--- /dev/null
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el
@@ -0,0 +1,16 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ebuild-mode "ebuild-mode"
+  "Major mode for Portage .ebuild and .eclass files." t)
+(autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode"
+  "Major mode for Gentoo GLEP 42 news items." t)
+(autoload 'glep-mode "glep-mode"
+  "Major mode for Gentoo Linux Enhancement Proposals." t)
+
+(add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-mode))
+(add-to-list 'auto-mode-alist
+	     '("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'"
+	       . gentoo-newsitem-mode))
+(add-to-list 'auto-mode-alist '("/glep.*\\.rst\\'" . glep-mode))
+(add-to-list 'interpreter-mode-alist '("openrc-run" . sh-mode))
+(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
+(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
index 9944c6960255..ff39c7c33b2f 100644
--- a/app-i18n/kinput2/Manifest
+++ b/app-i18n/kinput2/Manifest
@@ -6,7 +6,7 @@ AUX kinput2-wnn.patch 1726 SHA256 6d2baf5cbc36226369c74be52dee8ffafdfd4f55292337
 AUX xinput-kinput2 121 SHA256 7ca2277ec979ef93b6d3d5b93530592e5e035fea45bacbda559523770cf98a51 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5 WHIRLPOOL 1e0cb1663d92e1484de3b547f8b95ae6f8c243f773e319c7645decb67e0780fda168915b70d67640d4734b146d7c9f3d148a550d6f9487a690bbee43c4e8f550
 DIST kinput2-v3.1.tar.gz 512177 SHA256 2815c35181f9e9b866fb6e7f3d9bb8814b98312aad703ce5c7560d449eb60a9a SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731 WHIRLPOOL 620c7d619c9f2c9ba0b51b6a544f59be357598687d79888da30ff75ff9a85288cff08d208764d2918852f0233e6dabf26ad37bfa5a5db3b225fae8a0c72b9add
 EBUILD kinput2-3.1-r1.ebuild 1405 SHA256 61b0108f7b1f05f58c23140a77e7c51d68d0276c689a7b71e66a839680be9871 SHA512 5707754a89ed1f48c287ccfcdb9694b159211c9c62f4b31cab3dd1d7d8c17fd8e2bbb8d7f6a9325c9edff8734cb418fd61622e1b46769a1a7db13fdccc364854 WHIRLPOOL 5d71d1d04ada8aa32101f475942047669ae28484beda4c2886e82aa128009cfe3938fa4490a8887cfeaaf4da9103cfc2dc52d67c0d8c958836560a827c4ce23d
-EBUILD kinput2-3.1-r2.ebuild 1605 SHA256 bbca64f528a0dfce25acca3fda280b37d59df66843b2f3dbbf02b31d820a28f1 SHA512 fdd20973f2b6d6023688f69711079a7e12e03629f1e187df40631bd4bfdc79a4a70f07866dd398bb4a6643476baab2b0acfa813d2d1711e156f0246590c33194 WHIRLPOOL 577a1b8469e0fed4aff7d83253d4717c9f4049cfbed47a8b0131cbc95700f968b94db397c625685ef6a3a315e58686ffe005a7ecf3e8dee6b6d678997e479226
+EBUILD kinput2-3.1-r2.ebuild 1603 SHA256 8591f8e4fdb3be41463b25e0dc8e61bd06fb663f1239125ef85eab50580155ef SHA512 d0f027e733e8f3f8dc886b0bd441b211df1ec2c08544425a14033a6eef0a8fd5c631be151f5603786000643dd0f913d2419d18008793efc8d9089c61731a223f WHIRLPOOL 834a001e581218868e7aab24abf3004e8ffeec65e33bfc4f8e6875c2f264389dee5a65169b922a200700622bb556d4471574afc86eb68990e17b0d9cd8c37536
 MISC ChangeLog 2543 SHA256 f4acc6c72f1e2a08c6845c05d8346a17f79c872e1a9837698d890983486f3c7b SHA512 5e08a303b183fa4c61d9a8e51efaed87936385d66070d314781afdfad697930d4168bdc872735ae4d57036f78b318cc7e16e87cafc51e46afdb4d2db562ed3f0 WHIRLPOOL 5d1490d54350b6b451ca61e2c70d97f4939c3c343485a7225a11105233593ae643fcc5ed8e4edeeb2975833fe305d5c45e33c2cc2cd02539fd5819a435357766
 MISC ChangeLog-2015 3448 SHA256 d0a9f4d4b3f2bda23aa2f62eaa391c6152e8f934914fd0498c757be19ae67e9d SHA512 44ff2470092f196683b84dff24a138dfa74db3956f168485e11423e623cf71f94680d36f2af14e41b7ce90e08e04520d9e10847c78098944d4bf13438cb8be4c WHIRLPOOL 16ee52cf8cad2248494685ca9e16be4cf1e96d874948076ba09807b1da5cd7f87c8ca065b00650e0a509177c3eb41755ddcc96f00e32733a87b3aa1aca6fdf61
 MISC metadata.xml 240 SHA256 4351b96b5a18595fae67161f1207f22bbf99e9a2235b95b68975cfc9f5baff54 SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd WHIRLPOOL d279940dd88c4b1caa478907576d5732c8376e3f99830950c6c18c63dca78c7d0ec1983660e5cbd4da0133b961ef38dc8460650cb48467298542e04005cffc2c
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 864011015526..c976b26622bc 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="freewnn"
 
 RDEPEND="x11-libs/libICE
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index df7b952712ff..1844971969a6 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -4,4 +4,4 @@ DIST rox-filer-2.11.tar.bz2 1907026 SHA256 a929bd32ee18ef7a2ed48b971574574592c42
 EBUILD rox-filer-2.11.ebuild 2368 SHA256 6e768cb153c61c79aefe5573265827a469975b67a8329dd681c9e7cb1635225c SHA512 44feeda938ad145cfacd7f74106c619e4dcf7eeca856fbc12aff921fca5e53052a6f11772d44976f388dbfb24cf979328ccc99b364f58b42ea533bada138fe8f WHIRLPOOL ae9c7411fa75e838c38c767425658aa9f01a4a5337b9612c02e1929f63a624b02551c5c4bff6a71c419c3a2c31cc45a5105a8b8cd6f1d08b29c61ed2607a20a2
 MISC ChangeLog 3346 SHA256 3127c3e379554b811a3e2afc9bca2c7d5d618d123584ac02f63e01d9ab08137a SHA512 992a3637769da271aa96d1537beea066b8da3c480f2bc41fdc0ef1720c9638be4b1b6d57c6536f27deb2eb3ab949d72c333a24613e20c45fe2c36e18edd7185d WHIRLPOOL 5408a5c4fdf718f2ff15cbc8a9de9252b90b7b914bdc4c1347c382c5b7d3f078af53bc2a1970cd9d7e294987854627c72a5ce2f3164dcf63cd802e59ac767c7b
 MISC ChangeLog-2015 555 SHA256 431a0f0c3a781eedd02220536dc5cbae0e27dcfd6c108c503c7ffe9bed3d936d SHA512 6c3afcabf3d9e0283f5c51ddf107fe6e0d7260eff10ca11192ee3e5848f332f3026a22a6952b83b39766e04a2163434c0bfea3ea3ba1c78a170803fcbc1f7d30 WHIRLPOOL 7e1622755c40c17f2956a4771728478ed57e147920a969b523e181eb2f411f4e5caa1767951db8ecf29cbae952725715ef6e1b5c919864d1da1bd40088b4cf13
-MISC metadata.xml 1349 SHA256 f4330334cc768d9ce07c78ce1e675cffee77c1dd10becceafe423d24dd066da6 SHA512 b7e3e6645e332ee3799d0c6f8ae34a97e0cd8c02638d2b31cdd7c938fd761cd5c5b38ed9657fb93caa91a3a51eaaa2239ebff80ba8c3906e393f1213bfa19d78 WHIRLPOOL 9eea44707496ae3a3122562a91a684a4bda03d0bc2ed09ce3ac2e92a93ed9ff197903cc1eb946eb03ed33f3a35aa1f33c835624e1993b238b34e4337e7735dca
+MISC metadata.xml 1186 SHA256 ea40d7e132935532d5b3806d88cc8e1786cec4fa16c5102e4cc4b7985d054952 SHA512 2125db81d2e05514947e4a1cdd0460a48a879df69746f32d7643dfa8a448791a16bb1f4df67f2422df667e93fecae7fa65137e531a888d12889324762df302db WHIRLPOOL 76b9a86b9638c8f69a6c80ff8946a9c5fe84145cbe415c97c4a84bd36d329a5cbef2080fa4ff7f34b10eda05c11292c5ddb95f0d183e7a6fc5c8da69fdadf944
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
index 5b7111875c04..0e209964cbb1 100644
--- a/app-misc/rox-filer/metadata.xml
+++ b/app-misc/rox-filer/metadata.xml
@@ -6,16 +6,10 @@
 	<name>Punarbasu 'ppurka' Purkayastha</name>
 	<description>Proxy maintainer, Assign bugs</description>
 </maintainer>
-<maintainer type="person">
-	<email>forestmoonsilence@gmail.com</email>
-	<name>sitquietly</name>
-	<description>Co Maintainer, CC bugs</description>
-</maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers Project</name>
 </maintainer>
-
 <upstream>
 	<maintainer status="active">
 		<email>talex5@gmail.com</email>
@@ -24,7 +18,6 @@
 	<bugs-to>http://rox.sourceforge.net/desktop/lists</bugs-to>
 	<remote-id type="sourceforge">rox</remote-id>
 </upstream>
-
 <longdescription lang="en">
 	ROX-Filer is a fast and powerful graphical file manager for the
 	X Window System. You can use it as a small and fast filer within your
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index cfb73a67f2d4..b0fd6356f326 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -8,7 +8,7 @@ EBUILD eix-0.32.4.ebuild 2360 SHA256 26b9b757c3e31bd1d7b543e885112645d592e6a823e
 EBUILD eix-0.32.5-r1.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790cd458d217d06a3705516bdf SHA512 ce4660b31445a0bb1b4ff1a4624e0f8db7f6a6ced85a8e3b7109e2bd6dc8244511fa95e4b79d130823917ff810529f9e611e92c5a13dba0c0941e089fa6eb254 WHIRLPOOL a36c91cb65c98fcede5563e3e76a87d827c0a941e850e63034fb0af48848c7e6e6f43df83beac3dfb03d35e2c1dc0cdb72bd7f3f0cd4769c9851e1fb10ea2786
 EBUILD eix-0.32.5.ebuild 2454 SHA256 affb1e42e44c972dd070af11bbf9a68394e6c8fe8f3d5869b764978d3e00a6e5 SHA512 248caf260d7f06375eca2a60debc9427326623496a90c321a5f33b141b247c2d660345dfd3aa60473003e02d9e86ba78f14c91c19576f742d700aa7f7dd207c0 WHIRLPOOL 33c8f33093b4c6268f50e044e5ac987cad5b2654a6f2b65edbdb1c13f9b1ab0d384565491bc28a5a59b611b686257789810896818f57d743954f70f73552ced9
 EBUILD eix-0.32.9.ebuild 2937 SHA256 0adbf6b21cc3217c2cf567e9d06ab4a6cd0217fce09ca37ffceaa7ae9f5e64c3 SHA512 6851d0e1708beffaec5e0685d885a0d3d46e93b9bee25a291fb26b6c6837a8003e34c41904218f3af44e50f0fe37c99de4802c0a7909b615264aa3e079cbf1ff WHIRLPOOL e0e7c24899162488df59f74179eb142012968dbca54e7864ff803f3a3b66cb47d6a69c13bf77b029d476f528666e59cc55eaabfbf5c48700dc61003129fed449
-EBUILD eix-0.33.0.ebuild 2949 SHA256 008c1e3ecce8d8034f2b25ad24e3498c166c365c777eeb2de20fad6ebf0080ac SHA512 fdd98d866bafe7c64feecfd4dae28eac41bf4038e2e4db7bfd2b7bb5de2ec33a822df14f73e1bbbc84ba3e0d0a22e8592a2fa607f552d36c9267caeb227e2da8 WHIRLPOOL 0936e2a483dd6bf05097a5124826580af4684c5dcd300fd10b19656ad406fd24c07ace2b2da776076ca8c488f465f74a895386ec2f4c8a4bfec5759013b9ff76
+EBUILD eix-0.33.0-r1.ebuild 2875 SHA256 5b5f9dbfdae314c5104a658b389bd4e2e2026e9dfc3ce2ee7d9407f801c5fe74 SHA512 83747fb3c36f165cf989edc73c00cb6905a002218eefd1058099580aa53ab7819d7765af6626725beef9b32915dafb72fd4b3e7b5e207e434e3457a7f82fadb1 WHIRLPOOL adc0c4340237ac758a41787a81a9fd073025a722563e0ca454ad53c25c6c52b676cf80410b6e6d99d0527b459566b4ff7204c2c1b06aa3bea7705a2847cab82e
 MISC ChangeLog 9770 SHA256 4b50e3176529311b7210564458969cfe7e9bcccbb476d012507a1b01dcce5d6c SHA512 fb26b4781f4a4af63619763afd097566190545b48a81e737e58ea7aab41f12b4bf8e9e713f4302bea29f3779626cf172f5f3713546a51c39ae14f52faef84da5 WHIRLPOOL c3b7f92c57f9b21cf095f867406895c29de2e5f3ab72a4afeb53994d2a75e3c72ab27239b45fa4fc91373f9bdd5e1c8968ec53fa9f1870932992a75bd51424e6
 MISC ChangeLog-2015 62879 SHA256 dd3e3360c5a6ff69ddc4ebd0263adcbde4b4c72d130ba57b2ae304af40f62c09 SHA512 d6f1888e8cc75bccd6609c062689c64d978458b4bd9056a9297016d1419752f65cc19f7c175d0d0ffe4d7ddfbd3bb22b668717f073525a18cd6c136f9e000f46 WHIRLPOOL 4bb43b05071475173f9bc3afa4d7bfef3ad434c0a8ae9de21d8e9aa78272730c83dc21789aecaf886491aa1c5dbcd93b4a5213b6c83b7124b823225bd4b17c10
 MISC metadata.xml 933 SHA256 f46c9806d9a2a4dffe59f1340a0253a56118c509c5338a6d2c2c4bebf51b1db0 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550 WHIRLPOOL e5b8206377b7f671b9e65f47e67d91774d667cb93e42336f5fe6cfa5e1f302a5ba7537e96bb40b96a6926bfeec2f075e1b42f53d7d6e938f5702ddb627e3ea57
diff --git a/app-portage/eix/eix-0.33.0.ebuild b/app-portage/eix/eix-0.33.0-r1.ebuild
index ecc62a0a6c0d..bd9217a151fd 100644
--- a/app-portage/eix/eix-0.33.0.ebuild
+++ b/app-portage/eix/eix-0.33.0-r1.ebuild
@@ -39,14 +39,14 @@ src_prepare() {
 	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
 		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
 		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
 		-i src/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
 	local myconf=(
-		$(use_enable debug paranoic-assertsasserts)
+		$(use_enable debug paranoic-asserts)
 		$(use_enable nls)
 		$(use_with doc extra-doc)
 		$(use_with sqlite)
@@ -85,9 +85,7 @@ src_install() {
 	dobashcomp bash/eix
 	systemd_dotmpfilesd tmpfiles.d/eix.conf
 
-	insinto /usr/share/${PN}
-	doins "${ED}"/usr/bin/eix-functions.sh
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
 
 	keepdir /var/cache/eix
 }
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index de3685e80117..7974c74984f9 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -6,7 +6,7 @@ DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b95
 DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
 EBUILD portage-utils-0.62.ebuild 2255 SHA256 521aa5d3d09a887c1971d6f2003840feba084f26ab58806bfbda8113c57759ba SHA512 7623733d270ec35228f8ae3383ec123a4593e764aad2c960ab37ad3e08e616cc60e690dc59494dfcf4a06162ff822377bda580a0393beda20ea026bf557cf22e WHIRLPOOL 74b65fa301f624495c83fbfeb47e1f1d1e34efb2531778ab2ca2df9dd42c97db5b668c6e11464071b88183637c4b38824fc669363607eaf05cfb1c1fc23a975e
 EBUILD portage-utils-0.63.ebuild 1202 SHA256 3b1d9e46fc06983f68e1596f696e5577a1ac915e2f8dc30810b87be66c34224e SHA512 59a8f22bff1da852dbc0b4cf6d37b98c8a7dbf4c1fe5abed40f771479471a08de418a4e898d90b6e52fd13a1bf92e6a3f74a88792bf52b54de27d9ae41cec3ad WHIRLPOOL 5b99ad53bdc322a9d4216c018b98d430a3f3003e8b0884be7b2613f3ca89a38c4040377f3b69502542db819b5ed96c75ad48362c5b357578680a4ab1e4a68962
-EBUILD portage-utils-0.64.ebuild 1095 SHA256 370cf1d787311040e3d0aa5be13d783d0ef2bc02acbcd74dcc63a5b63f07f185 SHA512 24baa7729a7371f39ceafde863d19789a17654e982107ac0dd9392bab7d770328db4b94c7e3031ff251766ddd5b95e9d71fab3171fca0bc4fda05223ce3eee67 WHIRLPOOL 00f861a61e06fff5fa0f6a5479c7f437f17719e3e178812ebf7bc90de4e2f418f1954ec7956bb80f25431e9f05cc55f6dd05022740753afe0454df69fd3ad4fc
+EBUILD portage-utils-0.64.ebuild 1094 SHA256 495e54fb94738ce605ccdcdff58d28024338228e8c2512b60623091a7a43646c SHA512 bdbd5bf3c037f4d07ae7734438141f7c84b4a8de45f1a7c1bec3c8a76a04a4f4beb18856ac74aa9ad266a592e1f76f2cbc0d326c37a307ce0dde93ca1af70a94 WHIRLPOOL 25ab67151c102e9a75fda3732237245d532a5c02fd388f9a42bfeea5020f4205047ad481b08004208ba1902bbd3c8332c65e4f16726e4f4eb232f0d7c3df04cd
 MISC ChangeLog 5551 SHA256 ff22e38cd7884953731308cce4eec5c58ab6fc20346fe1f63b67b8218f5a3045 SHA512 b60867699b62397ad1eeaa58a1f7a39ab7582b73df14901a3d7fc12c7c073a31090e051b8e5de4dca5ab5998765b20a015783569b2678efdd19b6d868a9b4ad0 WHIRLPOOL 69858193d50d6c894f176dffa6ea92cd759a1ed0eecb3403d3c695211260f9301e3dac724f0ab9571f74afc2d28b3e4512f18a5eb7b865eb97c36ec47bc31385
 MISC ChangeLog-2015 29800 SHA256 fb987414375c6e0cf3014c646223045e16cb82678578617025df2a8b51c05312 SHA512 3905ac03de51f61ceaeb5873c57702459af1dc6158594015752e2b72a636006664ee1a6da783f531a27988352d73c9dd8a68aa1775d44fd9649565ca380a2134 WHIRLPOOL ee3a960bc7e66f1f5501b2ad24aedacc7fada42337a3f3a7a6478098e48177f8c334749b13272fb27ba4ddefa37dcc3d85826decabe7363230bcb80973cae427
 MISC metadata.xml 214 SHA256 67bae2549564e628c2309c047a10077b3864da7f3903a79a64597be1197ca4d4 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd WHIRLPOOL be2c2d84627f9fd53ea5a6b1d1e7bb570423c19588c69157546fa3f6d615be5f98caf2227a0d218ff4ca5df3433baefef6f6d2d7b1ecdec773f8ba8689477758
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index 59bd71fb220f..25e6dff758d4 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 01d1a28df532..8151539ec91a 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -18,7 +18,7 @@ DIST zsh-5.4.2.tar.gz 4482413 SHA256 957bcdb2c57f64c02f673693ea5a7518ef24b6557ae
 EBUILD zsh-5.0.5.ebuild 5072 SHA256 3f19f1a91188f9ba78412d8653a5d4f258b6c115500504b5b5bce11c1bf3213a SHA512 0081b5436de379de9bc164ed04e69fcd34481a738d192013091f660cb0fedca66bad23fcb129694a13993d6f2e26031be9a34768eb7329371b112148dbf2b433 WHIRLPOOL 2e3601a158e38ae106dc392c30ad68db6b43c63b333f6c9b06b32d020e59d1c58d1748fada15a3058fe5f19eed1d08f3bdddcc86fda99f02c28156a97bd93d4f
 EBUILD zsh-5.2-r1.ebuild 6003 SHA256 a0e58d57d03f763f2b6f0df244071c2a6c90eea756a6352103b9a617552a3a7c SHA512 69524e436c27c178a06b0cad5a67af9c54e6ac7ebbc6c9d62393c80e8ad8a2f89d02962ee3645d4857ad7772c1dff2cdc7e6b602813a184a413876ef2d9747c1 WHIRLPOOL 51fe230e26dcaa8949b7722c972e6ca0e12ad4af2d83c49cb86ef7946637a59863b1b04d9b935ee6da67e3cece350034014cab1d62616c3928713c8689dae6d6
 EBUILD zsh-5.2.ebuild 5902 SHA256 96c65d855e64c69ba91f06458f73f9b74401c06a6a2eb3a4a2c82e5f18c8ff7e SHA512 951baadb096bb2741bd53034e992aef28b7be5e829364698d434764a41d18cbb55eb6b552d604934d79fb959030f0c89f44a829d7f3251235e83b340edad2c0f WHIRLPOOL ef3a9772ca996ab9dc4705e2e465814929ee2020c951c0d9677b48dcccef0795e48d1321ddf140ce8daeb9f1e6042004a03bc0c5ff179108cfebf0478a6229c9
-EBUILD zsh-5.3.1.ebuild 5998 SHA256 b3588a158b34985010a4ff146623d62bcc762fdf2ffc2045c576319f8e652463 SHA512 9fbc2ead9f0c1ce2fc3108415bdd304302d31e86525bdafc6ee9dc0225daef0853c52c4c74bf52f10948dd03aa76550f8a0f25d4a05585b1acf1e9ea24367a60 WHIRLPOOL 2b8f4d196e5533b62ddd2eef6e0284cc873e40523a11df318f81cbeeef9cad853888c24f7730d43b5c69defa8811efda91ff19379aac701be822d68709241072
+EBUILD zsh-5.3.1.ebuild 5997 SHA256 531db857f22f55d7e013d4e927e4e8da2c882f467ccbd32e06fa4b1364c5cd4a SHA512 6bc0beace267b10a93c0b7350f5f52ef73367abd53f3efd663fe8dfbc906a8f4c2331309064331ace90617bdfbd9d8d4cf7f1492135e69a3ecff110981489a0b WHIRLPOOL 7338613d2f745e8f8d85c1ffa078c47c2b295fc6dfa0f03b27122717d45940dc38bda882b4c3707633998ff894bc5f1e1fb25b61de5615c37d533fa3a09792e9
 EBUILD zsh-5.4.1.ebuild 6033 SHA256 7863669fca1c9b1f089c2a75750cd600b3559eb8fc82eb34e63b16263b9fb887 SHA512 569866901cb07fc0264e7f29fcb061ec70b191fd28c94e3f186604e44b1a520a1b5a636a726b99fdf7d4617cec3148ae45d1188c25096d1ca75b5fc3cf5c037e WHIRLPOOL 78f9484e303973a59d5f0a542569a6b686709bccddba300003b970b293b0acca648d23f9d81f5a4caca26599f9786e65f10ce7f7416c18bff6317e0df90df5d1
 EBUILD zsh-5.4.2-r1.ebuild 5829 SHA256 fd67393e6024c3e64e69bd6270823945c935ceb7d19e8b5349319100fd32aef1 SHA512 aa8be68089a1b7eae939a1face739920b72c99b25ffeda6bd57e5d58e924cbf6a0ba35de042552aba237bd26a4cd35e0955c8596a64876cb01e3a2673642f5cf WHIRLPOOL 88ca42ba0762e06348360dff997656ebef1a21c90aaaa35b474212b6eb9904d361131a74334e6266bf28eed5fc16a39d13169fae77ac9dc4a7a509a77aec7404
 EBUILD zsh-5.4.2.ebuild 6008 SHA256 4d5564f1cc4d38cbc53d27dc5f5d8a76256c7b07732750977beb7872a50c0bdb SHA512 0716185d5d48a367594ca1ef7f5eb12731421d854e5f85fea3b824cddf68e0e3f85f9343b36ef0511c424f9191b642b6066fccd7c5819d3d8d10b63a5becacfb WHIRLPOOL 876925c8e2bc5c5ce52177d11b73cb87c9982b8b123e4155e815a94d9c531a4d2305b336739917b6e9ddc203aa03d96fbf99cff40b37ea672ea3b060766d05ba
diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.3.1.ebuild
index af63863dfccc..800cc73344a4 100644
--- a/app-shells/zsh/zsh-5.3.1.ebuild
+++ b/app-shells/zsh/zsh-5.3.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 14f9129d9a64..961c6a6be079 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -2,7 +2,7 @@ DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769
 DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
 DIST dos2unix-7.4.0.tar.gz 710339 SHA256 bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9 WHIRLPOOL 89f093ff96aadbe64f5fb448d2be337464a0059cee3009cd513dbd0315b486c012efe53273467774dc9f884dfe5b1a4ee65903b94c2c5dd8c062ed3e41eed94a
 EBUILD dos2unix-7.3.4.ebuild 2026 SHA256 2740f83a639d0e3de27e615e429dbbd9bc61a6ba67addcea2ff5514f9d288e71 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760 WHIRLPOOL 3a6302216ca7ffc009902dae8475991151f0dcb9f8a38b7b46deb2a05b54eb6fc0388021130f911a2af5c36006631bbbfa4ace248a5614319da0cf2b3c77c923
-EBUILD dos2unix-7.3.5.ebuild 2041 SHA256 2134816b5f2c4d25c8896b6f43091073acd719371e1c8b33b5b64fc014b4d91e SHA512 bceaa3ebd9c0ec8ebb21cb1152972ab74a21dce5978a67e346fb253e5b9c5899915dfc8807a47d1fb79e70f2d04da616d185dfd0e0f02b92ef2cde75068aef93 WHIRLPOOL 0ebb37f2cafe208ab0e570cd3a6af6ac74debf1f6b4bbe00343b48959487db19484d347e69465073e2b6ba1526a395f5445df5ab28bb4be6145c06b981a83c4a
+EBUILD dos2unix-7.3.5.ebuild 2039 SHA256 3371b893e1de59b1dbd63793ae157375256b2277e97dcd9d4c4a723da16df76e SHA512 c2a358843659b69e1c32164da741b8fb4229cb603d4928a193940df201321767d00e0cfe084d69a2c2d34c3b13c975be083ec5f90cbc27b53332234c94a6056d WHIRLPOOL 517e7708852bb2b65a662a03a4b90d93efa9f619aff82218d96af01d49b0c46a6a8250dd8ba90e66ba2002d6c4fc75c1b1022d4d2f1a3bba937efe2ca234fec6
 EBUILD dos2unix-7.4.0.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
 MISC ChangeLog 7196 SHA256 4a2c232190d6729640540918b5be7b533c2edaaa445f850cc6a47b9c3a59f04a SHA512 66da70a04731f3bd299bc577885b31e3c278016b38b1f5228394a384f960c49a0c3e97154ec82ef1489c9a9fce195077254240e458f649037e6859b0c060fe50 WHIRLPOOL 48484b065ae3a96f6c15a454e701ce60cac060d2a1e1466afc29d18544ca2f9d2d5cddb60820b6d8f400c568d1a2386febc868662587b5ddf6c9996ec7adf5d3
 MISC ChangeLog-2015 19680 SHA256 99b0f5f0d9a2a0ae8117f683cd295d8a8c5b0cfc2208325fc96cdb7c6ad416db SHA512 6921c2763ca5d07eba46899fc0ba3869042972fc9d60e85c835eb50d08b56ebc6a176a64d1e808802b1afe5ea7b6c2ad74f773fc50e55fbd83ee224c317a003e WHIRLPOOL f9e49b2959b16982e507cd9b67e24d9d5fd535d1b61676f1621a012ec2c15541a5382ab54aedd635669c13be995ce008d77dc52e0110c168da42a6d407465cf5
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index 825339eaa92d..d6307cab1895 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d0cc76eee58b..2a5789c56e95 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -18,7 +18,7 @@ DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
 EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
-EBUILD poppler-0.57.0.ebuild 3861 SHA256 270e5ac0a32ad32b074cab62d1b103fba784545022b6e8f028d58b5ce11e000e SHA512 e45b9bae903907b99e33e878d5aaee3fda48316914894bd17566a7453a6f84dd1d2009addedd2547cbe4037f31ccc590c33797efca10e989cb3e98f2ac5976d9 WHIRLPOOL b70bf74855823c84f77a36cebb59d4d856096c3fe16527626f7cfef97ef9dd7ec624409c1083de483234407c4a7b2f5ce19903c32641de9325748649eadc4055
+EBUILD poppler-0.57.0.ebuild 3860 SHA256 b8f3c78392de5cbf6e992eca3b12fda183563aba3865f22208d0aa94a73815dc SHA512 41b0f7e8d15f0b6c73f94511eaefc8f40095c999b5b85424abb1d76390c886c4b29d212bde9e87038977be43c63344c38a486d78d7c9ece9ddad9da12f38febd WHIRLPOOL b68a29c70a5eaf6dd7955a983943a05597ed6e38387dc0c6abf84260bff8b547574e47c18b3c918380b654ce4cab42ffaca7db358f13a7a7edeadc709b3b2523
 EBUILD poppler-0.58.0.ebuild 3866 SHA256 15b2567ab3f0406649403383c4ed72f8efa4a56a12fa8953dfc2881202782d2a SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 WHIRLPOOL cb2c8b25c56519c3f8491084950d5f62205756078fc810e9e920bfe5f884e9abb15e4d0d1eee204699dd3701c8db3021ace8d6ddc21c2a42930d6a990056e59d
 EBUILD poppler-0.59.0.ebuild 3866 SHA256 025009ab5401a66987c0212a6db8e217ad30e0dbc71ef3a428bcee0fde6daaf7 SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 WHIRLPOOL e4cebc30bd49442c22bd83a9c83da6911a9c6923ff42cb0b990831392ed29c33212d17ab8aabaf3a07e4458c0d1b31c9d223a0c99b75186f58a31d634255536f
 EBUILD poppler-0.60.1.ebuild 3861 SHA256 a1c0de6efb508cad5181ddf6fff049677198ec917c8d609b8cfe0ab8d554f651 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb WHIRLPOOL da25c7257a4538fbed96fc656fbae8cd1663ceacac243cb8b8974ccca625598349bcab3bf05583c57d0b01297cb12ece6128eef94d9e8cfe8ae10da6b8f71dcb
diff --git a/app-text/poppler/poppler-0.57.0.ebuild b/app-text/poppler/poppler-0.57.0.ebuild
index 4f93e5af5dab..468914589979 100644
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-vim/vim-spell-hu/Manifest b/app-vim/vim-spell-hu/Manifest
index e57114d293c5..73aff3a50738 100644
--- a/app-vim/vim-spell-hu/Manifest
+++ b/app-vim/vim-spell-hu/Manifest
@@ -1,4 +1,5 @@
 DIST vim-spell-hu-20100312.tar.bz2 2516564 SHA256 0da634528c98e7aa2bff23b8992d713291155b1e9e09eeb61dff7face8326469 SHA512 44c94f84c3edd94020fdae430723b2e264113d29f5e295e6593274741ef094a8fe1dfa1d692cddc266f2cb3d58fa5601f80576d4ca55fd185c1213e983a3fb99 WHIRLPOOL c68ea642bf1598a924896149af8dfad8311acf4492e150519ea023b0fbc51be2ec05dcf6034665ef24c2de662f33f52ed3181ff14d113aa78bae5c0259335831
+EBUILD vim-spell-hu-20100312-r1.ebuild 258 SHA256 2b207bf9e8b7556e012d8a9a3c462041884c610a4aa96b14398756c58a2e36d5 SHA512 5ccb073545b744405e7f99dbc4981fae9fa04b1a85a5f80ec3d22c6adf4d85e452357080a99bf78a1fcd6341fd1d443139686a9909f3c9e28d56ac321d4b85d9 WHIRLPOOL 846b40902c031a84001e89975ff7b1350c49e99f6af33ff9d0a0acec97dc18168ab0090fac46df3f03e13b969201397711af68d0456fec5568b3c6159008acaf
 EBUILD vim-spell-hu-20100312.ebuild 204 SHA256 70a938fd7d2c0bf257baff70aa6227991cd01dc03021d1bccd8026acde8d917f SHA512 70a3d0788c4dc216f2906aca07228418bfdbf08f6ed6fe231afaea3e7bf31407a35d9b14e060972f37354467a1612ca6f717fde19c14296526ebfbf9d226334d WHIRLPOOL e78dfac638c95289605346998f1a674ab0fbca1440076e95cfc29e101e7b7108c5e84f2a4dca1657993d8c1b012ec97f7e686aa7e0926621a832ddb0b6a66164
 MISC ChangeLog 2447 SHA256 acbc3309c8b0392d255024e17cadf4351c6ac6fa0a69022ceef37443126fce0b SHA512 797f8bbb8a1cae523a8188f534e4a05655554248a568a55f62bed69a2bb7845f14d1fa8bc62b8c40c12ede11f5ecc35b98a8488f798236cd1fe3ef176512510f WHIRLPOOL 0713308c467c378016568e1304683f38e68bfc0a44dd41f7e48c2d5a6299303c2365187309732a70a6edcf81d7a7ec4fe7aa7756fd64acb33b2c8b6f8adbed20
 MISC ChangeLog-2015 908 SHA256 df4f8dfa283bcac8c81284b0fd4cc33be24260cddaee3a24253fedfc2bdd02e5 SHA512 9ff0d6cc2761eed1977e347de5f928351cbeafe96c260725ec3928272f548dda6d3c012df3165c60d111617c701c02ab530381b5e42a023d05fa6dde065c122f WHIRLPOOL 3fb3a7c6ddfc39e8e01a5c6de7526465074314b50c29b29de859b50a274bf299731336fd6bd80f18bcdc6d5e61bc986bef6c0d57bd0a322c1a3efa4311dd1695
diff --git a/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild b/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
new file mode 100644
index 000000000000..bf59cdb47997
--- /dev/null
+++ b/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Hungarian"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-it/Manifest b/app-vim/vim-spell-it/Manifest
index e4290cc9f9ea..73b30023d6a3 100644
--- a/app-vim/vim-spell-it/Manifest
+++ b/app-vim/vim-spell-it/Manifest
@@ -1,4 +1,5 @@
 DIST vim-spell-it-20100312.tar.bz2 874072 SHA256 e9e8092d8cc3cb4b949c8a96aa08d0b6fd66aa3ab6fa610fae511184217ec236 SHA512 7f215d65a798c64c33f38c52205f5c15ce132361d078eb0c48ea5058c97da21b25c24952b15a2737b6b8d1de1d5bb6fbbc880acb57834e6d00773ce97c80de5d WHIRLPOOL 3bfca30a21881111c27d9faf8f0bcdb87a98a131f74bd094abf46dbb988b60e62c09e67a6acd5556f7cb1c8fc613cc8fac0483dffeb0c8ff782e55434e3e7d17
+EBUILD vim-spell-it-20100312-r1.ebuild 256 SHA256 7432b6234c228cdaf3c3d018755b7782f70adb5b97bd421f27b4c5982aef1291 SHA512 94d3b28d85d6c90465139388acf6b518c18a0e5c21828789ecca8b57754e883465974298d2d855ec5dea6b584b5497222ee2a937763cf072f0a8b6f51c015b14 WHIRLPOOL 70f4a4b2b52b3bec104ce8a3337da411a47d6a34e4f1b0bb97fa7f5dd83154d65f414b21433787ddac1171ad8c0b5883b80d6f2130c687285caab6b5874a1e42
 EBUILD vim-spell-it-20100312.ebuild 202 SHA256 7832c581c9cb18c05ef0827f09e803b84710c3e56ee4a36af5fae8a8f54ad185 SHA512 4716dbc7456e9336a6f7d91db1268b039e45b7fcbe33bbe09795ce7362c6d97b56610bf865758864f618dc5ca23f28754590521b9c8ba6336f48a42cf514d32f WHIRLPOOL 46d1c94b3894eaf1ffc28f0e9fbd6c40c6c39dbc76a001a680ca9062071aff17eaca6021992e75b7779634aad87cda793cff7d542ae5feccb664afdd5a291706
 MISC ChangeLog 2447 SHA256 d9ca8555c680abda1e437bed53037af05f478022fccf1d07ab0c6896bbaaf10c SHA512 2e56da55e8f4e3d4b9ce05d9317ffe3d0fa7d9907cbe12dab6ef3b9ad3b569f02fe28f540800d126e86a6e08a1324b72debb1f56d057f59f0ae471caafe51913 WHIRLPOOL a9f46c82fff27dbcaca21f048c529d1fd3a43a1ce377e345ecfae7c318014ac87c84674ad9cbf3a889a5ec27a0845152c4aedcb4ecf6bb1ec67f47407d9aae0c
 MISC ChangeLog-2015 887 SHA256 5b5080848946a433bcad988b636749aeafc671c44b34db473b91e27f85e2ba9a SHA512 0735122ef02b7f0ce4b80de031f1207d32d1d8d11f28744c4cec22f076e9043bb12022e2e228115e325d8703242df98b6c8fa96a6ffc4bf5137f187e6f2e13c5 WHIRLPOOL 681f8cd2bfd1a543ce0c77756597bb2b610073f889e799b5ea15c3ef7c4d593535f765d7e4c9342bb62c6a89f6dcea42df26c6388055d1c78aa0a9fd6b5b3393
diff --git a/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild b/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
new file mode 100644
index 000000000000..80bb419f6708
--- /dev/null
+++ b/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Italian"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-nl/Manifest b/app-vim/vim-spell-nl/Manifest
index 8f4cff458bf3..efda7fb24b63 100644
--- a/app-vim/vim-spell-nl/Manifest
+++ b/app-vim/vim-spell-nl/Manifest
@@ -1,4 +1,5 @@
 DIST vim-spell-nl-20051007.tar.bz2 670750 SHA256 053f1f37d6df8e281797368d810dfa78e7939015b57c492727b98f37e5659c67 SHA512 5d62c84178c91e139516181e35c6e2802aaeb1897e70f50dcad93f7ad7efad1e9f983334bc7d3a3a3355e20a535c2e81096583a3ee11aab0f49698f4dee03c5e WHIRLPOOL 00f264f4b6079de691ec347a6a82f577da860ac639ea844022f0419c916b48a96a6bd651b822708ce80efc002c326005d16143febd055bac0711f8827094d7db
+EBUILD vim-spell-nl-20051007-r1.ebuild 301 SHA256 bbd67295152facdd7882525e502114233fad12881804529ad8123a2cb37ddfc2 SHA512 08b1937b2ce267af8fcb21cf22791c68a7a5fbb80f23a4e1a88e180aca999e066ae86c7864642b26cfa9f20489003cb1399a83306ba3a67befcc5ef893b8f3a6 WHIRLPOOL 4af44140ac64a2f9c56ddcd475f0fc1f40e66b2f3a4d227806e8dc9dc1b1d24d61fb1878b517ee1a616e4afe9f5dfeb7c6d42d25f66daf083feb941b6c525853
 EBUILD vim-spell-nl-20051007.ebuild 245 SHA256 6f8f5dcd84695b8ae55f98ef430a2875e508f9c13ca190179bc7b0587a3a3ece SHA512 7e053a1cd02429eb94943ea2add6cf36bfa0325d3d570b9657836e087d0f2f26e73c6cf58b992c1386ca983fd6c97f6d678839cac1f8ed15c6aebd4d8cde5855 WHIRLPOOL 09b0a9758d98f791a9debf99ab5aae17df1fd710e738109664f36fe23d870c45bf4eda8664e6f98a45a7cde631351a9a74f89438ab311e7b5d4602ad776078cc
 MISC ChangeLog 2447 SHA256 d1ebd9cd4ca71fbef533a97ff7c01fc69c9d7fdf21a9633df1f21fa47abad071 SHA512 948663827974d7e913c279b92d99ce8a59ead7db33d351e9d04ac622e72a27a946da1677db69dd44d36da6da6ba37119d56472171d83906be25393b4888581d5 WHIRLPOOL 8aa7d7c5af4a29c98d8480f0730b0237906320d94f341ee50bf3757be8e72dcc44966319bad3c90fbaf55c688e60b9bf5749837b32eda9a5e9850945a28c8f71
 MISC ChangeLog-2015 1487 SHA256 3f105a5481f6fc013d3893a15a88211f29956f1ecebbb1d1fc9b33ae0225fe24 SHA512 d79ab47c3ac2a6053048688afffd6c33d91eda6c8bf77abcb6d1c648fe663c4f2688fa2ff8900308c95358d174b286dc6188a45840a311c88774c66ace7cc9a8 WHIRLPOOL b1fb77b5fe8e3a9fd6e94cca1593c1f00910333fb233372a66b74677d2a1826e86b3f066c361f1c3a12ded51588eb44ba61a318618354a93a808556100dfbce8
diff --git a/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild
new file mode 100644
index 000000000000..ef1e2910c49e
--- /dev/null
+++ b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Dutch"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-pl/Manifest b/app-vim/vim-spell-pl/Manifest
index 8458a042efff..657cc8940318 100644
--- a/app-vim/vim-spell-pl/Manifest
+++ b/app-vim/vim-spell-pl/Manifest
@@ -1,5 +1,5 @@
 DIST vim-spell-pl-20060218.tar.bz2 1489524 SHA256 3321d7c6f0a8163d5a20a35cb591c85393d9e2259f3408e19cb6ce15570821aa SHA512 a83900e0cf0702c70498bbf47c9db5048205d0a70ed8fcd7c984353987fa5a97334093cce7844ad639a80a910bdfa644302191d8f27d465af4a53bcaa42acde0 WHIRLPOOL 43bb2e14736e2ab5e27290c6014b1ec3d771adbc851ec6eb95af1773422c7a3c9a6823e426c2818157c2a589d78ab86fef31afc87f0a8eae5693ef61672eff56
-EBUILD vim-spell-pl-20060218-r1.ebuild 230 SHA256 c30178e2a7b234cbe4541336f17dfba12da525f57de64c11744bb9dfcb118308 SHA512 007562dbb10e84c3a0dbc3ae3dd7b40b20fb026601330479a8e2e2b33226c66320a049799402fb8f217fd1ab779a4d1f087925a982d6e764058f7caa298a3ce9 WHIRLPOOL 2f928a6d28900601f65e3f9a6ef0a95af7ec2c7c6e0e79ab64a936fdd984307fd63c516e4966a69588821e4d2c5d0b79d37fe5c3eee9dc7abdbe3fdcf6e95cb8
+EBUILD vim-spell-pl-20060218-r1.ebuild 274 SHA256 2ee297b4e36a1d2e8cd9c49b180faf23b16b7ff8d5854fa404c7371ce7c42a5a SHA512 c9f93e29018ad9eba3bd1ec5b9a69c0dcb7b489a00282aa8e36ac44087b27348d626cde0f241259011b113a29c89037c3df64fb7d1312da04939112c252d5ccd WHIRLPOOL a377d09079a9d359eb9fd5593b8e8b57fc7b91ac5daa7254a50680714ccc36c6ecceb80b06d08c7d16c2f1bd51a3cf97cb77243835d368e9af1820b5444bcbe0
 EBUILD vim-spell-pl-20060218.ebuild 218 SHA256 9e9374a3722224aa1b1520f2ba7a593f1243979a907942c8b702319cc8dbb8da SHA512 51e5db44ef701ae55a83d28ef16ef68fe6b70d2675e44db0718be8f2ee8625aa904b23f6b262eab20d6fddc1f11226ce0e1a44745d68f60edbffea5cc024f1a7 WHIRLPOOL f136cd82cf3f471f979f185f8db56f49d00de5f2ba8e4d32b6d87f0c3e369e9130b08432383019aa02f6f0d43139d91dd8c160029fe4cec6eae7185b2d8444d1
 MISC ChangeLog 3154 SHA256 3c0cf16d4b1813f1d42eeadbd719dc0a9b2d3cbc680a3eb6037b292655eedba0 SHA512 639289f6672d5029ff33b654f4307c1fd941b4be83a2df8431e0c1b2ed485f7a4aaa26c75d53d49d0e8e50d730eead2d85f206c8d08bc81c3e9b8d51fb5218e7 WHIRLPOOL f29043cd0349fa8a79184cf45d038adf2e9902bd49343473d4b792c793e25d3b5c579ad935f191f3b7de9f866f778465d4a2f7fb2d86e7fe69f2590d79fe2bac
 MISC ChangeLog-2015 1591 SHA256 efa318ea535c88b451f5921b98bb47997133d37608d86a479155c39017a989d7 SHA512 09a9d6112b3b2a0c59023b3aede2fca0081fd53f7f51aa4ccfbb57b256db0615f30deaf11ad4f1ddc6a22e68fc6299870f13fec7bc92c16e1635fb9f12144bfb WHIRLPOOL c3d24ae5150109b0e9f88f3eb8e26b677bc18361613ef68b3ec932c68be89bde1feca6941bf1005e384bf4c771b2100e344cb3d3922ede57baec19affa7aa7a1
diff --git a/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
index d452bb97ea6d..0404b2bca303 100644
--- a/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
+++ b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,4 +9,4 @@ inherit vim-spell
 
 LICENSE="CC-BY-SA-2.0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-pt/Manifest b/app-vim/vim-spell-pt/Manifest
index 88643af914be..e1bf785b7c66 100644
--- a/app-vim/vim-spell-pt/Manifest
+++ b/app-vim/vim-spell-pt/Manifest
@@ -1,4 +1,5 @@
 DIST vim-spell-pt-20100312.tar.bz2 2018267 SHA256 d6438b991192ef92b61140d832367349256ab40fd0c6cffd839e772e90de6f32 SHA512 0bd90524a4066f1b7d29ad85389557718cae5d3b6815a0037e2ca55987658278f0a1aa5e02614fc84a5862721a58404d8582d62ee6e8d15ef954e004481af49e WHIRLPOOL a9356edf1d987d31e83eff9ee24d87007f7adad93d449a1586f88c5c891ac0b0fab28d1ee1b193d55abd6e791496e957b8a73efef7fb2fa1fea6997b163bad17
+EBUILD vim-spell-pt-20100312-r1.ebuild 276 SHA256 338b4bf642eccaa26b6d069bdf9fa323351128da2892e0e35d42a4330ebc8789 SHA512 c285ffe7ec195944bb9d669a2735fcf52ca6cdf36bc3d77ae85d77dd4917471f5838b6a6726aff0eabbe2863cf41e5da443755774ccbb01f90014c859c42b079 WHIRLPOOL c69296be0f4b3854218bb941fc7338464546611f7758aaf3f84049a31b177dcb74e5a124ec248933be780102d7bbea100162a1514a528a9f035c4d66ec33ea1c
 EBUILD vim-spell-pt-20100312.ebuild 222 SHA256 d9b631370c37e509ad0b7c6a54da69f3f497a8bff948d408cb369603f3d02236 SHA512 a463131c68c2c897f40c0a33b77feb9a7a7e5d642747a81ba1d5e764101c143eaa9a646d1d3efaa5d9c90071e518b8db1a1218df7cd8fa567cc5acc9847661f4 WHIRLPOOL 24b43db4284ddf4b2a0b5fa1ae4f4edccae4c561982df0cd7dba4ff4e2faa94291a3a0dc6bcccec7215962fac471a97960b8aa4f83a249af47042259288d5243
 MISC ChangeLog 2447 SHA256 686a730239c228da3591d1833f61a9a3211d3b60bc935365763ba2a1b3d44b1b SHA512 96b6c45a12dd877fdbbdcfdf0803cb94d3f9f094362775ee211c4ba5e8ae281925b6c5bc9bc52157672735ed14fb4ca019ed03cd23783320a239d79a3c3c399a WHIRLPOOL 9de4bd24ba3d8fc6d7d9563751d89c68f47aaef68c3e2da7810c442ed5d5b9f7348751f829f1ca36478979617d8adbd2831c55bf607febdfaa5cf28483b1ea85
 MISC ChangeLog-2015 804 SHA256 74422fe1b2c7d14395b27e6c53faa0f5868dea85715ab9dcf77ccdf558e4d89f SHA512 2ff3fadb4c76ad3f4733470a4ad1748618a71fd7c6f1ceb9048abd99cc296b5a6f483f15d4af530ca8d021d6214321e967b802bd5a9e276ae430556d252bc7bb WHIRLPOOL 6b92a4ded049d9e46c21c908c8916e618b9e23bbbe430485bc9db9a68cd8513ca88bef932f9b4da73dc3ae181530c14fb2f6414dd3628fe6e46430ebf016cd1b
diff --git a/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild b/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild
new file mode 100644
index 000000000000..40eb74010166
--- /dev/null
+++ b/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Portuguese"
+
+inherit vim-spell
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-ru/Manifest b/app-vim/vim-spell-ru/Manifest
index 1c5c6d090e60..45c1c39ff4ff 100644
--- a/app-vim/vim-spell-ru/Manifest
+++ b/app-vim/vim-spell-ru/Manifest
@@ -1,6 +1,7 @@
 DIST vim-spell-ru-20060506.tar.bz2 7242609 SHA256 c5d7ddd556a7cb2ff3325e66f76189bbdbf142a8357f3de6af74094044fa138b SHA512 d36bec4b984a3eaa45ca8c634fb4bf83fbdb1eb7b282b1d71838c503da4f70f82eda589dbb6972a70ad7f1fe89bedf0d54b51bef8f46ae7d09114a535746b4b5 WHIRLPOOL 611f1e2b8105e3296c75a6092e2bcba81d250387ca8d61ada5b9c92309ea3b183b8b7efc06af320f123a00273fd2bc6205fdc8b644507602eae4c2cb56c2a0d6
 DIST vim-spell-ru-20070506.tar.bz2 7232867 SHA256 cdfbea6e6ba8f8714ebf5e5078f6e6a129a834b9e4d130f91ee7c7ebfec01a3e SHA512 268ff4c56299ed06e329c8342c3d9ec567278c8a8c0a90d56f6320052d7ee38b17b1724e0f8fbf72d616285a9d7ba3a8e7a1f5f4d78ff8bdc41c73655eebdf33 WHIRLPOOL e493bd448e3a4c7565018f1b6effd941c4a83b0f5c5975022eb1c21a5c517bce1d7f57faedb1e545b6616d733d242b9b553cab9b9892cafe470bbdbe5fae032f
 EBUILD vim-spell-ru-20060506.ebuild 240 SHA256 1cb4980eeb1119b46b1aa8a49a0243e44effd35ee4d515ae042b971fa656fc43 SHA512 87f0a05b962ef952274ccf16a1b02ffd4a10d00f0ff4155e6b596e653fad061775212f7de4d6840cede7b618a9ee7e985f26ea5c3954b17cd3963e51128558cc WHIRLPOOL e37649264fd214e8ba96961b267cbff582dfef0352a30b19ebb7e411d01fd95f0e61a9e06f798841723868f6dad27961d043aa4bb6aabdf68e0a9a7b2d09cbfb
+EBUILD vim-spell-ru-20070506-r1.ebuild 293 SHA256 5d0d8f543db63446e4810c7b200a2d42aae4de77ee1129463df4dd176342b9d4 SHA512 388dbe5a610a714285678c4f1363317acc29978c89a5e879b1612759fc7c6f715201fadd70696a9db2a5d8a3e69a531c2249e36b4ebb1f7a491d4043586644ff WHIRLPOOL 5662ce6e97790bbf7ccb3804d68c7dd0e3e7c348e003a41f4a36f61677b12b114e3fd22f13a6fb5948a0a9efb7c3fd10a5f9905f8cc49bc53058b81e25115bd4
 EBUILD vim-spell-ru-20070506.ebuild 237 SHA256 4c41fb7ac21c4e46c9839ed9f0c2e9f1e4358abf9fe4a61f62a40ef695e78187 SHA512 b73cd65ba9ff3e6417f3f5edb411e06d915243418e8f04894be148c74446e2c8082f64a678b05b85c05e4797ee2b743ebb62e0cd06bcaf809a709b3e78716109 WHIRLPOOL 3c77c923f95b69d3609c6f9ea8aee0ed3cb1abedec1ffe738c77c112f80b7b1d3263a947c67059016e6bb017301e02f76d98a7de9e6390388b99afdfe5726d85
 MISC ChangeLog 3096 SHA256 f8f63cb6dae2960121cbfde2dbd358616b3b6de4e296a56d6fec48f59f054b88 SHA512 659c6d28b6f54307eca6f0f60e09c3c0a70eda829faa163a4c599ab23c4fb16df32480c09bcd2374dd74a2deacce8ed80457edf30aa4cbdee12dfd06b7326c08 WHIRLPOOL fc95d071327e6de6166d19ce8f88487b3ff470000d51e901f37ec022ce93e2795450590aced4b3f9540e96c4270cbf997cfe9babbfed4d9c6a0ddc35b5de6406
 MISC ChangeLog-2015 1930 SHA256 f2b3a8a50c6a0e7a48fb1558c7115002b64c28b8d3a0870d282bb2da84ec0df4 SHA512 882c2f969b69d1bf203e7362bae281e508c8bf9a9a51178ef5b27d48f2f298359117c39d67baba82061cf56cdec3a9db860b09827e3e7791101f978d1d07ff06 WHIRLPOOL 20b3a496fc90f8f2a00f43c026af6da6b5aad049f249a962b84dfd3d4bfe0f6f8718fbde2071ff95fd6682e8f0980d8ba1e9113c9d8820e0a6fd90c0ff3498c4
diff --git a/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild b/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
new file mode 100644
index 000000000000..8eb066351635
--- /dev/null
+++ b/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Russian"
+
+inherit vim-spell
+
+LICENSE="myspell-ru_RU-AlexanderLebedev"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 7c7c5335e42d..960bc2c05c19 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,5 +1,3 @@
-DIST pgadmin4-1.6.tar.gz 24595129 SHA256 514c021994c91eb9adb4a42edcec12974b473175289d48a5824b8c0f4e15e0c8 SHA512 115c2b0f1fd205912ba5fa51426de8c75ce979a075a16434ced3421186794fef756faae58f81c9585359cbe31b7bde24b773cfc886a64d349e656334349f6387 WHIRLPOOL 2697d253cf4a05a57fd06576636ab689c883daea46eae190f57ccb0a88a77e0df5e57bea554aca844beaab4cc9e10ecdf0607a0aee24468ed0602c78073f98c4
 DIST pgadmin4-2.0.tar.gz 24988176 SHA256 a8c8052d9e61f3ae357810bcabc8ffc8b02a0c39730e1f14d9a920ae7cae6ccb SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67 WHIRLPOOL 5685a6d7c4fbeb1c4629ab30908e75792ede775afe59895462fe1760b45e33a7b67e5942eabb63400eab9c757aeb1f872d0146161839f304cb2d2b8f133a1ff5
-EBUILD pgadmin4-1.6.ebuild 3378 SHA256 bde889c71affa93d6041019cb42590c243a5d612d4ba36679155a9ea8a70b9cb SHA512 4f36248b9538041a6b837986fc53e56c916ad3247aa674130dafc598bdac6286121cc289ac9eb184e9d557f579da38b3412ce2bb80ceb07d92262bd37adbd433 WHIRLPOOL fac15cd3858d12a522fd304896afac277ba231d04295cdcbe205b847c4abe2d400eb701007c458de655b7085de33d54b450792000aab2a6f0f8bf94868ae76af
-EBUILD pgadmin4-2.0.ebuild 3378 SHA256 bde889c71affa93d6041019cb42590c243a5d612d4ba36679155a9ea8a70b9cb SHA512 4f36248b9538041a6b837986fc53e56c916ad3247aa674130dafc598bdac6286121cc289ac9eb184e9d557f579da38b3412ce2bb80ceb07d92262bd37adbd433 WHIRLPOOL fac15cd3858d12a522fd304896afac277ba231d04295cdcbe205b847c4abe2d400eb701007c458de655b7085de33d54b450792000aab2a6f0f8bf94868ae76af
+EBUILD pgadmin4-2.0-r1.ebuild 3430 SHA256 289030224d816cfcbac3d1526e82f386059a5f9965e0385fed46db722d227180 SHA512 10d50efb96498eb3abb76943ab2a678c9b3a39935d628906a6a07b9b9d666ab6648eed4b2c4d6ecd0b4a61664dc4cf25cdeb4abc5fc55c2915a87d40e4f0975a WHIRLPOOL 9755db85507b6806c8f02c7181c383f7821c39882ca6766281dcab5e3d13880372af3fdd8ce55d2f2b2e18ccbf3d4c5084c304524e395b5bebc2a2b52440e94a
 MISC metadata.xml 266 SHA256 eef85725585b45398124c5be76b10938c155120d7fb2af2d50082030a59b2d71 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325 WHIRLPOOL 9f0cee39655a0947e3f8df38dfd33db69caaaae947e85205ea842236c257f70e6f2e5a196d5bd080a8f670efbbc57eb487bb89ef31a36aa28deaab3e7e36ce8d
diff --git a/dev-db/pgadmin4/pgadmin4-1.6.ebuild b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
index 9357a0e8f27c..932530d0a98c 100644
--- a/dev-db/pgadmin4/pgadmin4-1.6.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
@@ -46,6 +46,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/flask-migrate-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-paranoid-0.1.0[${PYTHON_USEDEP}]
 	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
 	>=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
@@ -80,7 +81,7 @@ src_prepare() {
 }
 
 src_configure() {
-		eqmake5
+	eqmake5
 }
 
 src_compile() {
diff --git a/dev-db/pgadmin4/pgadmin4-2.0.ebuild b/dev-db/pgadmin4/pgadmin4-2.0.ebuild
deleted file mode 100644
index 9357a0e8f27c..000000000000
--- a/dev-db/pgadmin4/pgadmin4-2.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtwidgets:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwebengine:5[widgets]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/click-6.6[${PYTHON_USEDEP}]
-	>=dev-python/extras-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.12[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.9999999[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.9.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.11.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2014.10[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.14[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.0.2[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-		eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index a730e7e6fe29..86a3f9a86a4b 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,6 +1,7 @@
 AUX clanlib-0.8.1-gcc43.patch 605 SHA256 97420cdbef4a3f09b61ddf54881a907616b8c73337928fcdc6e11d783f584320 SHA512 c1269c01852fd2912e895af82f2b109e7d81120a18dc3a7e2542a7bdc80e1da151c5e8a82914eb1fece2e51db17b7f1b99198dde6a36fa437dad3e9b4d6a8b83 WHIRLPOOL 8ac30a9eb0fff42711af134ca4f1f6559c902c76cbdc4584723b40bf48da47df40531205556cddc95bcb6efe022311e890c1a15474ee19c371f15a8faea39bff
 AUX clanlib-0.8.1-gcc44.patch 1523 SHA256 e6b8dc302fc3587fae86d1ecf4ac5fbaf2a0563996887b38ea3f55d84b79e979 SHA512 7c3b154affede758a0ac93f5c142144e8a26c65b7c50a443b49633e0c2835fdfab90c6363d4b1997bfb53b0112bc16ca12abc44aacf7af927329e102fc1424b7 WHIRLPOOL 9551cfd00c00711127a51f1680b148b0b93ccd3bfa22d60150a73e1d45d7e7df949c3571f932bbd695e229bccf4a5fc2463d9e5bb4d152838db52553a1b9b26a
 AUX clanlib-0.8.1-gcc47.patch 338 SHA256 fd5a02a670575f6298516d201bdaecabacb13ea01015e8d6abca1ee1fa41b06f SHA512 08f9719c97e0bf5fab83e56a881ac7a3edd162b052b5e8fea5878badedbf266b36788f77afd93032f4129ea8e50a83046f5672675e6616cdb29cb6fc5b6c635a WHIRLPOOL 6231a9b6270ac4da92c1a7d8645bb0dc492454eba89f51b559d103e37a3ce56bd1905726515fea18cff1bce8e1b50b2d8cf69db3a516dbda99174e471b67b2cd
+AUX clanlib-0.8.1-gcc6.patch 530 SHA256 5f8f08aaaa23c733645e984b67bdd39203b0bcec3d0853f7b707b7c6053f0dd3 SHA512 94a49f2aed8487fb03b97219802fd4b525b1de304d1dd3fcc9f7ccc392d5385438005c8198e3db8ec666f4fc875860159fbac94e5d90626c8aaf8730d3831f72 WHIRLPOOL 4c686f0d7b59904950dabf449aa813dce2dc51a18c74716c4d4ff3fff94d60d8977f2659aa7908d5c06a35d5847c47fe40cd11a9c4c26dda22752969bc05f709
 AUX clanlib-0.8.1-libpng15.patch 377 SHA256 6e6a878d16292255cff4f64605db6478ac855f079505434ca9a2f61aadb88342 SHA512 735fd6cadbd1c76ff38a229361c82c1208ea8ba8db60bd8bff082424244da9e88f1c74d8067991516866887d6240846c551a24a7f392a12ae3a2d6ce50e8644f WHIRLPOOL e35e13c89f90583fd4878b149fd9d6e8ad50131e11f94672171779f397fc020c58e5465a61774dedf467b02916acf113a5af28fddb502ae7f5f815df45474fa4
 AUX clanlib-0.8.1-ndebug.patch 866 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419 WHIRLPOOL 05e452b4d264619eaa8e30e5449389974a6d75e8d064931ad40e308a94203e0858813234be8a1e44b3c6279c25a95d3f6592a4f6b753e3255329d858a2a4e0df
 AUX clanlib-2.3.7-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
@@ -9,7 +10,7 @@ AUX clanlib-4.0.0-fix-build-system.patch 622 SHA256 cb81f0954ced1d4f320435724f0b
 DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
 DIST ClanLib-2.3.7.tgz 26132425 SHA256 d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2 SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a WHIRLPOOL a6547d0bc8d254e887c427dfff63deb2b69790124da3db49d54cf853f8c834d44172a06e92ef7fc5222c8c81f903ab29f186f85da698dc085f4138d147ddad68
 DIST clanlib-4.0.0.tar.gz 7435551 SHA256 9b35052308a2b933bba76596930ab550fc8cd1f80155fc62aa648a23c3f4406f SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe WHIRLPOOL b541c0dca233570f5c203269684de2a187391f35278722e81ca64b5f9fc3d61cb2f3cb615db6d4d7956369c04fbb9aea165a0ee5df0210b5bd50ab669d4fd691
-EBUILD clanlib-0.8.1.ebuild 2045 SHA256 ada284bfc014683723b20c8be67f4b8c636b7d5fa1e265b53a118c2889b0c14b SHA512 6080681892d8a0e5dad2d8a8e075e83efb9ce65583cb0d711c6fe38828613ed6d6fc754ac5786737946963c456f4e2a554265ebc313a3c54b21e41a3fa9f2350 WHIRLPOOL 5b76357490f2eb34883e49d4429625dec7aabd6927b33e7405cc783f861ab1951d1a0ac058b7c61a9eb5133fd77f20d27c2eae3353919bfbc51d0aaacc3191ce
+EBUILD clanlib-0.8.1.ebuild 2079 SHA256 82184e3bc5354fcbc857ae5201b0e93f20e6dd42fdb64e3d5979126dbda56536 SHA512 3e7bd7c08bc21337c31632275fbaa8c677f59e7d892be6d36740c3ea06610191920994ae4383026db46cd1d2521d7aca576d779c809179a90442ab8401e65860 WHIRLPOOL db124c08b169ec51c87748b64bd7312355f36e06cde3f7b339956d7e7c1e4ba7de2bc41939f637e4f582846e8863e8c93bb2245356aa4ffffbd7a73e892b2b31
 EBUILD clanlib-2.3.7.ebuild 2150 SHA256 5d25b701681f474fe338ab61c12601e792c2672dda867db83b0f9ca98cc8be06 SHA512 845fea2f039d35a937f75b88deb866c7db55903254b664ae0fa86520f5d0a7ba111466284f6be99ef6422403b1cdfd45ba6f7ba0ff97d26309ab65ba80eeef57 WHIRLPOOL 495c69a0fbb5c7ccc427621609e8d056d968712642bfb176914759760a7f79203372db6c6d141338bc81b99c767264818e3269e50337eb01c9cbd21a6a7758ed
 EBUILD clanlib-4.0.0.ebuild 1476 SHA256 bce1aaa77aa718a04c3c84442e34b7db8b17806928831cd5594f9e2e42a06f7a SHA512 ea1285fabb1db6cbf41f3f92e948b9627d832e53c7ef3de7dae23c42a790d85b0f06f1860da98b9e7367809148fead5c5a70928ea007451cbcb46ddb461aca12 WHIRLPOOL 6db03aa0e805615169fb4883c4f6f84bde7b955a07eea2d45ae226b5c331b9d1026f1f8ca40640e6e738bc28cfa368e74a5edb198a83139096f03b6d585a8d79
 MISC ChangeLog 3462 SHA256 7f8c3a60ef606da2ff52ae6fb26f65453000880ae7fff2bb80f0d268837b6176 SHA512 da85daa7455b4a25ce5fb470d772bae2276375cb4466ef5e6c3a143dc13e043c24b9904097fd1768fdff680ebdb38993ea0729d2cb0938c8c7f1698fef72c142 WHIRLPOOL 446ed0a8066a39b0faec14072dedebc9b0e032acb512a121e61276c34134ef3ce82076f14e60e5e00595ce145fa144800d301b3cff571d9562110f50f1a00ea4
diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild
index 0e13a37d97d2..dbd437a41db7 100644
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,6 +40,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc6.patch \
 		"${FILESDIR}"/${P}-libpng15.patch
 }
 
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
new file mode 100644
index 000000000000..95284c2de4ca
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
@@ -0,0 +1,16 @@
+Bug: https://bugs.gentoo.org/596112
+
+--- a/Sources/Core/IOData/Generic/datafile_inputprovider.h
++++ b/Sources/Core/IOData/Generic/datafile_inputprovider.h
+@@ -142,9 +142,9 @@
+ 		void insert(const std::string &resource_id, int data_pos, int data_size)
+ 		{
+ 			cache.insert(
+-				std::make_pair<std::string const, std::pair<int, int> >(
++				std::pair<std::string const, std::pair<int, int> >(
+ 				resource_id,
+-				std::make_pair<int,int>(data_pos, data_size)));
++				std::pair<int,int>(data_pos, data_size)));
+ 		}
+ 
+ 	private:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 3993fa95e4f5..3ff0e3881bb1 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -2,13 +2,13 @@ AUX ocaml-rebuild.sh 1120 SHA256 893320630726c58ea3b501ef16913c150c50ea9d6cd38ec
 AUX ocaml.conf 177 SHA256 b7f7ad0ff15bec096dcb87265d87f9b0ce8f946d4a2676dd7638ca0e14bb05c1 SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4 WHIRLPOOL d25c9ac2a565a5384c7f645be433faac192e4c41f55a08d74e99ec022ce06132a560070bb4771b261c6f023d3aec72fddb47279d5ab2cfe8cc93c70c97ff16d5
 DIST ocaml-4.04.2.tar.gz 4061873 SHA256 6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512 8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb WHIRLPOOL b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
 DIST ocaml-4.05.0.tar.gz 4431750 SHA256 e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225 WHIRLPOOL 75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
-DIST ocaml-4.06.0-beta1.tar.gz 4558889 SHA256 d46ecd2f69782760241f56744bc41f1286d8864e38f8efb15341573577d37435 SHA512 c7ec8468bae99cd5d7b3a44ef856c3b000e60004c9acc590fd0eb0ef4acbc59a79ddee35c765171b3c58f6c1b2663194d6b0d08d668aec418f056a265dd49012 WHIRLPOOL 37b200dd7adf19acc60224b8e8dd51ef146187e00d796a25685b19717fd8d1644bb6c7a80961654db5bff44d4ab9e182c36e4b959b2888cf30718527559fb29f
+DIST ocaml-4.06.0-beta2.tar.gz 4566450 SHA256 65130faa992c11a629f0c08621f64cc4ee34368d3df64636fcf1af31f2cb4b26 SHA512 d4c46ccf01e38736b946879298347cedb81dbf3d26fc877fefc11eb42743cf8e0133b419805f3ca0fed52d7338549f18ca5ad378f2661939e526b6f803f26483 WHIRLPOOL 102da0db2e7d3e0615dd5f23180df51b8589ce3833e8dbd1842248c0a0f3bfcaf3fd50c753b2e7129880fc29d9c6a7b0170d3c52d570f2eb2437c56cd1e38a28
 DIST ocaml-patches-10.tar.bz2 943 SHA256 4fbd5ca4ed1755f8a37d8c101342552a4f60c8c0b651e46a703b8da8a9451894 SHA512 fe39066c25267f2ff828e6746bcda5f5b1e40e22a063d83268cfcc2fcda28dbd7e714751466491385d054ba2eadff2d0a4c407d5fe5db2f98931bdde612f07e9 WHIRLPOOL 752bfc72838654b8448bb0d5516f10eba77eb399fb71953bbad129db206567340f29b8d8568c2ec728e3fe17ccb858fd161ee3d451570d9447c9f63f5d7ac582
 DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
 DIST ocaml-patches-9.tar.bz2 1700 SHA256 1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 WHIRLPOOL 185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
 EBUILD ocaml-4.04.2.ebuild 3525 SHA256 34864087bd68836e6b980412904b17209961a9826cad6de135f60e176bdea9a1 SHA512 5de6fdb7e790131930308d9200a8a9d4403007a1f80430e1d80b4fc97bcf270a533c9a91413266721a4cbc83ba798b831cfe2c2ab6aa698b83a1e127c5e46795 WHIRLPOOL 9f09ab532546e9e032e88047d1795f67a4991152f3845623fa55da7fbcdff0bccdf6fce948696d63a053e107be9068e130a75d1caa7086c6ade63d80a7b504c2
 EBUILD ocaml-4.05.0.ebuild 3683 SHA256 626573c53b07fd1bf44db62403ae3cab709489563de2a78ef71158edc3f8a7f5 SHA512 21c549fd5c02f4850d7f240f386bab8e16e884909d61ff34261cc9faed4e883af766229910ac4baf5e261c4c4a11a33af85f34d29c9681161d892bed79bb859c WHIRLPOOL 8a8874ee33fb81a4873d4c77174eb69fe0b7f8388db2177e396e82658d179ba9edcaceac97d93dc8490dd5e8c351248ce454373f624d905f2d03d025bfe0322d
-EBUILD ocaml-4.06.0_beta1.ebuild 3617 SHA256 d57d16a1ddea24dc76f3a8b1ca02666f7ab52de47f815f5cbe1db1210aaebeef SHA512 203a07d771e228cf4a6f37380f43d3f92d8972e427aef417d3536e05e5e0be9377bb2877caf39121870de71423f9c962cd70269d8198175ca9d333c3fc484a7d WHIRLPOOL b116c36d643f0d0344021b6dc6dd6a5c9463c43249f8712786cfc13aaa43c3356303080c0dd015cfde537c2351b77fb28b75ce303525d837ded5bda20e48e062
+EBUILD ocaml-4.06.0_beta2.ebuild 3600 SHA256 4d9760d4e165940de5a0fa5cc3eb93fbb29149ac66e2f7158c80bf477d208577 SHA512 8fbb565e749e65f76774abeb0fae3cf4b683d765291e6ef96dd9b1eddc70e7c45bf133e9b071170e4f5dba7f25232151d06b385aa69081063684b9213a85a31c WHIRLPOOL 02af5f3238ba264fb88a8eefa2be4d9e644e197dd192bac26c679f489031b1a7e4af0c248a23685609f66101291dfa7972c642bf298cfa468cee3f675ee4847f
 MISC ChangeLog 6950 SHA256 a6352b62089b1248b5e36ea1ed99af19b481ef6b2da7767135959785249ec140 SHA512 b016154abe9904f90f893f38f949691afc5b92fba081bfc8cd58b211b84a0f4e0b8b7253919fd3ebe69ebe97f8c3b477fe26466a55cf1f12f34b3314bf9ce9f3 WHIRLPOOL af739a72c399cdc31e19f12aa6db8e3b3dfbf1d2df310c5a7876e0664467fe7ffee068b0255e14c5cd01c1c71688700835b1b42129c9fea4be95d824cbc46dbd
 MISC ChangeLog-2015 35188 SHA256 85b9f07747d3a242acec77142ea296133a59bb9d79261d6960cf1e407a1ee2e0 SHA512 3658b2c40895f5dd5b2a74f01aa27bac1416ac2abfbfaff9176331cfe6aff3a4a81e62e222c85a5bc9f36779ca2dfda24c64fbc9e530cbfb64a0f1d221954852 WHIRLPOOL 1108b78932d6ecdc15624297ef6165168956587db4cd0c804e63554daede6be88f76860c76bc8de78131c0d10b9c344406de1eb93205765f08aa7644e4dfaea3
 MISC metadata.xml 684 SHA256 1f995f5ba1ee7b37d07d64c88f3d22b5e06cad97df407b28d3f061c766e06b0a SHA512 9b01c74d5b46a1342840bdc6a90dab0943a0072ae5c65d9edf902ab04b6f911600e8aee4c8b89e3b35a7f4e018a13eecda59c4df64e03a05ebeeb2ebededf58c WHIRLPOOL a53011ea2e5c5ba285612854a045e3901709ef30c351390b4523e3fbab88ead8f1b8a9c584bbddcb379b7a8e47fef505c2597a7a0e5427334d87badad9037388
diff --git a/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild b/dev-lang/ocaml/ocaml-4.06.0_beta2.ebuild
index 0c6b2bbfed86..85cb7d57e42a 100644
--- a/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.06.0_beta2.ebuild
@@ -16,8 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/${PV}"
-# still in beta
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
 
 RDEPEND="
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 9f76ef2e2f07..bc5f6449068f 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,5 +1,7 @@
 DIST amdgpu-pro-17.10-429170.tar.xz 121382128 SHA256 cb1ea7f9756f197a976138d2c00f239ae4ee43b839fbb1ea57f8770957d4afd6 SHA512 2d9d0a97478564e259dc8494083df8dc13e3bc664384978aff369070b1105703653d8dc4dca38e94dc8bdf3ddfb5c6f4de39cec5a9b263423de8fb91fd0117c6 WHIRLPOOL 1e07579d2c9d5d8a796973658cbb6627418b133a630ca5e977f93da0d27b900da2078d2ea8b35a13071b0b05e3d5e7f47e17d61042dcca60709f6599c18380a2
 DIST amdgpu-pro-17.30-458935.tar.xz 393634984 SHA256 3652a5c9476a650a3e3cd89bcd7ac119ed7d16a570501eeeea6a902cbc6f9488 SHA512 3f517ce13e102edb820f8f9538e0894c794d767816f99774fbfec342adb6912712664f069db2542412baabb24ee198204f38757407c29aff238ed1772dc3caab WHIRLPOOL 29a5b06657767255ace0529467ca56a904a021254f7dab854b1fd3ac843108ac346d3c4e97e10ef53844152de116581bff7c3aa8f4f066a08becb88e59918da3
+DIST amdgpu-pro-17.30-465504.tar.xz 394216628 SHA256 b74494d142542164b5582e8bed845315f788aa3d9eb0c1ed5f2a6c5f982beaf5 SHA512 fa515d5397488ebd4271988f7b9b538190c4277a3c4dcaeb4b05f5cd5bdec657f13546de644b1a6825c88bd3b73e6c1a6aaa6b6c74e3cf942783b2df530cf4c7 WHIRLPOOL 3a1617cd8b8fd096614cf04b7e716b607ec718d122b286533d8dabc862c82b644ba864eb661b1d5e5da45c8fe674192d3f8038dbd85311d9ffc5c6f793f7d32b
 EBUILD amdgpu-pro-opencl-17.10.429170.ebuild 2212 SHA256 dd252f3ec7c46d309d5f649b657a20b31f1f50074bf32d6a643aa050a5fefdb1 SHA512 a8b6ed2b70ec0ed77fb65e23797a31303402f7072c22cd1ea6b63a76318e325e61875da76998d2fde7fd72494d9fcac48b4472610b8408e7584b301b97637a8b WHIRLPOOL 8a2c875ece21945796598f37b4656fe7738b8a2213467cb741e003bff837fb1b67d4e6a76675328d67b10fc15f45436988c8595867d68f39d779455d38584e4e
 EBUILD amdgpu-pro-opencl-17.30.458935-r1.ebuild 2356 SHA256 fad3c146dd00814913132a9ea6cc9e696faa8a0628c8a1ed2526302c5dd3115f SHA512 0c834c94be9975bf7c727243912bcc4bce46af8d734d4a8b65bdf769643769549883193e029bc7aec7d423588030423a3116c08a016352e10b203e39c550b13a WHIRLPOOL 715c5c6c7ec72e59ffec3ac8599705cd15576b3460d1a4f14197cb342105e5d35b95a62880d223cce431c569411215282c29f415056113488ccaf082aa876a08
+EBUILD amdgpu-pro-opencl-17.30.465504.ebuild 2356 SHA256 fad3c146dd00814913132a9ea6cc9e696faa8a0628c8a1ed2526302c5dd3115f SHA512 0c834c94be9975bf7c727243912bcc4bce46af8d734d4a8b65bdf769643769549883193e029bc7aec7d423588030423a3116c08a016352e10b203e39c550b13a WHIRLPOOL 715c5c6c7ec72e59ffec3ac8599705cd15576b3460d1a4f14197cb342105e5d35b95a62880d223cce431c569411215282c29f415056113488ccaf082aa876a08
 MISC metadata.xml 536 SHA256 470656217ffaa8fb735bea6b795f5206a727d783ec8ae671dc518af9b7e6c40c SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d WHIRLPOOL eab775a0a603cc6562a02a7cb79585d1dddfb837e67cecf82a6c325148b53cca7e4079e79f6d9a6e09486fb31a2f5a1fadbc92ee30a5b09313c5aa0871b1837a
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
new file mode 100644
index 000000000000..971d4999df46
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker versionator
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx"
+SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+DEPEND="dev-util/patchelf"
+RDEPEND="dev-libs/ocl-icd"
+
+QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
+
+pkg_nofetch() {
+	local pkgver=$(get_version_component_range 1-2)
+	einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into ${DISTDIR}."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local libdrm_ver="2.4.70"
+	local patchlevel=$(get_version_component_range 3)
+	cd "${S}" || die
+	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
+	unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
+	unpack_deb ids-${SUPER_PN}_${ids_ver}-${patchlevel}_all.deb
+}
+
+src_prepare() {
+	default
+
+	cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
+	patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
+}
+
+src_install() {
+
+	into "/opt/${SUPER_PN}"
+	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
+	insinto "/opt/${SUPER_PN}"
+	doins -r opt/${SUPER_PN}/share
+
+	insinto /etc/OpenCL/vendors/
+	echo "/opt/${SUPER_PN}/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
+	doins "${SUPER_PN}.icd"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	elog "AMD OpenCL driver relies on dev-libs/ocl-icd to work. To enable it, please run"
+	elog ""
+	elog "    eselect opencl set ocl-icd"
+	elog ""
+}
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 8af80d89d6df..34599965cd9d 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,8 +1,9 @@
 AUX libffi-3.1-darwin-x32.patch 606 SHA256 419007aba26be807a25e6f34d319225458e3febc75c3f3d0c85093ded63e3cb2 SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24 WHIRLPOOL 9f749489499e8e9fa7712ae4111424c47c695cd5ee7b6480a8a2f5cd638d8d95c000e16e81eb13603bd842c2d50d2d0c60480d519960c55b652867fd6cb95cde
+AUX libffi-3.2.1-complex-ia64.patch 1622 SHA256 bd8310358a9ee3363c67ff31527c9c14b9b6cdfd738cab907dc682f673d48936 SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1 WHIRLPOOL 4a28a68991cca44276ee4ea5be9ab80d84a99bde2738c8cd7f41a086e9470b9156afc05c0f4a84ee94f7dc80beecc6ebcc6a66b2acedb7f83d48910a5a7cfa49
 AUX libffi-3.2.1-complex_alpha.patch 601 SHA256 5653822db3b2338f6b7c63107868d20665a200f139616476fc1411ae76283fa5 SHA512 66890bf241236f08e0e726c820e2ff82df6071c1a3b25aa4f3f005b6431b94ec5a5f730db56de82c006e26415d72fe665d6ced37567bcdec6d84357faeb24bec WHIRLPOOL 1e020a6477eb137f5579de73a76a021eb2444a1223ef1e7b50460cbd92643c841429993d08517b7297b50f7d10aa4e5446f23ac1185d18712a5d28081d35eb74
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 SHA256 655ed8d1c6ff1f48d69f28f3393e84fe53e581504f55cfa05b1914ed97be7463 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65 WHIRLPOOL 72305d87d8a96542264c9b4211f14744fd980a29c9d63d78919211ec0d5a027973e9825777a79980c4ec22ed59319c3230780e60746ac860ce5a405b35351659
 DIST libffi-3.2.1.tar.gz 940837 SHA256 d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 WHIRLPOOL b9d3c86e347029fa9f03fd3813405cc731099812ad6186bd4d2ea646354383803c90912b20e1804a6b7fc12719403b3c0c3b800bdbcab564a2c93fcb4fd722ad
-EBUILD libffi-3.2.1.ebuild 2067 SHA256 2d2cb5f72664dd32cd95b3873c29d57956902966f74773d9b6db6e78eaa01769 SHA512 018ca3295c6cd32359328358ad5ae7052c4139434419e7824f16bcac18d0652a325a3fc4591c402347b362a246f590e344c8225cfd6994c3ef5b00d537e7c2de WHIRLPOOL a9df656132a25045a36bcfbf7dd67d35ad16fa709c0aeb9e458473409b38f7c5bef6bcdeffa4f01d90e3bd2b529b9631786c583d3a12a476da9b428ace784bef
+EBUILD libffi-3.2.1.ebuild 2120 SHA256 c9a902dc9edb9227f47a7fc7edd09b72e14bdfa302e7511d87fbf118f81738b6 SHA512 5579834a2940ba7ec18fb33af618eb8bae4a8b8e1da6e647bee2959c12554acc4e02ca17d20efe4fbb52ce8f1623879198e042404a8db476383dc587229164c9 WHIRLPOOL abf4df3f1ac78680de4fc359a39c4a9591cc8b38c70d1c6297c962bec25624904c5e9b1ef934f7ac8015f77a560f648bdd94b6b2388db28c45022e5383a76ec1
 MISC ChangeLog 4914 SHA256 e5af61b0b32e4435fff51eefb6e7ce8e88deae722409e304f9af77fbcc2a8ad3 SHA512 2d6f89478be3cc0e5acd594702d5fc5f299257a32e2f1f934821f47aeb35877971d32d9bb618df6142a07540570ebae5dd71a9e4568a4ec431bd9908f3d97a1e WHIRLPOOL 4825d0299eef1fb2f6f835196d2dc9a9dd5613b3d6577c4ef1a97fa4b6620709fdeefdd33074fa83b08318126bd9c300217d81de4ef8d187e789ac3044087774
 MISC ChangeLog-2015 27182 SHA256 b643eb3993bbd864daf849482c0c2e58133468cfb4efd5b2ccc0170ba9d123bf SHA512 a00480e9d37cf03bcdaf45b43199098349b369580d9cb9eb23c4fab135440a55e47a635255bfcccd9e3cd0be6336b9275a79ecb93ee4177b2587112b09a259db WHIRLPOOL 94783d36d7ba7f246013f435c4c43d84b0438be0d69d9d6fcfc899a9601641baefdee4015872f26fcb10610a95ef398ed6ddeaf99787683c41cc5b523ec09449
 MISC metadata.xml 1866 SHA256 7f949adee86d868d30a6dd8a8bf251318105c635eeea96612419e7eaa3fbf170 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90 WHIRLPOOL 79f40596a2e0026b4248496bc6a560e711c028fdd045a86187e672a2bc2f597ac9e97bed128b14ab5bd62fca133da2e91bc8d4c64dc9523d2a95a5f1082e17a3
diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch b/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
new file mode 100644
index 000000000000..fd5c1ea4b282
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
@@ -0,0 +1,41 @@
+ia64: fix small struct handling (missing complex type entry)
+
+commit 6e8a4460833594d5af1b4539178025da0077df19
+added FFI_TYPE_COMPLEX value type (comes after FFI_TYPE_POINTER)
+
+ia64 ffi_closure_unix reiles on the ordering of
+types as ia64 has ia64-specific FFI types:
+small struct and others.
+
+As a result all tests handling small structs broke.
+
+The change fixes dispatch table by ignoring FFI_TYPE_COMPLEX.
+This has positive effect of unbreaking most tests:
+
+                 === libffi Summary ===
+ 
+-# of expected passes            1595
+-# of unexpected failures        295
++# of expected passes            1930
++# of unexpected failures        10
+ # of unsupported tests          30
+
+Bug: https://bugs.gentoo.org/634190
+--- a/src/ia64/unix.S
++++ b/src/ia64/unix.S
+@@ -529,6 +529,7 @@ ffi_closure_unix:
+ 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_SINT64
+ 	data8	@pcrel(.Lst_void)		// FFI_TYPE_STRUCT
+ 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_POINTER
++	data8	@pcrel(.Lst_void)		// FFI_TYPE_COMPLEX (not implemented)
+ 	data8 	@pcrel(.Lst_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
+ 	data8	@pcrel(.Lst_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
+ 	data8	@pcrel(.Lst_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
+@@ -550,6 +551,7 @@ ffi_closure_unix:
+ 	data8	@pcrel(.Lld_int)		// FFI_TYPE_SINT64
+ 	data8	@pcrel(.Lld_void)		// FFI_TYPE_STRUCT
+ 	data8	@pcrel(.Lld_int)		// FFI_TYPE_POINTER
++	data8	@pcrel(.Lld_void)		// FFI_TYPE_COMPLEX (not implemented)
+ 	data8 	@pcrel(.Lld_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
+ 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
+ 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 1160d49a6b8b..848a9fedbf13 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -40,6 +40,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
 	epatch "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch
 	epatch "${FILESDIR}"/${PN}-3.1-darwin-x32.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-complex-ia64.patch
 	epatch_user
 	elibtoolize
 }
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index c69c2590f9b3..ee2bb8c78be8 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -4,7 +4,7 @@ DIST ppl-1.1.tar.xz 14734820 SHA256 c48ccd74664ec2cd3cdb5e37f287974ccb062f0384dc
 DIST ppl-1.2.tar.xz 14136236 SHA256 691f0d5a4fb0e206f4e132fc9132c71d6e33cdda168470d40ac3cf62340e9a60 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350 WHIRLPOOL cf2d5895d7d740c650707840caadd45d785411875b1c55db141928a288a1475f50d4f1e6ac829062ab021a920e9581be7822679e9cf2ea11dc64ac70cfa2e5dd
 EBUILD ppl-0.12.1-r1.ebuild 2265 SHA256 78e2f4c484dc27a1e52639c3151788d275c195af41b3a193030f8194521b55b8 SHA512 bf6d21742f2e910424e8dfcefd37c97eed7b1de00b484abb08093c6988578646845cd3357a72adf190700bde0ad39bfcedb16369fe675f12506960c799a79d63 WHIRLPOOL 5b1a2d4a6edfef45ff223e010e3b86e9bbe28c9406fcdf8de0c5b35f08e34c05fe9e49a1b73f5a22ca3f869f21b085e9614dbb3ace13d90ec86c04382896b77c
 EBUILD ppl-1.1.ebuild 1622 SHA256 5663fabe7ec8e81c898dc2239145d0f1fc395aeb53276f15e1ff565e65f3fa98 SHA512 f3f2197f3b3354f04af2a4daaaf05198d6418bd9defb947efa9d789001d5c157007c56ffdf59c484fe4eadccc5d79ddd20046e3d58f24a8a51e26a97d99447b3 WHIRLPOOL 3b4f38af20a9fcaf35354daa96a4d74af4c7eec8cead0e074afd7849dbfee9a91442ebd3e3797516751ea0b9f95883aef6c74cf41bcff32b2234a06e5fe14dc7
-EBUILD ppl-1.2.ebuild 1632 SHA256 c094b45151fdd6e5b1394c9a79f6445ff838e90a1592a26c0bc9ccc879688f4b SHA512 611c405902ec023284bae88c34b12ad8057d971d1523b9e35fd158c8f3ceff29d5d4fc4b6ca03472c66a95776e2b4df10b5d9b94bbac5d9b730c2b355ddce151 WHIRLPOOL b2065f8a4b7a4769b70ac0086352241d40b088cb9ab103f4553f4f909500d00ebc6d7ef473b2ed41095cb8714da94a4b7d086ea1f71c34ac9b1d3a79b60bae3a
+EBUILD ppl-1.2.ebuild 1631 SHA256 88d9656ae25bc1be8a4d96e58d2fb25b0a23e7215f7a14341a153c6076cb0f19 SHA512 e7a116245700fb62e24ff17564ec1fa582c56e485744a9c0f74b6a23a2a90cb2ca3c28c7e960cf5dbf523580e51241a578e0086e013840f446e4f71158c9e717 WHIRLPOOL fca89ae8f52f4f132e2b9960933e3c2bc06ccc1728c263ecb1fa6c0575d4a5d588a7f902de4921f3cbb54206b4655e9d2cda17a023d2200e86ad0368303c6a91
 MISC ChangeLog 4213 SHA256 ae18f4ef1f00bc3da945361c9255fd3ffb156e71ab34c9d2b9e1c0cf334b68c3 SHA512 5edaae8716aa32d992c72ca74633657885e7ee61dad49b16fffdd756abe76affec1ee89f2c6428b092358df2cd7560e81aa472d2c8c4956c20db31893a6bce0d WHIRLPOOL a54881e6d034be5c86989ac5fb428f2f3587b0c16456d3849787068baa21c117692e08585165c4fd78a68fc1a41e567aef9d82a7b523c8ead0396dc4d1922406
 MISC ChangeLog-2015 9468 SHA256 645b8f75023e5e94f40c4b5d294a3641fa92a1439029329a387fba377ef754a9 SHA512 ef6f76ccd17348adb6a1dac620403ead41363ad2aed66bedff6e86a9c9e35c9f4b9bd93cb9c8ddb6b8cdade93504e6b5bc6fa078fbaf736bd48cfbdfacd0a4d9 WHIRLPOOL 65446623ce60576942784a384bbc025cd58feb1e01ec5542754a1b87e1ae0c5dc00a3e70fdb91eeba1a484ed28d6e8331a77c86f6b2f84c86f01e424fbb2ef70
 MISC metadata.xml 354 SHA256 21ff706759de3e5d34dd99eaad897bd594218106f3e9d5319a29e6a4013a1752 SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50 WHIRLPOOL 8c79521e05e412362ed33fd3e08d84698e925540d8edfd49193aed6d5f55868240455ae281bc814acca2fab473981cc962bc666d69037aa5e9b0e3182cbe1160
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index 9f7fbabd4c98..380286115b33 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 89e0cc3be47f..8f257269572a 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,7 +1,9 @@
 DIST camlp4-4.04_p1.tar.gz 648320 SHA256 6044f24a44053684d1260f19387e59359f59b0605cdbf7295e1de42783e48ff1 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776 WHIRLPOOL 6cfed59e81dbd92debe23670657eb7e96125105fccb7b20a8e16553090cc9a0e8c732b8e0cac1a9b39e172aa8dfaae145ba8827948f371aeaa69345f3ba39096
 DIST camlp4-4.05_p1.tar.gz 647566 SHA256 9819b5c7a5c1a4854be18020ef312bfec6541e26c798a5c863be875bfd7e8e2b SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe WHIRLPOOL 0f89cd42bac84ba13d373160bf33452fc1cc31e0f6529aa1da2ff372e5cbb69868247461c17ac4fccd50528f97abe8009d899129c73afab8ce799791b259cc77
+DIST camlp4-4.06_p1.tar.gz 648566 SHA256 b1cc51449da0537f6886e380815b716e7adc9d9a12d6098a06db2b2525bab922 SHA512 32be92c4e64a985a3d2880e2201351961a4b7138a8be6e3f17e9b8e038a1660d13596f29fe0249c8c4183cd8cd06277cebc58f42609c8d2028032e893490fe43 WHIRLPOOL 0bb305789379ab043aa9be462fecdee3a043cabef2570c2dfcaa343e0dd7012626ca68c2a351be782bc75ce2a7737fc3f0f2ec233c5f0320b6f67de10184df71
 EBUILD camlp4-4.04_p1.ebuild 1021 SHA256 1d0de2645c31acc45bd20b1c7473fa26aa6faf7fc6ed3ae363c6c9291fb8b8eb SHA512 df3bdaabef1776a2e773f30149084890dddbff843ef9e13b0f3ccee9ca9fb390f6ec1a04c9a1cd4e7b4d0536d6be966dd89f46542dc367a3a030fd10853030bf WHIRLPOOL 491ed6b0f7dd02af3c47373e97915b06889eab1a3a26103073e78c1e2b6e5437328fafc018bdc5792ab4a734d823792540dcb21cd63e0857b5f9d741a86d7f71
 EBUILD camlp4-4.05_p1.ebuild 1030 SHA256 ecd3ec10b5fafb603e764785c352f7c535f582874692f3857befb91eea8303db SHA512 ba799d8915c54c6d7e4c565505124d76d18aa93f581bcc4292742f239e5cffb951fdd82f549034a17129400e330e91133b43bfd01975fbb25e53193c90d88e5b WHIRLPOOL 80bcae68135747a437cddbf9ada32694510c56d715aa0143781be1df1613f03fd03840d0ec240a18a39b5e70358df32be1b4d43cece0024c1a2aefc31cfa2d0b
+EBUILD camlp4-4.06_p1.ebuild 1030 SHA256 1bf8b3ca006b9217a6b54618f77c2a7db79b59fe33326d946800acd60d6ad3d0 SHA512 54f6054bf3b2f9550dfeb597e47b1ccde2631f9d380c3cf2aa153db957c634f17972733541ac99aad4ac108f04903bf232ee0406f6084bda09168473d490c082 WHIRLPOOL 608f38af0ebdf3dba43b440474e984b7a9de5c9fff3f33c2aee8b4d679af9374f01f92bf2c11237348e110b07924c60ae9e74978c6fd28039f8017dcfa065a3a
 MISC ChangeLog 4230 SHA256 a7e7b74bff9730ff393ecac9c770ccc7fbc2e35d2a1408a4cef23c824f1cbc27 SHA512 b4c2f825bdf0cb0916f2a351ba37944910c9a234ac815121e2ab082211b60667fec1aa1774c5da2bdf31c994d0d8c5223ae2776a7a1a444cc8c45ca5af4c2f86 WHIRLPOOL 6f22c928bc5ff7f1b546c37880b575cef4b7e9ab67ba254f2867f8afd331c5aab91682d0d8b6094e715bbaf06322e224f172035eae84d0ccbaadf2ad24c45061
 MISC ChangeLog-2015 1236 SHA256 70b3c7dadda94faeda5ead0990d373f5b61c1af79b8e5374315cebe4793b08ea SHA512 da997ee9065d559466b71662d74cfb19e07c4a7c6b65f1625b4f6824b51140597e1f63688061209229203c9c56167dbc0a7d5a5db5b75286c65581f954a5fb55 WHIRLPOOL 4a49bdd8cf884ee514e4bfd36fec9d5fd866f20f89c3208756cb6f0f4ca4aa08e23a12f7d5200bfb6d96a17f357e73248d3935060e4912876a365676ace58e3c
 MISC metadata.xml 334 SHA256 5df2b0e0c7aa173f043a4846c32fbe9b87fa8149d5595bb44a13d7fad0af0302 SHA512 195b9f2bf651b9f57c1f4333dcb1e0b7766c1d39df2faafcf01b16e4aab28a67e2434c2368d62bff16bf14ea3763d66d0d5a47714ef9f2282cd90d00cc49328f WHIRLPOOL 9ef1ea82d86083f413959a5e6e1938fd190af97911762e72d552dc79496c594b0faf4efa9cda2ba10deabe8efd00d3e9d480b4053658af29db7ca54a9e26778c
diff --git a/dev-ml/camlp4/camlp4-4.06_p1.ebuild b/dev-ml/camlp4/camlp4-4.06_p1.ebuild
new file mode 100644
index 000000000000..dad0b29eee6f
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.06_p1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/ocaml/camlp4"
+SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.06_beta:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+	!<dev-lang/ocaml-4.02
+	!<dev-ml/findlib-1.5.5-r1"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+
+src_configure() {
+	./configure \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="$(ocamlc -where)" \
+		--pkgdir="$(ocamlc -where)" \
+		|| die
+}
+
+src_compile() {
+	emake byte
+	use ocamlopt && emake native
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-META
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/jbuilder/Manifest b/dev-ml/jbuilder/Manifest
index bd9890ac1682..ab94a88e6cd1 100644
--- a/dev-ml/jbuilder/Manifest
+++ b/dev-ml/jbuilder/Manifest
@@ -1,9 +1,3 @@
-DIST jbuilder-1.0-beta11.tar.gz 253922 SHA256 16fdbecfa2eb571daa07fe41f76b853067174cd56edcd58f495736333ad9ecec SHA512 3ec6281d0e9836082b788ec6aa745753705b2f48ebdbe6df9dfe1150c33b97f7aac7a0aea44c2ae2aa278729dca28cb1e4f22844661d79d5020aa2cff1d2ed5b WHIRLPOOL d8d5c5e4219c2bcb89042521541ff9d87b70a9db1610a0fa8d8031f29c25ba04233fcbf1e79782af8385f606b7e046fc7f948cebeafaf321ff9de637b560c012
-DIST jbuilder-1.0-beta12.tar.gz 261625 SHA256 ad79aba8f70c40699122b252168b4b432e46b7a4757d25fd51adf39810c4e33a SHA512 423b34ca4ab3d76b59b52d78600daae755d487c834567b0e3fc5811f59df2cb2ba5a9d6fa2f185a82dd3f8ce5fd22349f24244c6ae6468b25b2293f6843b1983 WHIRLPOOL a2058555ae7cffcab2863e53d5286e152910c558eeb0818326a8f6149d8f0ce6a800bdd879799cd286124e12e795536ca4743ef4592cca12f2251bc6f9339a29
-DIST jbuilder-1.0-beta13.tar.gz 263186 SHA256 a4ea77b4f8f499de02ec9e58d4bb30bfb3397e4ea11208829c52c8fd267789a8 SHA512 8ab619bd2c9c008b01998182c6951cc3e3fc60391290146a3c78eb7d20feecfa6a31d773c637ef5a3194cb8b484b9367bd9ddf5e9b16a8e92911611e266b7b90 WHIRLPOOL 31ed9aeff3a5abceda91d49b8a78f38e8ae2850ab7a09b235dd0dffb170bd5163c224fbfcda1563bd38ce097a81b029464859b6d1c1937a318b6541687135e2d
 DIST jbuilder-1.0-beta14.tar.gz 268571 SHA256 e0ebb0c7d781f5f6903803a7f6db9dbd02f9be4ca5b2e43ce6e4d62ac9624d1a SHA512 0258067b0b48dbd22c0d25b65fcb1fe9a7e65f9389031f954fab7cccf4e0791fe2242f85d441f23e284d13a0b1a3f4485546f94008211adef7b58fd14c4091d3 WHIRLPOOL 031bc18c9b760bd3975119ef4495e1e3e283caeaec6eb80adb614d8f546a8621da8d26690b8c2be664a3a267f4c98c9addfcc1c62878d4ff46edc36ca003c423
-EBUILD jbuilder-1.0_beta11.ebuild 718 SHA256 a7f4f586044b58918cebb44b79ca479e80dc8a51b33392ae36e99b4b7f42f138 SHA512 4859e7419752b4426531a4f49ff62d7c1e368421d182c21b592520fc742eae7108cbc35d5274c1e01bac06465cd978bd13c39b8cb9669ff6a0593ad7be433687 WHIRLPOOL cc5a5017c45c1987a4f677a744375737bca98cd15e7908b2e6c1480cf95a9a20d53037859d22e59aeec84b895b70bd240feb2fb7d76a921d1dd06a3f4e7fb586
-EBUILD jbuilder-1.0_beta12.ebuild 718 SHA256 a7f4f586044b58918cebb44b79ca479e80dc8a51b33392ae36e99b4b7f42f138 SHA512 4859e7419752b4426531a4f49ff62d7c1e368421d182c21b592520fc742eae7108cbc35d5274c1e01bac06465cd978bd13c39b8cb9669ff6a0593ad7be433687 WHIRLPOOL cc5a5017c45c1987a4f677a744375737bca98cd15e7908b2e6c1480cf95a9a20d53037859d22e59aeec84b895b70bd240feb2fb7d76a921d1dd06a3f4e7fb586
-EBUILD jbuilder-1.0_beta13.ebuild 718 SHA256 a7f4f586044b58918cebb44b79ca479e80dc8a51b33392ae36e99b4b7f42f138 SHA512 4859e7419752b4426531a4f49ff62d7c1e368421d182c21b592520fc742eae7108cbc35d5274c1e01bac06465cd978bd13c39b8cb9669ff6a0593ad7be433687 WHIRLPOOL cc5a5017c45c1987a4f677a744375737bca98cd15e7908b2e6c1480cf95a9a20d53037859d22e59aeec84b895b70bd240feb2fb7d76a921d1dd06a3f4e7fb586
 EBUILD jbuilder-1.0_beta14.ebuild 718 SHA256 a7f4f586044b58918cebb44b79ca479e80dc8a51b33392ae36e99b4b7f42f138 SHA512 4859e7419752b4426531a4f49ff62d7c1e368421d182c21b592520fc742eae7108cbc35d5274c1e01bac06465cd978bd13c39b8cb9669ff6a0593ad7be433687 WHIRLPOOL cc5a5017c45c1987a4f677a744375737bca98cd15e7908b2e6c1480cf95a9a20d53037859d22e59aeec84b895b70bd240feb2fb7d76a921d1dd06a3f4e7fb586
 MISC metadata.xml 330 SHA256 e804855ec59c87263305757fb8e2343bbeec8489bde45a87a9cf36b7924782bc SHA512 2c1f3056a0ec13ed7e3c47df99fa111c9926c32bee7562cf745d6f2e91101b1cf04fdc9332ad304fd62fa3f07446abcd6ae70bd2cbf56460fcc377f6b61786e0 WHIRLPOOL 87e60cec47a23851183f9f70acb7672066405abc69d9a1c90365658b7d7263f9fd890b9622876b364b59c60a00a2594a78b2a10a13de17677c0659f1fecab2dc
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild
deleted file mode 100644
index 73b64735ff87..000000000000
--- a/dev-ml/jbuilder/jbuilder-1.0_beta11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-MY_PV="${PV/_/+}"
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/janestreet/jbuilder"
-SRC_URI="https://github.com/janestreet/jbuilder/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? ( dev-ml/menhir )
-"
-OPAMSWITCH="system"
-
-S="${WORKDIR}/${MY_P}"
-OPAMROOT="${D}"
-
-src_prepare() {
-	# Disable Werror like behavior, doesnt build with ocaml 4.05 otherwise
-	sed -i -e 's/--dev//' Makefile || die
-}
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta12.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta12.ebuild
deleted file mode 100644
index 73b64735ff87..000000000000
--- a/dev-ml/jbuilder/jbuilder-1.0_beta12.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-MY_PV="${PV/_/+}"
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/janestreet/jbuilder"
-SRC_URI="https://github.com/janestreet/jbuilder/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? ( dev-ml/menhir )
-"
-OPAMSWITCH="system"
-
-S="${WORKDIR}/${MY_P}"
-OPAMROOT="${D}"
-
-src_prepare() {
-	# Disable Werror like behavior, doesnt build with ocaml 4.05 otherwise
-	sed -i -e 's/--dev//' Makefile || die
-}
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta13.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta13.ebuild
deleted file mode 100644
index 73b64735ff87..000000000000
--- a/dev-ml/jbuilder/jbuilder-1.0_beta13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-MY_PV="${PV/_/+}"
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/janestreet/jbuilder"
-SRC_URI="https://github.com/janestreet/jbuilder/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? ( dev-ml/menhir )
-"
-OPAMSWITCH="system"
-
-S="${WORKDIR}/${MY_P}"
-OPAMROOT="${D}"
-
-src_prepare() {
-	# Disable Werror like behavior, doesnt build with ocaml 4.05 otherwise
-	sed -i -e 's/--dev//' Makefile || die
-}
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 2e54ea21781b..4e56a15ae616 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -1,7 +1,5 @@
-DIST ocaml-migrate-parsetree-1.0.3.tar.gz 208080 SHA256 5f33bf9d522508930728963dabfa625350fa86a5632bb0b443ecc5bb0b64f852 SHA512 ba797ecb8635988e23d0ff17c1261b7bf5b99fc1238de7ea4adadb429b36d52f5d37b3f8958a6dd41595a99ab42ab43a75c8d22e8972ce1565ce830f4f92f7df WHIRLPOOL 7103b97dfb436eaffa7d55bc618aa976973287baad30b86106c674ff57a83b7ab5243cb55e6b40892688d869615ca4a5609a2f05740f4171d3b1a09a051c941e
-DIST ocaml-migrate-parsetree-1.0.4.tar.gz 208259 SHA256 8e8f9da003fe3fc0de84aab9aafcbe308516fb07bb89ad0579cef6ef25716e49 SHA512 1176e14c218c39289bdc660d75666d9d1485235c3f0a0818e39930b85e445163f3fd9cf689478a61028f963a76e49f8a1c12cc566214c99f54beea3612d64528 WHIRLPOOL e7ba8d4b8f4f5e4d224a894bf7a7abcffbc35d3dff1162a7f4a5ad657371814ca0c222bfbbc47f65ec585f24f73697c57dc1e2f7c1e8405e326ec72081696fe9
 DIST ocaml-migrate-parsetree-1.0.5.tar.gz 209078 SHA256 5fbf6f7a03bfc37f7d090785e0e1fd1368d42f6449bfb0e75b9f3ea616b764fe SHA512 eff87416eeb6175820bedfa3160160fa7328bcee3d05e066b5a94db25a476299f3f5ad07db22eb192f84e5b83804cf2e3a66d77561c984d658d9255c43660b90 WHIRLPOOL 856696733394a5f877f59aedf89c1c5a4f104297a14c53c0399c76c22520d7b0c2913f7662b347ed9004c26269b55bf3ee65421f5a1369025bdc2a697f93445c
-EBUILD ocaml-migrate-parsetree-1.0.3.ebuild 535 SHA256 f449b5a86e37d4601a1d766fb009a39eb3dac9bd096832a20127715a05e1aadf SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3 WHIRLPOOL 5d64adea24ae540da206d5b0eeffd05d5db94e567ab02389cc67e0f55e0560fb8ff9f6d37d9342560d84a1f9c50b3b8c3f68bb645271aaee98e2b8d1768d510a
-EBUILD ocaml-migrate-parsetree-1.0.4.ebuild 535 SHA256 f449b5a86e37d4601a1d766fb009a39eb3dac9bd096832a20127715a05e1aadf SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3 WHIRLPOOL 5d64adea24ae540da206d5b0eeffd05d5db94e567ab02389cc67e0f55e0560fb8ff9f6d37d9342560d84a1f9c50b3b8c3f68bb645271aaee98e2b8d1768d510a
+DIST ocaml-migrate-parsetree-1.0.6.tar.gz 209199 SHA256 2ae17e143688d7b76f279b19c9964bf5808213fb9131cf7129dece5383dd7615 SHA512 b44b9fc59cef787a0188245be357685fe7ecd5cc81368b5677b3389e8d09834e5e40f94a3cd7be762f3eb27657a628c0a228c4cefe4443ad1dc8ce012f2552b4 WHIRLPOOL 00ac5d44d4039652383ace78cd722ef5c519ef66def356235ea41d80faad1def142b15c0c258711e86cb1a2eeca9ab390b8f3bacd2189fc92807bd27a5ec469b
 EBUILD ocaml-migrate-parsetree-1.0.5.ebuild 535 SHA256 f449b5a86e37d4601a1d766fb009a39eb3dac9bd096832a20127715a05e1aadf SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3 WHIRLPOOL 5d64adea24ae540da206d5b0eeffd05d5db94e567ab02389cc67e0f55e0560fb8ff9f6d37d9342560d84a1f9c50b3b8c3f68bb645271aaee98e2b8d1768d510a
+EBUILD ocaml-migrate-parsetree-1.0.6.ebuild 535 SHA256 f449b5a86e37d4601a1d766fb009a39eb3dac9bd096832a20127715a05e1aadf SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3 WHIRLPOOL 5d64adea24ae540da206d5b0eeffd05d5db94e567ab02389cc67e0f55e0560fb8ff9f6d37d9342560d84a1f9c50b3b8c3f68bb645271aaee98e2b8d1768d510a
 MISC metadata.xml 343 SHA256 579617da042a3895c1e5ef1eee8e16f5d11073a3d14ad9cb2b0d54c160f2696f SHA512 21dab98a6df0be04a7256797e7dd6d0056a16018fe20e9c83470d0e6fe7c2a792d9251d691faf92a4e00c1ced2f34d1a5b7fd7c901104d5d78739d1c465f391d WHIRLPOOL 7b0bbb3a477d1ad1d2120a4d07fa8e45302a7c6972c007c1280de5cef91c9932e4adf968986932749b9879bcbafeb2479cd6f28cb338c2bb1bf9af3ce618b369
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.4.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.4.ebuild
deleted file mode 100644
index da28219a5424..000000000000
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit findlib opam
-
-DESCRIPTION="Convert OCaml parsetrees between different major versions"
-HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
-SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-ml/result:="
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/jbuilder"
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.3.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild
index da28219a5424..da28219a5424 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.3.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.6.ebuild
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index 6e85102f2ec7..e2ab47ba47a4 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -1,7 +1,9 @@
 DIST ocaml-ssl-0.5.3.tar.gz 125431 SHA256 9ef78eeb83ab7f0bb2244625d44543fbc8624c952731b3eb213a9c2a96213aa0 SHA512 c0dc38ab21c8adc104a42ec89b8a58de976205887a23a407f1ffee1181d526ddb8aa91877508f8a974c6df8583d6d8611558a995680e313fc78ad0cac184cf52 WHIRLPOOL 098454a79c2fcbe1438feae475a4ed01a645db137d4f130cd6c8f0aa3ac237719d984562deb0319091d01e84b98b5a67096b2964edf42e38acecedaa5f57aa53
 DIST ocaml-ssl-0.5.4.tar.gz 125833 SHA256 10db195bf06178413bec17898f89eb858e1fb97225f03137790d3fd840bc4cce SHA512 4a221bd8f5c11871040f6f117d3152ec2fca28f0311dfcc2ac39d2ed55c66203e12ad3242368273d8f17f1ca87c1b5d929ab7fec8ec7a03a564c7c25ade3d289 WHIRLPOOL db76056ae19cc144e677f45c2d9ad83fbb958cc7dcbdc4078008434c68df2fe6fe60ddbdf2fd4442284d3593cdd2e1f5f6607ec9567144a989010bf1e4dd58e1
+DIST ocaml-ssl-0.5.5.tar.gz 125778 SHA256 2cc270d2a2f38c4e7972f3abf00f524ce86f668e40c7fcf4e0af99df3b8b3a82 SHA512 4e3a78426bc2a5cec0ade43b1b324366b4bf0d93be6e7bc73f1152499f2ab0642d3edcf4484a519ea6ec0b44bc76c0c984b9bba59121f93bc065b1c0355969c0 WHIRLPOOL 7713a2d5d13f9c9e5c3a70adeaccbcec57facce12234eaa7056b34283886ac4d2d96f52775e53a5d7ba00d6038ec16990b730094df3886ce8bacfb6ff03cc618
 EBUILD ocaml-ssl-0.5.3.ebuild 630 SHA256 e1aac81ec87e51234bfd2d519f075afc3333d21356570249760a4fcb966f5221 SHA512 dcd9b3c8bc4a9c38a13badc536902b0c7a1488c453d6d3530893d3e6362d6e85e282af3a5460b7927cb3dee150b579be1ec9c87330e3647d970a1bc90e144815 WHIRLPOOL f5b0e0389ddbf2e2a7e42ff6ad6dc3d7a3c4f9fcff17f787f0c3ea91cd2e9c7c04dd7074ee9a7f195dc3b74bdb999c15d450d60103855a29525778bdeaa52ec7
 EBUILD ocaml-ssl-0.5.4.ebuild 633 SHA256 7a132209b3649465300b11b69caf86c62e2637733576581b42e7963d81c36d48 SHA512 484a8fe25071c157e29ff6aebac027bd96d74b0c41c93986ea88a3ffd83119cf4a7020019ec14404cbb95349e4dd82b295dd6b9babba9c4d09485a3a34054faf WHIRLPOOL be4815801b0b13a6f3ca3d9469a33fb39e46740d1b89adfe03904523e74e7001206a27eea3fcced5328699f1eae89513f5750266d4d53508df595e1e3e569f0c
+EBUILD ocaml-ssl-0.5.5.ebuild 633 SHA256 7a132209b3649465300b11b69caf86c62e2637733576581b42e7963d81c36d48 SHA512 484a8fe25071c157e29ff6aebac027bd96d74b0c41c93986ea88a3ffd83119cf4a7020019ec14404cbb95349e4dd82b295dd6b9babba9c4d09485a3a34054faf WHIRLPOOL be4815801b0b13a6f3ca3d9469a33fb39e46740d1b89adfe03904523e74e7001206a27eea3fcced5328699f1eae89513f5750266d4d53508df595e1e3e569f0c
 MISC ChangeLog 2936 SHA256 a9adde297172408fa08258e9bc2959780d70530756b78bb8b08029d45d056490 SHA512 80683f30f3e9d292ebd56e3af40df706e28e406a4e68e4e88e4ba7783f4ac8577f0694b8597a46f480026879bd5950609f372ca963f302109b6c9320bace9167 WHIRLPOOL 71f8993f891b88b1f551536331b3d159a2ea229e35d090986484e5a10e4d2a3af09e2a1cc63654df01fb39579548beca196d3c593a98712daa57ae73bee12760
 MISC ChangeLog-2015 3606 SHA256 ee557c7f796df015edea9b3bea5526e73d2faed405ce7e2ab2ad3a4164287dfa SHA512 af0df7df9bb83be9b7d2ade68f5be149c454a8e5c9c10a33d2709a8b8f8088e7593d93dc29080314d522d8772b6bb472a697699ad5c71c313ba29c18f06428a7 WHIRLPOOL 13fe810c4697f3361a29497afbf49c9da29d56e465dfe133c3bb9f0aa207cdf143f0e1c37a384f82ff426860e2e7a9a1bfb4265f2d2713a1e966f8db77f00d7b
 MISC metadata.xml 381 SHA256 9857d3091e58010bf68a53b14c99e031633e87ee9583b9e515be78d535cf8872 SHA512 647667be5ba0a6c985cd80a3a7e9abb2023592bb211d4da73ac8bd2a1d9fed5768c478df29fe3c7bb4b86fd34dd27189f6b7cbcb0c03e9cc6dbefde9555c7d1a WHIRLPOOL ba766abb37e959fd5f423c4b12b9f87457d1d1f6fa83d0ff4da5461b93d9ec9d92f7eb9119db31714c786126609fc401bba11e098cf967e916127937128b3a45
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild
new file mode 100644
index 000000000000..93d736e30add
--- /dev/null
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="doc"
+
+DESCRIPTION="OCaml bindings for OpenSSL"
+SRC_URI="https://github.com/savonet/ocaml-ssl/releases/download/${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/savonet/ocaml-ssl"
+
+DEPEND="dev-libs/openssl:0=
+	>=dev-lang/ocaml-3.10:="
+RDEPEND="${DEPEND}"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	findlib_src_preinst
+	emake install
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+	dodoc CHANGES README.md
+}
diff --git a/dev-perl/Alien-Gnuplot/Manifest b/dev-perl/Alien-Gnuplot/Manifest
index fd8e4ab5f407..a4223e4617b5 100644
--- a/dev-perl/Alien-Gnuplot/Manifest
+++ b/dev-perl/Alien-Gnuplot/Manifest
@@ -1,3 +1,3 @@
 DIST Alien-Gnuplot-1.033.tar.gz 7827 SHA256 85d97835cee8538bfdf1d9e9a2cc9d6d7eb7daa475739a1c48b71315f7aee9db SHA512 b846e9be8193af376dced487b99bafdd29fdf094a92f824bacaa3c642ad110918995cabc66300bd04fbf78ae779855ba94d1e634398f479961f98bb7f1cbbf46 WHIRLPOOL 42911f76a92c9abac662fce3a6c0533a14a22201fae818248f3811bc48c89d2edcac60f8e5a5d55708f6159e6edc76449f9f07283b944f03fc98a3daffc0a806
 EBUILD Alien-Gnuplot-1.33.0.ebuild 476 SHA256 dd96337a2a24ac1280e2ed37791fd229bbf6120e0c08d61b5f015950f81b9a40 SHA512 02cfcebada950bcab61dc989151379677cd478f93947e8908436cc196868f2d7877b97eda6845834037bcd4bb6c884e06bc3da214741990be8b392d82a1a5e19 WHIRLPOOL 6986fb3e94127f6bc612212b3e46f6bec493853845e24b604db4cd51597424f1a3f9130e5a3ab6b6d769836a4568b7099c2528b7bcba057c64eb4b52495f95ae
-MISC metadata.xml 293 SHA256 c7c4c21f3407547fdcba65d60cc98280b07d2665c94eabc0b71b72cdce3e44d7 SHA512 8fc4213021fd9558e5c2b69cc38f21df7abd313ed31c216a0b718d61004b45165e7898aa43b07c6243407dfc9e5c43d8110557b5fa2516b571d943ddb7d0b007 WHIRLPOOL 12a91c833ec2b5314baab88db19aafaa2d9f257b885c2e395e5c00facc58733869d220a49fe19a533c90a9276a237135dbe467e9c782ff03a0fb914d7224f979
+MISC metadata.xml 470 SHA256 394a635491a7ec9ef18e6c04b6e37e52a30a364fa2a4be0ebaab8e39ec97da3b SHA512 3bda6e3856dfdf1edc3ce243dd1a2f1f2322506586d2c5949de80e05cd1844c323938752dbd8a3e268c5075aa056bc464863e537aee55acf1d00880ae70b6103 WHIRLPOOL 781bde6e5dbd97ecfa7ac4fd6f2cd09cfd98c58066f60385573aafb5f812a76fea4396efbb9a181435a3b7d91ed974eb81969eb7c6a4ce9a5df2674625f2e27c
diff --git a/dev-perl/Alien-Gnuplot/metadata.xml b/dev-perl/Alien-Gnuplot/metadata.xml
index 8ad3d950c4bd..fa9b409763ae 100644
--- a/dev-perl/Alien-Gnuplot/metadata.xml
+++ b/dev-perl/Alien-Gnuplot/metadata.xml
@@ -5,4 +5,8 @@
                 <email>perl@gentoo.org</email>
                 <name>Gentoo Perl Project</name>
         </maintainer>
+        <upstream>
+                <remote-id type="cpan">Alien-Gnuplot</remote-id>
+                <remote-id type="cpan-module">Alien::Gnuplot</remote-id>
+        </upstream>
 </pkgmetadata>
diff --git a/dev-perl/AnyEvent-CacheDNS/Manifest b/dev-perl/AnyEvent-CacheDNS/Manifest
index d0c6fa3b34bf..3639753e36d8 100644
--- a/dev-perl/AnyEvent-CacheDNS/Manifest
+++ b/dev-perl/AnyEvent-CacheDNS/Manifest
@@ -1,4 +1,4 @@
 DIST AnyEvent-CacheDNS-0.08.tar.gz 5295 SHA256 41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae SHA512 26c0cbe3c45b48a4760d3a6e601ae8eb098b1840e892cc21a351e04a7c0582ff0f05e368d6f6d25f1fe97f992af2c3742d555e2d68cc0002a7bb984deb34e9f4 WHIRLPOOL a82c9a1598bed225ee5d9f9a2b6fe7e738d693c2ab030781d6ccb6df409aa3a5b9b8f53acbd81a9b6ba7214f57b7a4078a27eacf6abbcdbfb84a231bcea7254b
 EBUILD AnyEvent-CacheDNS-0.80.0.ebuild 666 SHA256 6ce9b454d5a429a1b1340e10718b9de8acf36479e5a68524e51001cece753b46 SHA512 dc4837db9e9585863914ab3716a2a21e18ad6342afd5cb787af81297c23efdd1f899cbbbfb438f376e3971210c499944687dd6dac1d16cdf51838a51012fc906 WHIRLPOOL fb9db4f93cea4f40985c52dd0522059d4661e72807b68e85e0a7f5ebd13bcfc773af3753129dd1bdac63bf60f7e8d306f75bef62a9d8c4037916661e60971751
 MISC ChangeLog 1152 SHA256 062a0f97efa61392757b6f95308aa9869f3807970b3337728485691a69a6846a SHA512 edc55d7f7a287d251bfb7337f85e1ea428d9f12a88d4e8ee1c3022a4ad1fe05b623fb4ddc1c77fd93a6c1f8468a47e4a10c72685f8a1a1193c63d1e858e9a753 WHIRLPOOL 35d3b9682062f203a87115806be3c78fcc6294d39f38bbccbee3dc032ac42e2e89b155a5bbb8359a1a5f84d40a0d942549c6347c34b5f13d051a7b54e2912089
-MISC metadata.xml 247 SHA256 27f3a316ecc7f285838d28af09f1d1b76398615a5aaee404214aa9b1fb61a7fd SHA512 9bd9ddeb07e0644027c9a1dca33f0704de6062bc6b17333adde82a177991f35265f90e1b623e3a6288fedd729597921f48e4fda17fb8d402b1b2f3fc73c6d693 WHIRLPOOL 9a6451451b71a7b374696d841572b5d2dca769ec6bda12f582659e77274cabb0b9fed82e107a870cb9025e566b4b13cc51049c98068e137ce8c7739dacd649c3
+MISC metadata.xml 406 SHA256 6e2ff7b37fb594f2d3f2d89c4da72030397b47ce63f3b9482e14bc4307d4f487 SHA512 ae9478985ec3a9af6e79b85b57f6abac6b82c125385c1e83b4ba1834dc5b4ea7bb79556073e87bfbb7e738862a84ff55a1ba9771019ec8ba2c7490d26e74995a WHIRLPOOL 1bbbf66ee5e76c83d0629ff2f46787a0ab1eba47e0f659cd23d59f1fcd3284d228b71144221f31c4553a6e8de4fc21ca2c70b2d0aa91d26358ce67a251e40301
diff --git a/dev-perl/AnyEvent-CacheDNS/metadata.xml b/dev-perl/AnyEvent-CacheDNS/metadata.xml
index 7faa8dfe9af4..95632e195de5 100644
--- a/dev-perl/AnyEvent-CacheDNS/metadata.xml
+++ b/dev-perl/AnyEvent-CacheDNS/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>perl@gentoo.org</email>
-	<name>Gentoo Perl Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">AnyEvent-CacheDNS</remote-id>
+    <remote-id type="cpan-module">AnyEvent::CacheDNS</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/AnyEvent-HTTPD/Manifest b/dev-perl/AnyEvent-HTTPD/Manifest
index e26a3dbc92df..4425d0c77f09 100644
--- a/dev-perl/AnyEvent-HTTPD/Manifest
+++ b/dev-perl/AnyEvent-HTTPD/Manifest
@@ -1,3 +1,3 @@
 DIST AnyEvent-HTTPD-0.93.tar.gz 40226 SHA256 08c2d6584fb104c2ef2079fd1c317ec4a2159a4cbae066dc28ed12e55ab959a3 SHA512 a76a8406615878f885b83bb23fa27dc6ea7d5f6f729cda7b8d7759d7770f24a2b041cf9a6417a6173758ce14849990e720eea9ac3f4356aaa470c0ae3aae661f WHIRLPOOL 4f12487719466b1e8cdebe7be990a4f46b2c9ad5c9620c401448530ae1efcc1a81b46cd536433afd917dbd2a70aec6b63b0209c668b9c42aa2a7eb45dd7319a4
 EBUILD AnyEvent-HTTPD-0.930.0.ebuild 573 SHA256 1015412c9804d98887f7d832b367dbd53f652d544d8bff9a6a50d69def8da2f6 SHA512 634faf20e2f11217559d1c701e67b36b51da15d1b6a6e8bf9d0dcb45dec8328443a66e7ea3f0a4d2ed34393d441c11c742329adaaf21f5cca8f44d9f3c9799a0 WHIRLPOOL 805fc98c5e7a79395bcf84202e120f5b199f92a935ac93fdfed696457a6997c495290c1913158d6090382dbf4529863dbf13d44c6544450966e742f4aadaa0c2
-MISC metadata.xml 249 SHA256 f99d26cff87db91f2979dea11bb9f06c3482df3b905ed24e048ddf434c42a169 SHA512 23b4a04fd3e81775eb1e5b044a1d3730b43297e18ab09edc7990bb641ffd3dbd816f8e08dfc9128f574dcc6380bc2acd773d7b4b03912ef877f334ce85591707 WHIRLPOOL 3cd08c1726ed035ffd74cc24a8192c7209ea5b3cd3ebb4a49bc1142b911a5b7a940ad9f485c72e6f91db8bb6018d8ad2ea46228f5fb4b48d21f9e62fc455be8a
+MISC metadata.xml 691 SHA256 08a4bcea409bf744322abb1ded079a6b8b0b597859868944ad4aba414f89ca1b SHA512 7650d6b75fde39fa18e050fc013f3888db6972c547ec61bf969e1e79611eccad88e153f8c16c3813ec0e617d804d648dc6b910dc5695fd2bd45621df06e2e1a1 WHIRLPOOL cf709da8d7e3836415ccb95e37791b57eb20835cc98df00c5c1046b09ac62a66da67ce3e84804b464f57e7195485f5abd5e0a2efacd570e8441360a4252be771
diff --git a/dev-perl/AnyEvent-HTTPD/metadata.xml b/dev-perl/AnyEvent-HTTPD/metadata.xml
index bc6e5f218b61..7a5e2af12075 100644
--- a/dev-perl/AnyEvent-HTTPD/metadata.xml
+++ b/dev-perl/AnyEvent-HTTPD/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>perl@gentoo.org</email>
-  <name>Gentoo Perl Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">AnyEvent-HTTPD</remote-id>
+    <remote-id type="cpan-module">AnyEvent::HTTPD</remote-id>
+    <remote-id type="cpan-module">AnyEvent::HTTPD::HTTPConnection</remote-id>
+    <remote-id type="cpan-module">AnyEvent::HTTPD::HTTPServer</remote-id>
+    <remote-id type="cpan-module">AnyEvent::HTTPD::Request</remote-id>
+    <remote-id type="cpan-module">AnyEvent::HTTPD::Util</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild b/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild
new file mode 100644
index 000000000000..1540bd970876
--- /dev/null
+++ b/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PHRED
+DIST_VERSION=1.12
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="Authentication and Authorization via Perl's DBI"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Digest-SHA1-2.10.0
+	>=virtual/perl-Digest-MD5-2.2
+	>=dev-perl/DBI-1.30"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+src_test() {
+	local MODULES=(
+		"Apache::DBI ${DIST_VERSION}"
+	# Defaults to Apache1 Logic, but supports
+	# Apache2 but must run under Apache2
+	#	"Apache::AuthDBI ${DIST_VERSION}"
+	)
+	has_version "dev-perl/DBD-mysql" && MODULES+=( "DBD::mysql" );
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	local i;
+	elog "Install the following dependencies for comprehensive tests:"
+	i="$(if has_version "dev-perl/DBD-mysql"; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i dev-perl/DBD-mysql"
+	elog "    - Test apache authentication using mysql as a backing store"
+	elog "      (Also requires a running mysql instance)"
+	elog "For testing details, see:"
+	elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Apache-DBI"
+	perl-module_src_test
+}
diff --git a/dev-perl/Apache-DBI/Manifest b/dev-perl/Apache-DBI/Manifest
index 0ffaff0bc90d..907c6c06c1c2 100644
--- a/dev-perl/Apache-DBI/Manifest
+++ b/dev-perl/Apache-DBI/Manifest
@@ -1,5 +1,6 @@
 DIST Apache-DBI-1.12.tar.gz 35017 SHA256 9d7d520da7e579756a032021bcdbe61a3a3e5fae90df767f0cea08b3c666e677 SHA512 5b989856f7b6cb75a7a7a9b1ee8e166a1f5aa03475574d340933f135f813d55806f4bdf878faac49cb72a1b00f4ee23ddedb90909869771f4d613bbfd4ed135b WHIRLPOOL 1990461da800e21b36087a21681673e7c3503b31e9c4e74f67285ea8bc418ca8d6c125f5f05d8d5a6823d8db0490c8e11d9849efd7ca9662e31040303d82f5ac
 EBUILD Apache-DBI-1.120.0-r1.ebuild 401 SHA256 014fff4f8c24ddbf9aa92f83c93411a982ba8bb6774b066c5cdf1e254d78dba5 SHA512 eecf2b5da1bd2027e21717e989716c7e2517a6f4016a31c7ff15c42b1b96683b06c6bcca9c3bcac7299fef3419961803e84628321fef6972644e6afa6b991ccc WHIRLPOOL 59b9361397d437cd1b6f75fa659976aaa9cecb7f0cc731732a06ab6a77a26a5782a1b58eba5b7d6c8414d323ed774c78e5b26f930702e4b0d24e396610ae4344
+EBUILD Apache-DBI-1.120.0-r2.ebuild 1571 SHA256 1f39b2d8bc797d9b20e95535b07b9951a8f7890cd33e87123ea4a4197d959dc5 SHA512 ec8c57846483d2d45b4affa1bf8a6a93cbeca3738c49f134390c23a82ddcbf76b5412c02544a18cb6c079949fba8fa0ad31e1a5c39bcc6945e1d2fd732b76ded WHIRLPOOL 47829545c468eecba958deddf3ae973bdb7c4e8eea76aa14eb9327fe206002b2d479c1f88430b1b21ea97ec564b09fde41472e4e71fa11d4a45550a013223383
 MISC ChangeLog 2446 SHA256 6fc41ace358de0b1e44f10d127f4bba22f136e5cfdcdbced0dd2c9f4a8658052 SHA512 278db37c4cde4cda184a288be85e151d2e8af6e6f7cc4431ecf329a93316735e600046131820d4188a96093006b27345d8150cc36b8e8cd5301e3127a3397de9 WHIRLPOOL d3b2eed6ddc9302c0a1862697cfb88da58ae056db2bee06c5db42241bac7f5612286849eb0110f03056cf1853a73fccce2a8c36975e178864a515b0a6c262a48
 MISC ChangeLog-2015 9293 SHA256 6baa091a328e9b141b7ec898ef35bc170712d47f231e5db9f0ba7aeba9ae8e34 SHA512 24d24164694a55b107d5f958d2297e579980113891ff3535a05c5eb0df01125f282d84cc35b0d826037d48f879549f64fa839f537ac90e06e37796269f373482 WHIRLPOOL ee5df08b1ae98ccb55dc602c61bc6c5fa69cfd297d0428f493e9a3b0e8b68ea3324f1db3e3c92aeee07207720000ef8e7e7f8dee9c3c928f56a68cf9c98f42a0
 MISC metadata.xml 516 SHA256 a5004937c977ada686ca2ddfc1bb8ae80d0f80e17008d9cd2fb6e5137fe89d5b SHA512 64f086390369d45cfc2c13873edfd141598e9d1e24a8f5be4d62447bc8b1b49a807eb4577fde3457ebd29b025e1fd8c605f09388317d2e81822484cedcc8f507 WHIRLPOOL 13779f8117b6e56887472fb9d4b05b62d994a6049fcb06c81ac678d86495b3517c96a8d52b26aa877d1a597026fa184c051d3428c15e13bb66fd47a2a08c3a60
diff --git a/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild b/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild
new file mode 100644
index 000000000000..4d26ce840205
--- /dev/null
+++ b/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SHAY
+DIST_VERSION=0.13
+inherit perl-module
+
+DESCRIPTION="Automatically reload changed modules without restarting Apache"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="www-apache/mod_perl"
+DEPEND="${RDEPEND}
+	dev-perl/Apache-Test
+"
+
+src_test() {
+	local MODULES=(
+		"Apache::Reload ${DIST_VERSION}"
+		"Apache2::Reload ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Apache-Reload/Manifest b/dev-perl/Apache-Reload/Manifest
index 9f472127f243..7a81ea8b35a0 100644
--- a/dev-perl/Apache-Reload/Manifest
+++ b/dev-perl/Apache-Reload/Manifest
@@ -1,4 +1,5 @@
 DIST Apache-Reload-0.13.tar.gz 18908 SHA256 c8d0bfc1c18f0f0de39f4ad7f374f1a66a22daa3d1120f6deac2b8c550aa296a SHA512 7209fbd682093cca5f724050ee71d8bd26d101c3edfedb2cdaaf2e09df903e1f12cdf5cb6f4717eb8814802924359a01c89657dd5769f94c46d064db30c9f7e2 WHIRLPOOL 992e7f9bb1a08087721a5b4fb547cb725e488e22bcb16588627c035e38eb27df1f6eda7d6e603c62de255aa921ecd3b2d0354484739d4d3854b4c7cc6c579e6a
+EBUILD Apache-Reload-0.130.0-r1.ebuild 897 SHA256 9cfd9f0ee4cc3bd52448f16a087b3e03b8ca8fcc79bf8c9064c25c5f8a2cecdf SHA512 956b2b0d937851113405b46975127f054e1191f0f7ed179f826279bdbad6a62d34f3b745c9cffbc29ee7eb9d704b2871340154d1e23ea47addaa1194f40dab9b WHIRLPOOL 5e7982c07a831fff5bec88101a625a3b8524749c525b4f14087e75a73608748442e3590a8e304c7f91afa5c497b2d4312f14e3dfedfaf126b825713910006503
 EBUILD Apache-Reload-0.130.0.ebuild 353 SHA256 618860cbbe1d9349afb1640fff31bdd799029dcc3ff741e5a36141a5e88f0908 SHA512 35ab3eb1929e6cca7797b065a23cf7589032972391375be53c6375f30f57873ab3cda7926c21cdd5e5a94a88fc68f850563ea83b866c5c02f437bc4113a96a0e WHIRLPOOL 9683bace2e4d370a1e28ed6165dbddb4578179e859aa8a3e45a3b991e7d0b59392180e7c9f06858a806ea7bb2a131942bdd336eedcd33161da96809b5d274ede
 MISC ChangeLog 4390 SHA256 4b611b8a88a91d9671205b7ce349001ca5de7f4010539b7574ffc1d05e3fe766 SHA512 2de0e915fca33e07c100130d010eebb2a044ba69b683eed0a4d543db342ed029728cfc47d170012916e9e06a95d6e3cae8f65cfdcf13cb1c31be9aee97b25fce WHIRLPOOL 970fc8c95f17f92da554b626ac9fed1d6cd0c5c030f4279ec913270e320f94847675379fb21a668e0e98a55f587adf3e7a552297f32ef8f43494b5ff54b91eb8
 MISC ChangeLog-2015 4334 SHA256 decfb6fcb199753fb1075a91c3c5ba15d2e47e4209242d905e47ea347a850e78 SHA512 a0b17f18aa555c3363993efe1fafbf9a827625c905e3c15e5d0579fb6d663f90b86d4737d7c0cfc952fedb93992fa516935b5a6bb7de81a242b3407ead9f72fb WHIRLPOOL a0e1f67c5d941ccfb0f866d40f0f3144d224c458e55f46e32af1712de197e1954255567edf1e6f80304c6e2d2555b45a15f8e28e02454d8e050ae1e0f9cce314
diff --git a/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild b/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
new file mode 100644
index 000000000000..2c4a9339e935
--- /dev/null
+++ b/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SHAY
+DIST_VERSION=1.40
+inherit depend.apache perl-module
+
+DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+need_apache
+
+PATCHES=(
+	"${FILESDIR}/${P}-catfile-import.patch"
+	"${FILESDIR}/${P}-fix-missing-semicolon.patch"
+	"${FILESDIR}/${P}-phpclient.patch"
+)
+
+pkg_setup() {
+	perl_set_version
+}
+
+src_install() {
+	# This is to avoid conflicts with a deprecated Apache::Test stepping
+	# in and causing problems/install errors
+	if [ -f  "${S}"/.mypacklist ];
+	then
+		rm -f "${S}"/.mypacklist
+	fi
+	perl-module_src_install
+}
+# Parallel tests seem to be bad.
+DIST_TEST="do"
+src_test() {
+	local MODULES=(
+		"Apache::Test ${DIST_VERSION}"
+		"Apache::Test5005compat 0.01"
+		"Apache::TestBuild"
+		"Apache::TestClient"
+		"Apache::TestCommon"
+		"Apache::TestCommonPost"
+		"Apache::TestConfig"
+		"Apache::TestConfigC"
+		"Apache::TestConfigPHP"
+		"Apache::TestConfigParrot"
+		"Apache::TestConfigParse"
+		"Apache::TestConfigPerl"
+		"Apache::TestHandler"
+		"Apache::TestHarness"
+		"Apache::TestHarnessPHP"
+		"Apache::TestMB"
+		"Apache::TestMM"
+		"Apache::TestPerlDB"
+		"Apache::TestReport"
+		"Apache::TestReportPerl"
+		"Apache::TestRequest"
+		"Apache::TestRun"
+		"Apache::TestRunPHP 1.00"
+		"Apache::TestRunParrot 1.00"
+		"Apache::TestRunPerl 1.00"
+		"Apache::TestSSLCA"
+		"Apache::TestServer"
+		"Apache::TestSmoke"
+		"Apache::TestSmokePerl"
+		"Apache::TestSort"
+		"Apache::TestTrace 0.01"
+		"Apache::TestUtil 0.02"
+		"Bundle::ApacheTest ${DISTVERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl_rm_files t/more/02testmore.t t/more/04testmore.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Apache-Test/Manifest b/dev-perl/Apache-Test/Manifest
index 33370b4242ae..253705a97723 100644
--- a/dev-perl/Apache-Test/Manifest
+++ b/dev-perl/Apache-Test/Manifest
@@ -1,9 +1,13 @@
+AUX Apache-Test-1.400.0-catfile-import.patch 813 SHA256 9c839519e17acd5de7c376e1d15496bd7b4899953122966941cd91c5a0c6ab00 SHA512 2c7807a0e69652b58f8d5297ac5e24f90ae3e453a3025dc441afef0134eed7dd0d78728dfce47a15c93c498f6e70404b1a79df07de55b376ae267453ba0b990b WHIRLPOOL d335c13ec7553572a26cb738e63f7404219f00a625540b238b66a1467154b6f1ee40c76895fd6ab913ae1ffffee4b6d5ed260e4b1115f7bcba34e2757633477d
+AUX Apache-Test-1.400.0-fix-missing-semicolon.patch 761 SHA256 73563fd7ff2192158d0923ec9a4f67f835f50bb7410d7cae316c05d917d15be7 SHA512 eb5a66ce55fb4186cf6b5145872cbddc166882568da0cb397315d69b0ff3c986dd59daf8f6ba8cad831fe4b471efa64ec81515e59f6bb28f9d5bfcb26b80999e WHIRLPOOL bb0d20f29ff7ac4f504b2f4359291e5e4aa7f3cd69d894521dbbdc6abe9528f248391282d5f50b38c16b085313234820bac1f0027eb1b4cfa26b8bb586c8579d
+AUX Apache-Test-1.400.0-phpclient.patch 909 SHA256 5f3e997748f4f8252f6286f1c57e3d9bba6a832e82524653f0a5b1a8a8b0ab12 SHA512 45eb984222177a2d63402378db9641d1abebcd7c1a1207687330e71c6f0717278bd3a15e35c988c4846f19ae0eaf1c88cdaf0b74a9f78a35f6826b396420a101 WHIRLPOOL 3a3c02e555c32699c37efb0b01cc79bcebedba5fe97b01f484dff3f0f0053e0a55d25c7fdae5fd867626c34789db8996db393bf48809615f2185d6029defad97
 DIST Apache-Test-1.38.tar.gz 150863 SHA256 321717f58636ed0aa85cba6d69fc01e2ccbc90ba71ec2dcc2134d8401af65145 SHA512 416a89990e1947dfd970b806a28b52197165bbe1a482402aa5649f6e2692866a54cc8a4a7adcce83350e2f16aada409fd6c506c0d139b624319c5ebaa58604cc WHIRLPOOL 6f5724b9e56dcd268c8dfa3469b85e6f3f9ef02e9e524386d0af12377d9e560831155913392f04ef9e7b130b0b495e1e5e013a52cd0f4c747507f8f845665e6c
 DIST Apache-Test-1.39.tar.gz 151240 SHA256 d8543864ff29e8ac3d4004c5c7014b1fe490b2024104ac4c24683a74bba62089 SHA512 4f10b0ed856d03aff27aa80d9788f0a2f50eac3523cc7ecf74fec2cda4c881fda2ec096ca238539eb8c4aa2caa4daaa192456f34d00ad8012276c1d87fcc3533 WHIRLPOOL 01a77e14a1464a0caa8154dd4ff68b6b6dc5e7220ae1d4efe63e2a9eb2134ec94d0d5b73c6701de21c0a7d620d1e4bfe2db768c2cd08d9a984609bb7186beaea
 DIST Apache-Test-1.40.tar.gz 151801 SHA256 3cf537f1c81deb549d62be7fd5ee1af439283a9e93f3d13465d01a1d41d4ae40 SHA512 f48a1b93c4d61181670ec59bb8bb2231122b22ec9725d8899a3b2f82d2918fdc48a09494c2f45b0e6a603546481892a948eac3494e06c8eb219a9213e1faadb8 WHIRLPOOL 9456d81354cf4fc22fb67d35053daba43fb0fcdcc6c3ef2c537a6996268371db988bbc335635e3557104430c35ddefbb6a455a8da83eb00fba648fb7cfb17656
 EBUILD Apache-Test-1.380.0-r1.ebuild 702 SHA256 2e6c510e19a290d48b4641b53b8f4e8c5d1dc344a9317442c6b0012807f2df92 SHA512 7ea1d14c691f16ae5797d0d553bddd5c45b24b74e5bd13f98f126c4cce2654989a039b3dcac18153cc68d33e44bb5a1948b38253a20b991b6ac661e70a659a37 WHIRLPOOL d20402a42075f9cb9352251aedae5c4347593cfff8a12af34d27295836fbd3674a90a7ba2ad6057406ea37e7e3140f934fa98c658dec9e75937f64374e5049e5
 EBUILD Apache-Test-1.390.0.ebuild 754 SHA256 ba6dc1311776e0361e76ef26dc6f44efc3c570a2c49e7373a50948424cbbebb5 SHA512 4d4642738553febf2b2f70f2f3d73ddd86bef2c4d3be15b919d8d84bad1d78d74f68b057ccbd51950445172808a6df015088a4563c91659a3f5a5a11f2411e45 WHIRLPOOL a0e791a1a2616daaf23d0c23b89be22d64037a69cee0696ae3cb05ddc669ef7be26d7a109e172fb6b1519d7bf3145407ae7110b64034ff2cfe61a26876029567
 EBUILD Apache-Test-1.400.0-r1.ebuild 751 SHA256 81c71a1bdc1443a3959f0919ace59246859d2d8c0f1ce97300ea535de87b58ea SHA512 98c6815e5ece4196621fcb12e4695f861c84e66adeb7860ad33b46e8653b266e96336628c0d7374d61f5b25e65d37c76073efc39d9ed9ad879f7a2bcf5db9b97 WHIRLPOOL 5794762a92d1b90b030778d360cb4b58bc50b9d112f8ff46c618342d239cde97499398745d1d54f0f23fd3b6e6b47b3e37273f0810524ca6c1127f66c66e9110
+EBUILD Apache-Test-1.400.0-r2.ebuild 2171 SHA256 ee3da8bfcbc0e1482cf3b87ac6ff043da8e81074f7cd97037942111aed40dc1f SHA512 e01b457e22c554c34ffe6b0a19babb4ff416f975d717de75886ddfbb39484988b8cc9323d285720c5682e6f8e962f693ba01775cdd30a36dccf31a8965e48b6d WHIRLPOOL 9a32f016f4b8374590623f81d62137fdafb01712148e078a9609b0b2a7edfe0733830b11bbe9f16996f0d9549fe953940b1b9ff9303bc73db3aa924add205083
 MISC ChangeLog 3724 SHA256 93681aecac27872037067fa6e89e3d3079d5c69e6a86a80a6cbbadb3e316edb8 SHA512 ef5dec103c105545f3dd267b2ed3799bf4ca8dd9c0528240271a6c466528f5c2b912ee854397344ad78087299ebed36dd444449725f9268df92fa82609e11171 WHIRLPOOL 580471a29ee6256cca56fa7ef8de3bff07a1401df36d8e3c46cd047d06fadfd52fdb3b2a018eb1d1145170132b5728a219ca5e67d88201e18ef2d00a5613ea55
 MISC ChangeLog-2015 13033 SHA256 9e29143ecc9a3c382de7e7c14ccab43daa69d5c25f331f01daad9dbe0b076048 SHA512 96f87bd59376d6a9eb3ff965380022f42b37f7b3fbc0b74769a9009eede209474bff0626435dbe4bf571ec188443c804097db6208a42c88f7c6a0b9f40f75037 WHIRLPOOL c6d9ef3eba8f6740441086cba198343af270a5a6cb3599c3571010a02e315dbbff69c41edc0920954d82660b19c937c371ee98bb136053cae803c2cac2872b7e
 MISC metadata.xml 2858 SHA256 87acbbe6a536ae097daa2bacd25a492762329e5fd445fb4fa348ee9b9828df58 SHA512 1db84f146dd887e3719328aba99809ac3ba8462226b9109310675b1722b2874cddd54b82900852082160bd47bf157611ba9f324d1f2964ee6912d4bff3690517 WHIRLPOOL e7872451d1ad490a62c71a4cfcc1be445f36d27cf257ba702717d54900e6289676b00fc9aa75d36bf2d96602016b2c0c269bf5b818cf4bb75a2b96feb1394d70
diff --git a/dev-perl/Apache-Test/files/Apache-Test-1.400.0-catfile-import.patch b/dev-perl/Apache-Test/files/Apache-Test-1.400.0-catfile-import.patch
new file mode 100644
index 000000000000..8bd6dbfddf62
--- /dev/null
+++ b/dev-perl/Apache-Test/files/Apache-Test-1.400.0-catfile-import.patch
@@ -0,0 +1,26 @@
+From f06bb625c7feb44bf9b5c13617522ce57cdad84e Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 15 Oct 2017 06:16:45 +1300
+Subject: Fix missing import of "catfile"
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123283
+---
+ lib/Apache/TestConfigParse.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Apache/TestConfigParse.pm b/lib/Apache/TestConfigParse.pm
+index 88a19af..8fe0fe4 100644
+--- a/lib/Apache/TestConfigParse.pm
++++ b/lib/Apache/TestConfigParse.pm
+@@ -23,7 +23,7 @@ use warnings FATAL => 'all';
+ 
+ use Apache::TestTrace;
+ 
+-use File::Spec::Functions qw(rel2abs splitdir file_name_is_absolute);
++use File::Spec::Functions qw(rel2abs splitdir file_name_is_absolute catfile);
+ use File::Basename qw(dirname basename);
+ 
+ sub strip_quotes {
+-- 
+2.14.2
+
diff --git a/dev-perl/Apache-Test/files/Apache-Test-1.400.0-fix-missing-semicolon.patch b/dev-perl/Apache-Test/files/Apache-Test-1.400.0-fix-missing-semicolon.patch
new file mode 100644
index 000000000000..f09cd53348fc
--- /dev/null
+++ b/dev-perl/Apache-Test/files/Apache-Test-1.400.0-fix-missing-semicolon.patch
@@ -0,0 +1,26 @@
+From b2a2cdc1e9a3121ea8848ab4a2410c5dcc68d620 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 15 Oct 2017 06:15:47 +1300
+Subject: Fix missing ";"
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123282
+---
+ lib/Apache/TestConfigPHP.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Apache/TestConfigPHP.pm b/lib/Apache/TestConfigPHP.pm
+index 0ddea0b..1c79865 100644
+--- a/lib/Apache/TestConfigPHP.pm
++++ b/lib/Apache/TestConfigPHP.pm
+@@ -170,7 +170,7 @@ sub configure_php_ini {
+     my $dir  = catfile $self->{vars}->{serverroot}, 'conf';
+     my $file = catfile $dir, 'php.ini';
+ 
+-    return if -e $file
++    return if -e $file;
+ 
+     my $log  = catfile $self->{vars}->{t_logs}, 'error_log';
+ 
+-- 
+2.14.2
+
diff --git a/dev-perl/Apache-Test/files/Apache-Test-1.400.0-phpclient.patch b/dev-perl/Apache-Test/files/Apache-Test-1.400.0-phpclient.patch
new file mode 100644
index 000000000000..cecf7de10850
--- /dev/null
+++ b/dev-perl/Apache-Test/files/Apache-Test-1.400.0-phpclient.patch
@@ -0,0 +1,29 @@
+From 2dbb0fcab02ea60c0ca5e6ab4150691ffcfb8d7c Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 15 Oct 2017 06:47:45 +1300
+Subject: Don't die at load time due to undeclared '$phpclient'
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123284
+---
+ lib/Apache/TestHarnessPHP.pm | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/lib/Apache/TestHarnessPHP.pm b/lib/Apache/TestHarnessPHP.pm
+index 90fdedc..806ba6f 100644
+--- a/lib/Apache/TestHarnessPHP.pm
++++ b/lib/Apache/TestHarnessPHP.pm
+@@ -90,11 +90,6 @@ sub get_tests {
+                             'make sure php is in your PATH');
+         @tests = grep { not /\.php$/ } @tests;
+     }
+-    elsif (! $phpclient) {
+-        warning(join ' - ', 'skipping *.php tests',
+-                            'Test::Harness 2.38 not available');
+-        @tests = grep { not /\.php$/ } @tests;
+-    }
+ 
+     return @tests;
+ }
+-- 
+2.14.2
+
diff --git a/dev-perl/Apache2-AuthenNTLM/Apache2-AuthenNTLM-0.20.0-r2.ebuild b/dev-perl/Apache2-AuthenNTLM/Apache2-AuthenNTLM-0.20.0-r2.ebuild
new file mode 100644
index 000000000000..3f376ef51fd5
--- /dev/null
+++ b/dev-perl/Apache2-AuthenNTLM/Apache2-AuthenNTLM-0.20.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SPEEVES
+DIST_VERSION=0.02
+inherit perl-module
+
+DESCRIPTION="Perform Microsoft NTLM and Basic User Authentication"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/perl-MIME-Base64
+	>=www-apache/mod_perl-2"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	local MODULES=(
+		"Apache2::AuthenNTLM ${DIST_VERSION}"
+		"Authen::Smb 0.96"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Apache2-AuthenNTLM/Manifest b/dev-perl/Apache2-AuthenNTLM/Manifest
index 490e8943e2c2..77bad50932e8 100644
--- a/dev-perl/Apache2-AuthenNTLM/Manifest
+++ b/dev-perl/Apache2-AuthenNTLM/Manifest
@@ -1,5 +1,6 @@
 DIST Apache2-AuthenNTLM-0.02.tar.gz 51597 SHA256 1d19544482b560e7848dc582b536fbf6b1f75ce4968ab5edf27157c16e8f4fb3 SHA512 783ca41ee2b4c89d5d793dcbd00c2bf4d58842825e56933bdeb8b74c35f38e5a6d32c49987f938a801f9cc3555922423afb10cb182b8160de29f4a082c1b9ee3 WHIRLPOOL 1ece412c115eea59a992da5525f1072e2c6266aa8cf1c1a7acb2d49647180f7b756d6b373b5ee68caafa902ad223fb86cc289cf912d18b92bb0ef9df8bb88ed7
 EBUILD Apache2-AuthenNTLM-0.20.0-r1.ebuild 388 SHA256 3e00b8a37675948cdd276102386052b2240bb2d477407c4961537a18ad90fb47 SHA512 b4d01f0a76bd2f887de26b69acd6c97414daa69adfe2fe06539f7118220465d29c3c554f297084cedf8f524b0e5801778dfaab606e78f992866ea53c7b68ed53 WHIRLPOOL 5f8a6fbc195f559c8ebe203d928bfb282185e302a45082f2c9da4aefe2419906051d957b1de26df6a53e463392c1ea0d190c4fb709241f220b8ebd325b22d50c
+EBUILD Apache2-AuthenNTLM-0.20.0-r2.ebuild 842 SHA256 64aed100131b00655beb8e9b23b8109321ef0a781408c2eab9ae042a67b2e9e4 SHA512 8432994c937ec665eb5a838aca734242e64ab72609759287a9d8e1f5f0b3411215a3ce086f708cb709c168a7e17d4adaf09a83b0417f02303645078775f8001d WHIRLPOOL b905790f2691449792a5333aad0c40de36655b649c1300bb06af8e9b35d8d27381687b04862cc50cfafb7adb9cbac2ae1d1ec312a48b8f2d908504ba6ba6ec1f
 MISC ChangeLog 2468 SHA256 debf3e35771ea01128d2cc78ea11e76e50f602baf0a7b1dfaecad7fe004072ba SHA512 5359c888dccfd0739e9c25d37195a4fad670d72d3ccad5fc514514d1440dce98f1cbf242e044fa7c95d9e4bbed8132cbdfcd4c277dbc03283d5d8b63377f2f26 WHIRLPOOL fb1c86f0f49466fd20aca0ec756d8e0350e7e6d268d3f62fc3bab11e576a7ba8c536181d0610ea99872fd9376672e8ce4958fc9cc9ad2fe74b55e39016b32122
 MISC ChangeLog-2015 1701 SHA256 58e19eb63e9c782c34f463213d1c0628537857ab0d48e5bd50ec8ec793e664ad SHA512 274110c1665accb1700405e0178266a90b38d2f81100fc2151e3d2e53976a0fdb6c11893af019cbf14cc4e8baa06d480d8671e58eb9f3256c24bc61a950cf530 WHIRLPOOL 23807e5370e8139eaba21eddf46d4b6f7992dc38aa295c9913534ef26bd1a7c028cf84c010efa44f1ec71605d55343ebeabe5a8b1ae0b06698422566b91086a6
 MISC metadata.xml 930 SHA256 a35b56374ab4295daaf873529d1f1178ecb3e4c83c8920e6656fdc510908af7a SHA512 b7805c859a2a1eb602df61e58938f82fddff98da80cbad47d87ec360a5e0ff5ac45e7aa51f00b8682c4745ae705141b9c0899cb585d6a5ea009b67e666c405ec WHIRLPOOL 2d83e7e223daa1ffdd4493e131c8956ad144fb76236e656e97af4c76dd5c279362ce056d486bd4e1004255cfffe132f1d4d832845c52cfd1ec748a64ef4bcf35
diff --git a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
index a86297f3dbc0..5aa0b7d98f73 100644
--- a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
+++ b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
 # This appears it should really be entitled Audio-CD
 # There are * QA Notice: errors on building however the HOMEPAGE gives no source repo in which to file
 # prob. not worth the trouble for this little script.
 
-EAPI=5
 inherit perl-module
 
 MY_P=Audio-CD-${PV}
diff --git a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r2.ebuild b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r2.ebuild
new file mode 100644
index 000000000000..74a86f955772
--- /dev/null
+++ b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# This appears it should really be entitled Audio-CD
+# There are * QA Notice: errors on building however the HOMEPAGE gives no source repo in which to file
+# prob. not worth the trouble for this little script.
+
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+MY_P=Audio-CD-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Perl Module needed for app-cdr/disc-cover"
+HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
+SRC_URI="http://www.vanhemert.co.uk/files/${MY_P}.tar.gz"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-perl/URI-1.10
+	>=dev-perl/HTML-Parser-3.15
+	>=virtual/perl-MIME-Base64-2.12
+	>=virtual/perl-Digest-MD5-2.12
+	>=virtual/perl-libnet-1.0703-r1
+	>=dev-perl/libwww-perl-5.50
+	>=media-libs/libcdaudio-0.99.6"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	local MODULES=(
+		"Audio::CD ${PV}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Audio-CD-disc-cover/Manifest b/dev-perl/Audio-CD-disc-cover/Manifest
index 8178553c887a..298126eaf6a1 100644
--- a/dev-perl/Audio-CD-disc-cover/Manifest
+++ b/dev-perl/Audio-CD-disc-cover/Manifest
@@ -1,5 +1,6 @@
 DIST Audio-CD-0.05.tar.gz 10417 SHA256 04426156228bd0b4bfbd33241dd2267c2fd644780ab0173d4343f0b5b039485d SHA512 c4d9a6ff57119431315329a92accf9c0f6b4fd52d1fbf9d6c79743b50ac73ebddc6b541a7807344d6eefd12a7681945b4ee3885abfe32acb68b9d17d070d6d09 WHIRLPOOL 858bc2e27629997771969ff817ac426fad11783aec3f4c34899515761342786279e0e8409bc2b23037eee926c1aadcfd2a601271ae56141eb6306380155738d9
-EBUILD Audio-CD-disc-cover-0.05-r1.ebuild 865 SHA256 94fcaa364d0131be011757ca7bab57dc2250dcf4b07adf11ba5b2154dcee1a12 SHA512 ee6d4c30e64ff663536326348da6dbcd89e3520710e600d7fbd08ebae0f50c90777c8a70f6d37ef8e99cfa26d9f26bfd5afa88c7b4c71e6e2c33fc5ae36f8e40 WHIRLPOOL 4904f9e7e7caa92fe4edb52ced0abf46c901d493b19be22a3dcf5ced87a02baf51e26a9484eb73ca9ca6dcdff7ab789dd598f2b139c840d5422b80c9f0f48c36
+EBUILD Audio-CD-disc-cover-0.05-r1.ebuild 867 SHA256 b31a881a9c6478e5eef1c8f9589376f51177da98ea1f55d9bc3a3dd1b64a9603 SHA512 1d14c1de36dcdb6ce3ace7d37c490a135568389cf011dc8a45310e2d5fae663f808985f26986affea4cf7a1b41eae41a30b6b8bdecba1fa2286f66073fb71471 WHIRLPOOL 714170699cd8a454a37a8ae715145ed287681438eec58745afb9c74e1e10e34ce1bdf57a43b69106164da71818dc41f7edcfd65fa263714df2b2928cce507d53
+EBUILD Audio-CD-disc-cover-0.05-r2.ebuild 1322 SHA256 0bc2fd9991fac03a8906bf2e8d2e48ecb1bed0b55b9d30f04aa0060705f49a3d SHA512 82ae04037b630cc64bbcc4e90064f67c5d5b6ceeac45e2d6eeb9fe8778d06814bfad0c6f728fe2cc603fbd8610edc063f5b3cf6fe97078209650c1d0ac6153f8 WHIRLPOOL 3c9d975f4de7135fc3eea3a2f92adc65a65a8f10904926d295317a387e7a926561d411c181447bddb91cf1b85c728af2cae590d6ac10e3c09e0265e97ad908bc
 MISC ChangeLog 2467 SHA256 b23dd75d72a575f4593c3baed81047713628df49d626465b2a7c640b9ca85e08 SHA512 f10c24ed29531ee4e25180c4c6284d70897b313f3fe233b2b3feff19ef630baf2e2600bab5a7cb89065c571698eefebd869067c783c9f4318f1db234c38c37cd WHIRLPOOL 5e215cbd0238f4e49df83707707b3cfb77ec76bb8d3f88f937c71161eb2be8744d13e93d68d39af0410b34f53e44c5eb42d52f5727229a94d257223681a3e428
 MISC ChangeLog-2015 3589 SHA256 b8a2c51719039e6cf2ac5ef233d935e9985cba0307c773d18dcaf25bebcf2f02 SHA512 446fa02673e5bb801a235a84efbbde436ec97d589545a73dae936f4a0bec5ef2a5efdcf28eb33f2f5b9f6ea52c195d48d9d976c539bf365e7eda2db4062dd424 WHIRLPOOL 96edf6c0410334c034b9d38f1db3d8c519be255eb3c5e59e0de80d4d6fc9d9d39f8d0d667499a4f2eb31458806a9ded3e0afdc7dcb31d0b44e94b1592189690b
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 388 SHA256 691d684239e25f9f181203e6e1dfbcc7cc0303c962c782f6f050cbbd841e98f7 SHA512 2cb3255874a04f083cab08182f7d9842a8b5a800cd6f44b9854b32a6778b6928920fca9f73082bed132a0422d7e8d160c8df6c175e1b68e32cbd2af95380303e WHIRLPOOL dd32199e3460e5a6682a75aae29aca7bf6b2dfd0b62e7d81aee76979e6a723f4802062b03e5693d9e3be477e6f832bbef6818226c62576053a24bc5fc839d75c
diff --git a/dev-perl/Audio-CD-disc-cover/metadata.xml b/dev-perl/Audio-CD-disc-cover/metadata.xml
index 2b9a936fc0a1..2f4aa2eaba23 100644
--- a/dev-perl/Audio-CD-disc-cover/metadata.xml
+++ b/dev-perl/Audio-CD-disc-cover/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Audio-CD</remote-id>
+    <remote-id type="cpan-module">Audio::CD</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Audio-DSP/Audio-DSP-0.20.0-r2.ebuild b/dev-perl/Audio-DSP/Audio-DSP-0.20.0-r2.ebuild
new file mode 100644
index 000000000000..568c4b995f1b
--- /dev/null
+++ b/dev-perl/Audio-DSP/Audio-DSP-0.20.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SETHJ
+DIST_VERSION=0.02
+inherit perl-module
+
+DESCRIPTION="Perl interface to *NIX digital audio device"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+src_test() {
+	local MODULES=(
+		"Audio::DSP ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	if [[ "${AUDIO_DSP_HW_TEST:-0}" == 0 ]]; then
+		ewarn "Comprehensive testing of this module needs hardware access to dsp"
+		ewarn "devices. Set AUDIO_DSP_HW_TEST=1 in your environment if you want full"
+		ewarn "coverage"
+		ewarn "For details, see:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Audio-DSP"
+	else
+		perl-module_src_test
+	fi
+}
diff --git a/dev-perl/Audio-DSP/Manifest b/dev-perl/Audio-DSP/Manifest
index d241f209ece6..c7fe4202dd1d 100644
--- a/dev-perl/Audio-DSP/Manifest
+++ b/dev-perl/Audio-DSP/Manifest
@@ -1,5 +1,6 @@
 DIST Audio-DSP-0.02.tar.gz 28446 SHA256 fc5f018f7f4247111ade59c3d1bff7c65b3e09cbe11217e25151c7f4328dba04 SHA512 19b4526962ac2f229f9fca4490e2542e4c259e35aea626f684a225a673666b632f6c69cf33d0940f97bfa7b3c8a2ba86674dc1efe8efb432be9bc0a371d61fa2 WHIRLPOOL 714b1fd27bd2be099b6add898a7983049cec7ebc4b65ec5d289deb2ec3b6120229bb64281226094cd81ab9751fb77dd380ee71da030865ac18930d08de75f585
 EBUILD Audio-DSP-0.20.0-r1.ebuild 281 SHA256 e8e668d76f29bdedb8fd8a2b2d1c34ffbf72eb0b2e6094ad3e937d7163425e4b SHA512 0d1a07e1d20a94eb857be793f39490a3c4c0674e1dfa9b21b814cf7b15ab60aebbb12d6504e6c9600d1a5939b08212e53e507a8b33ac4c7759c4331196cb1ba5 WHIRLPOOL b8a71a78fc565366c06725f3703f01c6cfeb1ef919d2cfefdce1713286240feb9ed892cf8c3b5801a41e6090b042a45b6b5d2a817945bf0ff3d9bf808ffa62c1
+EBUILD Audio-DSP-0.20.0-r2.ebuild 1071 SHA256 006c092a1f90319fa48526fa7c5f248dbe395abd0399200a7dde8f5941acf25c SHA512 a039d02815443e7fba53a3fe8c2be5691d319c0e6003258e5b55d80ea240d69a4b3a50237aa8461732a89f19aed0f551a8992b26aad43d734a1cfea119a4a195 WHIRLPOOL 2f770e987f90268b64ce5fd8b56681a720d712c5bec26ab3da06140c73541b43e80e9d01557241b2e4f71b5e60ff37db3270f42ed9a71b1724e069c3ca73b7d6
 MISC ChangeLog 2441 SHA256 d902e7a3886810af00a71165dd906b6071c5010e768fd1dc45a85abd438f2104 SHA512 319a86e28e65c07009669862d4f1723b4c4a62a1814056de5dca7f48d8b24306d49cbc96e7978fc6b173d43bc4998343452b5490ec87165503091ed8e9456810 WHIRLPOOL 9b5c41cc829ffff9fb294b1deda6870ebad52d6b5acff196cef49e08113df4a0affd91539c193061171b2dace9eca623a9608a2f4bfa93cc7095b3b4acdb38ce
 MISC ChangeLog-2015 1295 SHA256 332ea6ab48595aa351b1f5b84fce2a03febeced8e53b603b5526756bb4e3b420 SHA512 ad661412ba99edabeeff63fded145f217ab7a8b04a83dbe874b138cdb10d1b707f2def453dd6ca50f038ec801b8b210fca820afbd767bea96fe7172b473775ec WHIRLPOOL b693967e83167b08b6d2219ab7b74ce65e23a3598cef818345cd6ac546ad4ff9283129cc4d7f54a057ed4107a471201e8db833661b3bfb498a504c6b8aef18ab
 MISC metadata.xml 390 SHA256 ba07c10461db50bd5dc087d11f45de05849f36f843fb4fd0bd007fadb104fe4f SHA512 032307a9f84a0bb4bb227f943095a3aad819900fe79244bfd4bebe7454dc72859ddabf0426fae148f9ac3d0138d158522e0de94c072a71ce7820798d24d96aab WHIRLPOOL 0045c0006fb6be9f42241e286d0bd5e4c8fd561a00e425d489e4dc50092de1d79a0efabc2d35d90d9386019242c7b60bf4db46998aa9f8f2656f7d26fef3f7fe
diff --git a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
new file mode 100644
index 000000000000..eb8ead5dec6f
--- /dev/null
+++ b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NIKIP
+DIST_VERSION=0.16
+DIST_EXAMPLES=("test.pl")
+inherit perl-module
+
+DESCRIPTION="Interface to PAM library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="virtual/pam"
+DEPEND="${RDEPEND}"
+PATCHES=("${FILESDIR}/no-dot-inc.patch")
+export OPTIMIZE="$CFLAGS"
+
+src_test() {
+	local MODULES=(
+		"Authen::PAM ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	ewarn "To comprehensively test this module, interactive testing is necessary"
+	ewarn "For details, see:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Authen-PAM"
+}
diff --git a/dev-perl/Authen-PAM/Manifest b/dev-perl/Authen-PAM/Manifest
index 604d9a1add52..3924fb79c377 100644
--- a/dev-perl/Authen-PAM/Manifest
+++ b/dev-perl/Authen-PAM/Manifest
@@ -1,6 +1,7 @@
 AUX no-dot-inc.patch 1024 SHA256 8a0f35ab0d823f4a6e1e9a856e894cdba80221d46cae212044b93d4474c91727 SHA512 1701f4b03709f46b7c84a1ed4c38f75f064149306dcf5e99d8f2e40256600b6a1003dae99287ae4a6f1ce9ba9d330d21c99ad9a33982486f1b2f474d1df00120 WHIRLPOOL 70b83fcea565b29e9db197822b7b3d01aa8108e5c176661faf34c015bb8b8a6f0bc3eb3433dc7b12aff5dd1d892e656deda5c5bb98a9814586870e71084c35bf
 DIST Authen-PAM-0.16.tar.gz 45922 SHA256 0e949bd9a2a9df0f829971030fe9169cbaf6cec78b92faf22f547ff6c6155c9b SHA512 2419698193697cb8c9ac3a1527a25abefffd9f15f4b492006081b2c8e7fe9e01e00f33e8fed6a07611b725b38ed92d9feb51b8ba61e4c23313cc5ff9ea1c05fd WHIRLPOOL 78da37936de8adb773d4f3d8117075861995e9d0c295773b4eebc803c514c32865e412eb67418a8f84ff67d9e6803fd9408e2fc2b60a4c54cedf4ab0ae1da454
 EBUILD Authen-PAM-0.160.0-r1.ebuild 409 SHA256 5b56424e5f62a54a94ab5359639ee7098429ca88afd77e41317e2dd81a66066d SHA512 8d2d109683cbd06332050da733242ff3b9e83dcbb3947161396d3920fcdacd2991d3ed3d135ae798e88ee5c002fbdac98ded5a0a8b32aae73ac1a56944e40602 WHIRLPOOL f020ba46f93ec8c56e9dd56db5c9d69626cfc6256c676bad1c81117489480dd2c32b3f33869380fd0af8664b302284510010f8ce731335be5d794b2f9aba1715
+EBUILD Authen-PAM-0.160.0-r2.ebuild 1066 SHA256 4f185048fb3ec69fb0c2b04a69696dfbc7a2a29cd80220e44b5ad570c1d82826 SHA512 b42fc7d8d6421c29242be7b15af5c2101e5db8181ed44fbeb99d5ca51590708adca6dd6576d23212fcefe9f8078e65a10041c02342c2209fdba65bf574e3635c WHIRLPOOL 98061763c2d9411c1ddca1e0c1b9ff4e356f9f06cc31eb3642612e7b0c1e78ed60672c1d4872180352836b553d15b3a75389e03b60af8c061c4a0cca398a52ea
 MISC ChangeLog 2446 SHA256 5e9f01481e843d939e9c596a7e0e1e3d49c54d1c0848e22acbada4a49c9f5a8c SHA512 7e9c42e17058952e2d613d935134d072fba108785f611ffe12b4bbda93346f79de924e03eb8ae4309b0b7dbeb338d42d5063edbf6368971e226875041599f30c WHIRLPOOL 8d9003587baa5b4a14c9b9abe04213de33bf58e9b14d8534b4821fdff0cb98420b5525c49fd8dad1f1ff0ef9b013d65b2d71a8cb9fb92ad006e729458d2921c5
 MISC ChangeLog-2015 4362 SHA256 15bfc41aa1277e8b133b23b0e694641c88e75b52357592bd77438bfb09ffa649 SHA512 59bcb3b28f4b2de2a8e4daf5ec258c16c08a625872088c333d52f53fa2ca3af27c51973d695fdcfbfb92270b202236979651c03b2826f7aba35c2c75007abe7f WHIRLPOOL 966369a99ffa41ae51edf7f9f8899d6397c06d01db61a598124b4e20ccf8e0e05404a03da9556e58117577dbd32bd4d0a2749020f89abd616d2bb7208a62ea13
 MISC metadata.xml 392 SHA256 f9e98338afb0466f0870272e7005bb627b54d63b812a3703b24c8feab723cd04 SHA512 bf28ee065f5033975b0d31647b15dd73d879b03c2c30a40433f8a67b6cc3b34ce483f985adfd29ab135b73d6f2f9f6d62e40beed947ef4eaec970902762114fc WHIRLPOOL e143cab67be42746b0db6026ccfb373dfd4e2f5a143f99ed2cf7230f1f8babc21abed9d06f5f63a4fef47b7973eec57a19a80cb4795b768f461a1004c7605007
diff --git a/dev-perl/Authen-SCRAM/Authen-SCRAM-0.5.0-r1.ebuild b/dev-perl/Authen-SCRAM/Authen-SCRAM-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..0cff5a69fe06
--- /dev/null
+++ b/dev-perl/Authen-SCRAM/Authen-SCRAM-0.5.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=0.005
+inherit perl-module
+
+DESCRIPTION="Salted Challenge Response Authentication Mechanism (RFC 5802)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Authen-SASL-SASLprep
+	virtual/perl-Carp
+	dev-perl/Crypt-URandom
+	virtual/perl-Encode
+	virtual/perl-MIME-Base64
+	>=dev-perl/Moo-1.1.0
+	>=dev-perl/PBKDF2-Tiny-0.3.0
+	dev-perl/Try-Tiny
+	dev-perl/Type-Tiny
+	dev-perl/namespace-clean
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		dev-perl/Test-FailWarnings
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Authen-SCRAM/Manifest b/dev-perl/Authen-SCRAM/Manifest
index 53141e9d770e..f922838c642e 100644
--- a/dev-perl/Authen-SCRAM/Manifest
+++ b/dev-perl/Authen-SCRAM/Manifest
@@ -1,5 +1,6 @@
 DIST Authen-SCRAM-0.005.tar.gz 22837 SHA256 23311241549faafa9e61ee436243e24a331bbe6d6db5bfa3168f5fd43c541e91 SHA512 8c183a490eb631e26c22fa19866f12d6e16fedd63169c470d86f6c0ea83df58e5ab2bcb7763455b1a7c179a5c71493dc37f7be2f7431f94f4c6481bd8f808ee5 WHIRLPOOL 577ea2dd6270466f7becab671e5c3c2d20d8bcd8fc6762cd4dcc9ce36e699ab24ee6a77dba8a4835a0d27684903a0f427134619faaaf5b6d8f0574f4580ddc6d
+EBUILD Authen-SCRAM-0.5.0-r1.ebuild 762 SHA256 fad7ceeb6bea25ec702eeea93dbda11cbd7325a5824ea91a09051050585966db SHA512 aae130bf09ca0077804ae7327974b308c423fe5c657cdbb15c5281580ebe570a67c6aac2e7464c5f5dc41f38ff63ce306349787185ce0858a6315e776d6121ff WHIRLPOOL 72c74a59fc2ff50395543c4d980a187acd43684850abf30cbad0af5f55378399c42a55d30bcc729af2a3865d24515b4908f2eb2a2e874939de2684bb0a8e4dcf
 EBUILD Authen-SCRAM-0.5.0.ebuild 766 SHA256 4da58b64daafe196b142d9dc6e022b6a33abc085f3cc0c13347164e119967963 SHA512 710921a69f34e7e638eb4fc96abb4706785896c9b96bc165355f0a9662eaa6a04c740f56ddbbfef0565d25e06f0ebd4f6332b1cc5ad8e165f17f3e7571476115 WHIRLPOOL 7e3a5d640eff4e58394e3b475159758642a8e72a1d367438595f480ba0cac77c7e937fe1dcf2904d7d244107d923757b0b2a82e4395c3236e179e766bc2d4884
 MISC ChangeLog 2442 SHA256 9614863057b907007982c145485f54db73966669b422ac59dd67c21939ffd6ed SHA512 3b80b3980b7bebaf3eed0c31a55ebd4b4627d7e5dbc6a8ffabcb6e00bbb239287dd293be388aee310b218d3d644ac9f039e24b31868b69464ea6ce24ca6feef9 WHIRLPOOL bcceacd58fb57fb10ec416eb870786c9920fe0b61be9a5798dcf1de0777ac459c759c462e76b31cd6683d9b9174ec727dfee74ebfce2aab362ca76937359238a
 MISC ChangeLog-2015 402 SHA256 5dd05d0524eb4cef99f6cfe2b8ea8695019cf5aecb1e863db05cb381f6922cd3 SHA512 2e17721dfd6db04ad207944bb6172a55ae02e91c55934f5a30d0011911086d463eb7cb3d345b4e13f3c9c016dad1c58c9802a12bd8337cc8b1dfd9feabc8d326 WHIRLPOOL 3a92d3211d3510c5bb9421a371e91ed6aa7f71a344ec8ef86c8221d209e909c9c2165bc5b3e5f2fa7c822edc8d6d2a2e7e7194fd402051412244b5565cc32f2d
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 606 SHA256 f8acf597d98bd708902e4dcd3c3f13b779a48d9ecceb7f2909d2136d0d7015d1 SHA512 59790a043080f73a47bf2770178d252edde2463e41e2ee93c05ceef7db83623e52e9fff439cb83ad235a30af52518d8594e522d675ed903463cf947c1975c16e WHIRLPOOL 1e7ef9d76246c807900ce71a7e75370a3b51991a898fceed4afd3cb131bcd149d8ec90d7a4ff08cdabe16837d1dc6313cab54a0c198b704f098c0c9ffce6d05d
diff --git a/dev-perl/Authen-SCRAM/metadata.xml b/dev-perl/Authen-SCRAM/metadata.xml
index 2b9a936fc0a1..53f56b04abe3 100644
--- a/dev-perl/Authen-SCRAM/metadata.xml
+++ b/dev-perl/Authen-SCRAM/metadata.xml
@@ -5,4 +5,11 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Authen-SCRAM</remote-id>
+    <remote-id type="cpan-module">Authen::SCRAM</remote-id>
+    <remote-id type="cpan-module">Authen::SCRAM::Client</remote-id>
+    <remote-id type="cpan-module">Authen::SCRAM::Role::Common</remote-id>
+    <remote-id type="cpan-module">Authen::SCRAM::Server</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Importer/Importer-0.24.0.ebuild b/dev-perl/Importer/Importer-0.24.0.ebuild
index 3ec0e970ab13..7a2a4be7fd6c 100644
--- a/dev-perl/Importer/Importer-0.24.0.ebuild
+++ b/dev-perl/Importer/Importer-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Alternative interface to modules that export symbols"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Importer/Manifest b/dev-perl/Importer/Manifest
index dd06342b852e..e5a80a087a8d 100644
--- a/dev-perl/Importer/Manifest
+++ b/dev-perl/Importer/Manifest
@@ -1,4 +1,4 @@
 DIST Importer-0.024.tar.gz 41264 SHA256 1d19760ceb366b664985ace9a7ee1b54a438b1e060a5bca6eff0c6a35b07a557 SHA512 f368f19a63fd52b88886b1ba6d51716050db8f475628238d16d2962ab7d6c21d6818205a82c86cc7f254736eb1c261dd6abd606dfcb16ca675e84898d03cab32 WHIRLPOOL 8ae1922d5bccec33b310c847e4950ced9602cc67174dc72772bffeb899410c83df11b8fc782cb682839fc1a8bb3b841af1b26304cd4157e451513b2df2f34458
-EBUILD Importer-0.24.0.ebuild 392 SHA256 1752e3cd33789860c5320a0ec67a817e7c8977a95b9fc4cc62e3dcaddc531e75 SHA512 424cf143cba9deeb06853fb965d58e701347ea4dda9817891836b81120278d85be538676396b7f633ee2d6deaa2f90b2351b3482f53e909d626701008ca6f4ee WHIRLPOOL 91dd18c7750060b94277597e89de39ac1e3e42fd95de74ef552563fd26cb9d36124344fdc957c1a66c5e48f11964772e179da26063577e474151f765f23d2d06
+EBUILD Importer-0.24.0.ebuild 404 SHA256 0fbe4608112f277b88da88cca4f3cb32ef54111a358aee48a0b06d53d063e46a SHA512 d37fa6f4c9c98799cae45bd3ebdb2ab7fbd5d7206ae11022128d62af39713da8fcdb750242e77a44ed725b62757c9ab0d9301206111a89c297393ae66ca9f118 WHIRLPOOL 034ff40586906c75235257c0e8bd0329346ee736d557e3249d2794db5387f1bb87900bd2e930ea42c5c2d6f9d15b7b05a860fad96868ac13de389adb36497daa
 MISC ChangeLog 404 SHA256 b29ff6fadb987c044008bf077930aa50fb782570c7bf5620b3f850f114979625 SHA512 a6fc4f6aed89fbb865a2b164a3b5c338f3030cc49569ed7cad41a4777d15a5c6e372514a4a68f863f295924003729c940236a5c72ec5ac174813e7df5b7cddd6 WHIRLPOOL ee7c01910932207015d2a4f74084ab67283788db12ef5339ce26ac483e169d31a21986e6ee0713b7f6661e229e00455c36aa1762df93abc0f169a4266db9d160
 MISC metadata.xml 387 SHA256 57f1b700f7a943961ea398778b35ccc3727cb4827db27a936f0aa17a1ccb1f12 SHA512 6716fc7a7311d4119c708230f4cec828655d122e37f6e70e29d60bf75c370564e72382f474acda87f29ad5660f93413653de31c38908cb19157ec35c5a0670af WHIRLPOOL ba79fed81bff7608ffd1970826367c188fe6e6ec65bd74b892b18dafd74183e13a46454f75ac8060c0060b423c372b1a2544a027f8e3285078f2448b241caf6a
diff --git a/dev-perl/Params-ValidationCompiler/Manifest b/dev-perl/Params-ValidationCompiler/Manifest
index d090fe698cce..471232d95ed0 100644
--- a/dev-perl/Params-ValidationCompiler/Manifest
+++ b/dev-perl/Params-ValidationCompiler/Manifest
@@ -1,4 +1,4 @@
 DIST Params-ValidationCompiler-0.24.tar.gz 43439 SHA256 a8963747bae618c2b96ec1918ef2b6ea7dd7ff3dbcebc9de6124b2771a4f4287 SHA512 ea54587db2729991fd7f9d8c9f420449e8d0218473f465783a69d4b118cdfe9e7d7ff045d57ba6d989a79950fb61ad81caac781b3bbaeb6325e061e664cc1665 WHIRLPOOL 61aa49a18a14cb11398db27219ee565f80b3ca2640954b378648eb1bbb955638f9c1f738aced9d66780fb522d449a425459f22fea6e6f4983bbe2beb18e8c3ae
-EBUILD Params-ValidationCompiler-0.240.0.ebuild 719 SHA256 8696b6f3987be63ce751ab321093bd5555c61b7acc544f7799ca1e14189e444d SHA512 c08f551d81366d77bc85c489284c26bc4cfa474fb2174454f7e705b0005abf139e5c192c75792644275d5201b957ad1b6f91cc9c5e7e90c3552526aae6631b02 WHIRLPOOL 25a49dffa2f41d43fac14bc545758a4bdf0ef21f1158fae8625611d98878366dfa0ca38ff3a6361f7b15a9774020403afdf5dc493b99aadc691f0a6fff6d4dfa
+EBUILD Params-ValidationCompiler-0.240.0.ebuild 731 SHA256 aa550d921fa4b9654e67c74d73e6fc4a3a16baf4b94b01f318995cda0af2cb8e SHA512 8f509755cc216ce5d7393d7fcf2f21eac81e92d791229855297709e3257f1ff41de64865b3181e6451db9aae76b91b0966ba1dff5bad492ec66a81ad773168f2 WHIRLPOOL c91267b71fa277006eab4fb8cd2fb80bf7cd1845e765fdae0d4973c1a3e63ecc19fb19d2f0a707bb861ef562f0a89fdbd0fe8e79a73b5208233d6db71b7e6aff
 MISC ChangeLog 2079 SHA256 cde999c9d74f50c2fc11acb7ad18e9afee9cfb6eb993e6dc1a84b390e8223417 SHA512 2030161ecd1084a2a128fc353274516f0f5f889c705c839d4b24e1f75cbae08dbdc330c73a83947abf41d62dba8c71cb0c772e750d52cf3ca10bdb272bb4d5b5 WHIRLPOOL 65be8af22ea7a0ea582b2fa50efb31cd8b2eef082f00b482446bf2af99cba334863fa40b839706ce8e02d07a188beb11f249ca25141c997b1f1eaff75a578492
 MISC metadata.xml 590 SHA256 f2ec1a7240301a51437196c5357c629be538f732235b196b3e49c7571a933b9b SHA512 9635b89b9c2297a9d33d30b89b393e4b0968432d9f99467a8d7844f3a0d046285937ca9713d662d02d0f2b46e502fdf1936960b2d2ee8db519a654221dc83890 WHIRLPOOL 983ddcc3ee503bca15004e6edee89a96c32a635bff918333e99eeff53c3ca363e0732fe702c50699182f9749e23ee9e90dc33597fd189c5d4b67e596a42223cb
diff --git a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.240.0.ebuild b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.240.0.ebuild
index a29f2ed294f9..fb5704db50ed 100644
--- a/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.240.0.ebuild
+++ b/dev-perl/Params-ValidationCompiler/Params-ValidationCompiler-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build an optimized subroutine parameter validator once, use it forever"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Regexp-Common/Manifest b/dev-perl/Regexp-Common/Manifest
index 9fb8a60a7780..f1b95ecbd3b4 100644
--- a/dev-perl/Regexp-Common/Manifest
+++ b/dev-perl/Regexp-Common/Manifest
@@ -7,6 +7,6 @@ EBUILD Regexp-Common-2013031301.0.0.ebuild 438 SHA256 76eeb4ca7782ef49f9326be004
 EBUILD Regexp-Common-2016020301.0.0.ebuild 469 SHA256 6aa119270476b43de32890422bc149814d084464f16932ba842030998958c4b8 SHA512 624d505c6769b7e81d7c7d28d78e377502d1357aa2557a404647970e377be460d5ed41f1cb26ad4b7cc5bb87fb7e99ee65d3440eaf63543f18d8c4db5eacd681 WHIRLPOOL ad808526b852be810d1eaf0f69136698aa50f4962fbf704ef8bce36d0d3c9a767047d4d971aef1bf6babd5a2458cfa8806b699abf84879f1308ff2bd04b9dd0f
 EBUILD Regexp-Common-2016060801.0.0.ebuild 484 SHA256 5f1defc1c7d3b11b10e0195c666fa97fa4862bc3986b7cfb6b0a7dad22ac48ac SHA512 ddce5b22c51b6beb56c40e101af7aed09803e0e6da2a2f332d309eab1fcf62c97a0c7085356a8ebde397ca6db9d8422183cbd6b25f5820f8b5b43e0d81c4b574 WHIRLPOOL 113b40ae346f99a9cc2fb1fbf5b8e6a43d0c78904f6cdf57c17dd14e5366c30039a767cb8fc958146ef3debec7fc4c52231dae7db9c905eda16f0576839fb221
 EBUILD Regexp-Common-2017040401.0.0.ebuild 484 SHA256 5f1defc1c7d3b11b10e0195c666fa97fa4862bc3986b7cfb6b0a7dad22ac48ac SHA512 ddce5b22c51b6beb56c40e101af7aed09803e0e6da2a2f332d309eab1fcf62c97a0c7085356a8ebde397ca6db9d8422183cbd6b25f5820f8b5b43e0d81c4b574 WHIRLPOOL 113b40ae346f99a9cc2fb1fbf5b8e6a43d0c78904f6cdf57c17dd14e5366c30039a767cb8fc958146ef3debec7fc4c52231dae7db9c905eda16f0576839fb221
-EBUILD Regexp-Common-2017060201.0.0.ebuild 480 SHA256 fa9c39e7d16dbadb91a14608c3a4c38daa37a757810e502b157435c2a4a0bb0b SHA512 dff1f10e847fdb2e12abce9e82b905cc2b83490b0cdf0e58eed9d7b8d7165a411fbdd1fb3018e4473e61b649eb73abe801b1bb6bb35eb8170cbecd661fe2d106 WHIRLPOOL 9d025ef8cdd96707539ea0f6f31d46d12050b6c159ad38929f8cad780a209e9a4e921e7e7989ea7a7731811ea66039270a4224ea4329b3838ce080a4f74a4dd4
+EBUILD Regexp-Common-2017060201.0.0.ebuild 479 SHA256 34f5cb9520fa8e21597965da6de95bb9f6953c1bcb5290fc5d86dd0f7e3013c4 SHA512 558fff2d43022b3feab81ed6d1dd0598ac536826c1c55976b26cb37f045ff42bae741aabada67ae7a046426fb3488e6f3300a46914c9f948c1e19bee5c6fe47f WHIRLPOOL cb7829f9b61e8be174c9a1ecdf3d1b6c503f4e4560b9d530687ba8828bec5c5585a3fda84bdceb0974c806f3ea166b09552d8a3af76d53d174b7fc41402aad19
 MISC ChangeLog 678 SHA256 89844368251d4f99636db245ff8b71f654a474c40ca39aa1f0b76953294b379d SHA512 02ab5a060d4770195fa044e888c64413aef5b214ec363d360802184161c42d2b20a5d906b7e658db10395070e966fe13ba19baccedda7e2cff136e29852c7d39 WHIRLPOOL fd704e4a5955c6824b280314610ace0a90cb83df286b3781678b66e2e2b54817f528fb39fbcd91723622306ebb499436880faf625fbcb279c795c33725b03c59
 MISC metadata.xml 2809 SHA256 3e4a7598bcc36a74ff6fe8dc1c4ece9fa297538a56ed80eec772fbb476ac060c SHA512 40e6c4784ef1a59367aa1d74b317b0a8f17127a0dd8cd52acf0e122e43f150db39a884b866cb022eb398b4545121a6cb1e2364c3670569f714c9abcfbd752d45 WHIRLPOOL fc3b24c96b1f9c7a9abe03a000bd6a86853436e80562afe31b62a5c829d6a87784f352d4a2cad9ddbe9e9e25a509af6d07efdb40fb1d1a618013e7a58f024329
diff --git a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
index 3b96b77026db..e14263e940cc 100644
--- a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
+++ b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Sub-Info/Manifest b/dev-perl/Sub-Info/Manifest
index 641496dfc21f..f96aa9f02dcb 100644
--- a/dev-perl/Sub-Info/Manifest
+++ b/dev-perl/Sub-Info/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Info-0.002.tar.gz 11713 SHA256 ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea SHA512 e3ad2c8b270a44f9de2d5b71845a4a21f363a234edf2ddb9942c2fb2e4d765eedff3653a047f025b9d1dfaeff32ddd58aeff7f81fa42e6f4b57f5ca6311519b3 WHIRLPOOL 263976500944cd74c289e8e665bc222729cac15fb281d5c707a716888a7c72000093f4e05e6d8de690c93a846d49608093438f71562dee5d91bbe1cc2923cac9
-EBUILD Sub-Info-0.2.0.ebuild 397 SHA256 3ff3f4acfb9f401f49925107f827189e79c5b9a6a90979c65efe22bd0e9e70b1 SHA512 68a79380004b43ebc204dd3c8784c7d68a7a802d57176252314d18a4151721ec89a145aaa86deb71c7521b5e9a23dfc83f226979a3c1384fe5280a74b8decee2 WHIRLPOOL 26531dbaa072af68de4f8f0ccf080948fa1c084c758070e6d8185b3f7e03d6ae7dae0eca403f82e40942a3075281063557d71b0bd1bd851eee0b983b4e4d2088
+EBUILD Sub-Info-0.2.0.ebuild 409 SHA256 889cf994f562c416be7630e17bd7c308421d4b9d8819d9527fbec20107ff669b SHA512 bf2e153bcb6b990633efa5aa38d3665bfcf42875f2339fce45e172156417413726715bf5267484c81b3f4b0541df1122f7c3b0bdc23cc1506ac820cc9bca02b3 WHIRLPOOL 1e737479ce2cc2c9c72eb7b03c28511f797f6ff4c0c95dd04f885af1c68e6c0e126b93d3c9762a4673b821a7f15f5398abef8b39f20055b8303459573ae410c0
 MISC metadata.xml 388 SHA256 3eeca21f72713a60dc951065b1cc2081c0dabfb21df8a8d1081d2b053e02bc02 SHA512 1d2f67977d3f8dab7858bbff8e524c0a7972b90bef138bcfcd5641b10a4a685c5cedceb7766a57e452b18fa6aa5227d10e9877fa10ab144366e6419fb9358733 WHIRLPOOL 937e1e9d6ae0701ce2e66cc32b6b3a338b9229088b863a90d279e8036c0fdb2caf315ab21bba22b1f606304e0cab04e91ec1a3abb82818e118f401ee357b0fa6
diff --git a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
index aac896e4263d..e81844ac59b0 100644
--- a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
+++ b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Tool for inspecting subroutines"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Term-Table/Manifest b/dev-perl/Term-Table/Manifest
index a45e9cd47ea7..1c7f91f71e8c 100644
--- a/dev-perl/Term-Table/Manifest
+++ b/dev-perl/Term-Table/Manifest
@@ -1,3 +1,3 @@
 DIST Term-Table-0.008.tar.gz 24084 SHA256 e08cd591a4cc96d133883f8d17563dbe18eaaaba8ebaca25341e59a3b7a7243e SHA512 d741313933c8925ca3451056d05172c440ab4a46f5a4cbaeae3c6d4b82d29314e69643e8c3e60dced42768f2102277461b2d2dc4bf945d982df9265f49339d06 WHIRLPOOL 3d78b199972cad3292ed9e18ba478264e0513e2dc8fec0e236d0846a75ab40829c506749281619c7d35263c6caf51c39bbfe0453cb75b37d9cdc768c3fdf3a40
-EBUILD Term-Table-0.8.0.ebuild 742 SHA256 08a01f0de31b627c9181a085aabc51e79dbb85d0a041cfa52056f1636120e383 SHA512 d8571dc661a83392e0209b0cff3e432a2cadc98222daf2030070563d40f608e14c8d263695af6e02189bfc29ad4990e870d8ba8f93b065acb734bbf5f4162b89 WHIRLPOOL a267f3a57206001b53297f3370afb2e61e427fe5d751494cf4f9a477aa90d3613dda6779afb764554028796ab683acdd8f102016d7b04c87d59412d6a6e4d30a
+EBUILD Term-Table-0.8.0.ebuild 754 SHA256 a0c24a8644a00cc2c32af2038ed3915e7e8d767ad929cb08cd616a05eb3e09e5 SHA512 aeabfd57456f99bf39ac7584389496ea219c19219d19895113902a2459e391e02570fae8e33216553d8e5730701ccf0a6e37350e233a908ee2134682d9d1163e WHIRLPOOL 819a3d428ec10263a453261222f586043237e1249f0f54d03a0367f01a257c552f804aed44b282247ee2dea2b660a7388d768057a9dfba2da12a3b8c6a47a036
 MISC metadata.xml 792 SHA256 0f7dea62d0b4e47fadbc100fbab67b41ebbca190dc4d608f08d4f7a99464be94 SHA512 0f55103bb7dfb35ba7913152c3307fc145539ae184e16a72628737caf670da2a3ab85bcf4a9c9d601d09115c6414ab392bcdf5a9a9b5a043366721f0d6e4191e WHIRLPOOL 501a4b365561f9a9ddfb1e6f4abb3004ad0828211bec29e64e2df020d9abcb4eb08c610b18ded0e6d182f77bdf81a63158dafa28c7b9de31d28ce8c6750cb595
diff --git a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
index 353175c81bed..56fbc7a90038 100644
--- a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
+++ b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module eutils
 
 DESCRIPTION="Format a header and rows into a table"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Regexp/Manifest b/dev-perl/Test-Regexp/Manifest
index fea1de04327c..aa9a0b0999e7 100644
--- a/dev-perl/Test-Regexp/Manifest
+++ b/dev-perl/Test-Regexp/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Regexp-2017040101.tar.gz 18904 SHA256 35cb41df5c5017835b89b853d5a44e25e6da973b450e1edca51bba70e7041e54 SHA512 70595642f8f5cadd4cec73587af8b4e9ce793c37fdf02773d357b84ee8181750f5ae7fbfbc9a35ca3392f5af074ef5b5a1626547cc7a0c3f48439d4a24bdc0b8 WHIRLPOOL 842e09bf6f4422474f73a833c90a4df28441fc4a474ce9ac3dd7fcbcd90ff97ed883d15c00ebedf3f9c0c970bfde6f2ebe4bde783ad025a306b68fa17f88f3f7
-EBUILD Test-Regexp-2017040101.0.0.ebuild 648 SHA256 9e385b18a6dc8775c0b9e34bebdc7d14af420414f076923fca03a30b8e43fba8 SHA512 9902d8fe20f77efb29edf496c18472cbc2a59382c5fe0d65599289435de69129226bc31e7921bf5daa8373155f7d071dcc992b0dac6d2ed6c57657e4e0931450 WHIRLPOOL e96669c05a50f473fa66885bf48bdddf961693734333b93564c69f99201184dc8443ba17956fc19fcb816fdbf0df527ff7a78a4796ffbb69ef2a8c069e51aded
+EBUILD Test-Regexp-2017040101.0.0.ebuild 647 SHA256 cea5461223e365ad084b39791a86a98b682e7fda1abecb48d1059f698cfc7a13 SHA512 57f401d823ef9bd087ec0650ce6e1dfe9ff2316aac847d15f4bb9ca5f638ccb7edd8e753572c8d498982c175399a8dc715483dded96dcfbea48f7e5781cdab38 WHIRLPOOL 4fe3fb2ad6dea1bb1fb11e8972f79190a10671ad37bbbbefbaa06e620c087401c0585921cd1db0192aeeddaa5e40d38e92bb68bc90ad301aa7e183fc19ae7b92
 MISC metadata.xml 522 SHA256 88fc365e3f7f4f8d5e9779cd3e6e9e6b6426ff4b74941ac6ca7d5217b7c8f061 SHA512 682a64fb6143e063cac226042e4fc122dee37c4bb7ac043f2bc3791ec593f79e8c60934c9d789bd43a6738bfdb1340812c2ea4ee084891e35695987c28e654aa WHIRLPOOL db2b52c101492c7849c199f58363b2ee93b16de4a99d6d2a5a74fef5a96c048d47a68f49451dc6413c04880e88667b2fa4c435d8dccd49abccd9882ae0449d59
diff --git a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
index c7be6deff24c..049f901cb180 100644
--- a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
+++ b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Test-Without-Module/Manifest b/dev-perl/Test-Without-Module/Manifest
index b147c07b984f..7b3d61475ec1 100644
--- a/dev-perl/Test-Without-Module/Manifest
+++ b/dev-perl/Test-Without-Module/Manifest
@@ -1,7 +1,7 @@
 DIST Test-Without-Module-0.18.tar.gz 10369 SHA256 e2c3360b171d7db518ac39a0e1dcb285c784ea393c11708914a0655d66138c7f SHA512 005ad54ac77283cf3155befe77fdb887dbc2ebc9c154472a23982636bbe7728154f56fdf1990b833639cd687b38e4d62250edd6dd93d37408e971bb4bd49c4c2 WHIRLPOOL 04bc67aa32c199985869c305dff89050a3a48da8fcfa120307f887905a5bd1b20b72275c93b137dd1b21da1c204b7b142f2609b97424d6bb63d172314e210927
 DIST Test-Without-Module-0.20.tar.gz 13609 SHA256 8e9aeb7c32a6c6d0b8a93114db2a8c072721273a9d9a2dd4f9ca86cfd28aa524 SHA512 e92353cee46e712ddc6515c5872a61a84eb4186f9ce736bbf0fcca2979bfa7143588c05e683d31fc22cbaaa792ce8364768310f9de621e881cc207b80cf14d87 WHIRLPOOL 1cd19acb1e1a459342e7965ef167e666c694cbe8bbf33f71897c7abcde4d35b920603b36a3c303efd885f8bfcb73349fed4ad21fdb4b29264bc093facefd60ba
 EBUILD Test-Without-Module-0.180.0.ebuild 416 SHA256 4fc13df90ded644e63cc36b9881d23ec0eac43d14c5306b3020a49548112353e SHA512 1aa24783a5b0b1a26e399b89d89d9416442eafae902639287ccd784dd189f894e6af7197b751388751b0cc8b2c479abd7146a2d31b275698e081119534544053 WHIRLPOOL c6b77dd4a96a77717ced6c0dfe33ca34a92299a675d389c2ab3e354a5a90a2b6a6ec52a856b53feb97c1b4298c0ace691dfa1397f4e73b501508f73717e34367
-EBUILD Test-Without-Module-0.200.0.ebuild 342 SHA256 fc84dcaa593312b3d2d7e557bd7ead23f5fa99776034c14a1658b97816467c79 SHA512 39ba7ecb7c87a62150d61815fac14df6be304d385572361e4c3939955899b3931c40ae938ac224133913126c99b70b52aefbcbc0d5de6b58b0c4952650389dcc WHIRLPOOL 0ae84c81a55b20d43c9d11d72b4e3269f9df928c958e82e41613e2942506a5a9af1859c2addef3b8dc38fe95d0e320e16e2b6ae719bddc95cacbeb2e9b4d3195
+EBUILD Test-Without-Module-0.200.0.ebuild 349 SHA256 7054aaccd959ed865b24f599083c5f6d0abf50a8b7fd488afcd34af840ab8763 SHA512 20a067b58368cba77bb252c2eb1a3716899dccc08f3ecfe60780f8aeba22d9084d5c94f937a33605579badc78d93ef9597eefe7a0c69a6ab4dc9459785009565 WHIRLPOOL 2f21ac5bd04a285ecf217788ace65fa47888886687fb8da627e88422c0c9299e3909155810a9c646e3ccd2bca5e28edbcea13d1f9c11571bc0fe95db761156e4
 MISC ChangeLog 3526 SHA256 4fa2bf3ba96ef6456a5e8b0ffd56840ba0acda144f156ef5d7d11c566e66e66d SHA512 d25f895d0634c98a6bd45f37d57e0bfbab441eb571682d100e91ad9af8e1577c3a4182f2b67fccca21ad6a7c6ddbbc6a035fe0078f057c2ff0e383ab90463a67 WHIRLPOOL 9b44e2b9d30b4e18780e534b52b90acf49ef217da11c2642438ead27c26f152e0ef27a7e8be09a4c05ca81313d50000ca9d0319e046e1a4516ffb812f51d7b6c
 MISC ChangeLog-2015 584 SHA256 ac32d1f2107a8b7f238ffa07039d1cde4f892e092177a518fbf1235ee350b026 SHA512 6ee19dfdae16f2a2a0061208a08b46c801c71c57b7362b6ff3782222a0f33e0c152affd2a63846c08c0c3d2a03a3505034eabc917393464648442af2a5ff4d54 WHIRLPOOL b50425132779725fe0cc54a972022a4270ccb51e6d9842bee5f6e4dc85c593e39f7df5d3473b1d843efbff431c0b951b85d46e8747c73fe8d0fb59330f0e9abc
 MISC metadata.xml 399 SHA256 13f40b8c036d4ff37f7ec552b9ad0122230874880733f9232cbb8984c6488181 SHA512 69c6cd0ebd521c61a257c3d2e5aba6ab17c2e06321df6fe27837a95995f27c53d8d94a525d2ac79ee44c7f04352da5b765dfebdb80215b4ff97679f3d939725e WHIRLPOOL 7f19156dfd93400a11636533ae842374ba6f53b336939e5d36cb3d87b0905450373c6c602db4852b2031cd373a65ddfdc90045ee8c6a95d21574475631b35c09
diff --git a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
index 8e6d3c577089..f3348baf5a6f 100644
--- a/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
+++ b/dev-perl/Test-Without-Module/Test-Without-Module-0.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test fallback behaviour in absence of modules"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Manifest b/dev-perl/Test2-Plugin-NoWarnings/Manifest
index ffbc342baf5e..94b9596cdc0d 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Manifest
+++ b/dev-perl/Test2-Plugin-NoWarnings/Manifest
@@ -1,4 +1,4 @@
 DIST Test2-Plugin-NoWarnings-0.05.tar.gz 23036 SHA256 4839cb18eecc4f370f62cb88923291183a93a965de1881b5e0d68780a6985894 SHA512 3374f17ce0b930008a3dc29e205ab0275908b329c7079428f8754f27e73fd8961446628fd9e0dc9c8937fc9ddec41a5359b82f0c002a97c897529918885c821d WHIRLPOOL 0122ec2b141dc52b13de3a0e0076158dd35eb5026c3721a80b5cae59c2a344ac7d4457f62606a47233fd5cfc73232604bcbc4a771806ab01fdd11e17b1ef44c0
-EBUILD Test2-Plugin-NoWarnings-0.50.0.ebuild 485 SHA256 ac756426016882826565920477b2d05dac4fb3c826326e76eb1d09a7c30ca977 SHA512 64fa695e7ba6a04bc9f970426904ed48087b3d052af8e0e974d369cb78192eeab3ae256fc9df92c4b8004335bd5a006d62f7d70f17b0395b088d492866adf13b WHIRLPOOL 15e9f230c015fe569b375d94fab46e20b1dc2ccfe219789490b6a298f2bccb39fc2f9ab12891463e95a1725962a9446c6139fe2ee5e3531986b2c52bf180d0db
+EBUILD Test2-Plugin-NoWarnings-0.50.0.ebuild 497 SHA256 48a766cef62efd8026e7599953c587614862726bc4f9995b95de3e3cfb28bdd0 SHA512 7df0ca012cce0f37f82754c2a89e5252ead2fd5da605808bf1adae0706d62e86d25f2cb11324dcfe59e60ec9e574fbf3a3fb1ffb7c0257321d0069edfb77755f WHIRLPOOL 60b9e5eb2167d4c3a492ac392ba02f732ab8048e067296806d09bbf0d3da3752f69ae076739a2b143d0f826d4c92c641918d0f7ba21d239537fcfd6cae35e2dc
 MISC ChangeLog 472 SHA256 cc758e5ac03c9bd1af4cf0c0b79c564e666278745fc9aac11b6e81279eaae3b6 SHA512 2036f4ff61bffda631185c81435840edc87ead3c901b2ac4ae954faca8834670a4d764e60e168e502e04f060116721e0e5b5c7f19935e8cf08c6ac0bbb062d15 WHIRLPOOL 2e880b52f93a5b0364e09b4c2910e298450a2392526202cb2cbeffc69362a899e87cff84da6fe033705f93573f6ec3b5e1d9c99afb7b741876719972d3507fd5
 MISC metadata.xml 419 SHA256 2ac5c9c7cb3e581d50ed3812546175ea7849bdd100aaa72e696003d88eaee643 SHA512 002c430128ef87bdc2ab72f7468cc1d331b9b885debb92b997975cf0afe7d01b93a9b30d04c7b73b285db5baec6b02f821b87f6be811d707c4ebc7a29acc4f00 WHIRLPOOL 63f7502a9adaceee9c005f5e0120750e65b95ab5e06f9298a62482b256ea481281e4c9b6548a82395ce5ad173b3329dac3dca888061ee1b20611a115050d7b14
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.50.0.ebuild b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.50.0.ebuild
index b4301e6ec58e..fb4a7b159159 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.50.0.ebuild
+++ b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fail if tests warn"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test2-Suite/Manifest b/dev-perl/Test2-Suite/Manifest
index aceedca12dc6..7e16fa148042 100644
--- a/dev-perl/Test2-Suite/Manifest
+++ b/dev-perl/Test2-Suite/Manifest
@@ -1,4 +1,4 @@
 DIST Test2-Suite-0.000077.tar.gz 144835 SHA256 8102f9724f863dcd05efe783e4415f91d1cf2d6a118b75e97856a566b83f1305 SHA512 e9337fee244f572c5b0af54c78a1be47bf590caf905ef6a40928c6e914a183d3fbc5fa3312a0903f697ef5e44341c5425873ade50aeabb63de3f795902bb0f71 WHIRLPOOL b5285a9637b7b13cdc8880073875b0e7718acdca37cd283149ab43d393243c90a04a49309d65252722110dd52d78066dbeb8934c1a39f9fa034f1e9d98ff2b7a
-EBUILD Test2-Suite-0.0.77.ebuild 527 SHA256 5b104c7698383906cf3493bf5368e72f7e61d15c81d722eb8309719567378404 SHA512 cd9ee174506e17006b8dd9c8a1fa0396c1fc237a15d41e7da71cd93c4430c31fb3df16b54080297a8b0d45207f073db9fd37635d5f5398a11e9add230ddf7386 WHIRLPOOL 4cbc4237a87ea8376e92f8b81a991dd12a6e603ab26283c7a97db1ec3d6db557cffde1e3c5133b046ea82c809befd9e3b65797c3c6eba5f256a361a3876d5f88
+EBUILD Test2-Suite-0.0.77.ebuild 539 SHA256 3361ec8af50a6b78f1bd9a5bd4ef41fa5ea393af6a51527d84eda3d462fd42ce SHA512 cb6dcb3a374be559103432c691aaf86448e6aabdff84b6a71bec8e3ce6db42944e260595aee306d8ff808b76bae602e43a4edc3d5957e56e8ce86684fd55aa32 WHIRLPOOL a38c900749db85140de7a0c6e49f6f0dc7b41d4034980415c261cd17ab587c520ed25d997ecda73e30d3acbd2aa0ef5537b294836e88eba4959660098dc0d74d
 MISC ChangeLog 460 SHA256 1ababb99d24dec83a52d368bdc98c675638f270376fc8927a5c30c4a6b5f41ff SHA512 2797677259b8a3f5c24cba7acc57be60076453adafd8e737242f4c45f62d821b3a721b0ae8f9dd2c95630616bd7182f6e48c9e024fd268413d712ed69ac81c74 WHIRLPOOL d7e4bbe6d03f2488589e802ae256f79791a52be72ecd0be4200c229ad0f0b47aac4b747eb1292439117b747422d72c65a7704a9696c459157f543e469d6efbbe
 MISC metadata.xml 5303 SHA256 0cc067fb9f790f81349f12f855e9eabad8193d566caa1d247a88eacb8e257f99 SHA512 acc269672170b9427444854bd73769c31e45a5e87ccac7441024b8db93dd1a02b09a9700b6c38f15379981cd34c490a6937cf780c544a245239ac7c1c323de16 WHIRLPOOL bb5c57c61aa7677342469a1173a648cabfd836d32cab84f78e43d86f12ee92d9278463f646762b4502cf9c8ca2dd53695bfea46e3c8268a0814f1288d10df8ba
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
index ac3fe67427d0..34cc39013484 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A rich set of tools built upon the Test2 framework"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/aliased/Manifest b/dev-perl/aliased/Manifest
index a0e753b5133f..f3eb4b937bb7 100644
--- a/dev-perl/aliased/Manifest
+++ b/dev-perl/aliased/Manifest
@@ -1,5 +1,6 @@
 DIST aliased-0.34.tar.gz 30464 SHA256 c350524507cd827fab864e5d4c2cc350b1babaa12fa95aec0ca00843fcc7deeb SHA512 65bc3f6401a0c2119105261112a3d9612abb98c874cd3409c6a1a9a0974aae902f30b6041121be6a74ee28584cf0c7ef506fe8318ab35ac550f70b4b387744f6 WHIRLPOOL f99b2106661196e22c3bab686b0eff1224f8047ef3766b8f7d3dda21c839cfd7f763cf90e3ef2266a445c8c3a641124aabd1e65e5d538185879fef1beaf91606
+EBUILD aliased-0.340.0-r1.ebuild 538 SHA256 9c3dd8e6f8fac08092cda4fc54dfce8ab31603f9189aa7c3edf6bcc0a8bb21a6 SHA512 06947cef06031cc0caff353b1d4571354f8804ad5e8ebef23d922ba2c384ace5c761073ef197e0a1464083095ff6a02be87cef974943f0588ba27154e6e66dc9 WHIRLPOOL 3cdabf797d6e877f7efffb384c435fd7824eaf8ee9b3b3716d7d0afb189acdbd7cd0dc8cea60618e5ceea08dba987119c33c79bef6f8e45f356e1d3a5ea6deba
 EBUILD aliased-0.340.0.ebuild 557 SHA256 c28b6b79fcb0b06f52132b2afb1b47f53e7ddcbd7712c49a69d1873df9e020c7 SHA512 c579a71b963be357228e541f0a1b9d96aa6fca6e1b5252330f7ffc0c64b8da6b67bd4fdca5c3ab5d40dedb5cb9588430ed2bbcf5c344adbfefdee6286ddefab2 WHIRLPOOL 4c13640d5407b4f9b420060f9f082dc68a8d73e9e73fad76a3374fdf3a25c477e3a5e40872c6e52da03caf62e82b1049371e9bca363d34300ba16e88b1c72eb4
 MISC ChangeLog 2431 SHA256 58dd2506e0f8bbc3b802115a6029f85711a5d5032c29a39adbf2bf27c7b6b3cd SHA512 5e9f2806cdc571a22bc20888325d541df5eec5ba0e0855e1c16d394948f2c75f6fc1a1a31424019867c0569965ff0075da733a25413e95fa778843282c2e3401 WHIRLPOOL b02004c86a16aaa015cf87dbcfedd1dd837c30e4af81b83373b576c973a87ecc8918e3e5aefec31acb54afb86e775f0e67d4f606673912c22ad529e6b2066e64
 MISC ChangeLog-2015 525 SHA256 3ac406c77553307c67b1bb1bb7b701b04cb48dc97f90f5d25e1438f56a6591c3 SHA512 786792f506f2c3d6b853923ce990337cf7bc764cd06102a0227ed08fd8af3bf8260beeefd0f6ce64e316afc318084c984e03df6d7fe90d2e21dd85b0fc3a2b2f WHIRLPOOL 8185da2603cab0eaff10afa013eb375cad562b6c3e42301b1b33193905320951c3bfa2f02dcd3adfd735167581a5718e6501630e9bfe10b5f2ab398308f2a2ef
-MISC metadata.xml 269 SHA256 84b65c1e72c439b7f5175ff684ae78fc7fc7a226eea4a884c91e73e90b1662f7 SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84 WHIRLPOOL 3da4987d361ac8c36e2c8fc914594d87b657765153dcf177a1dccffa9b088c0bbea71f6a9848bac35a92659455cba03f88f21fae9ffc6735b60512fb1a35982a
+MISC metadata.xml 409 SHA256 a66e55c2313d2628057b1b4c870a52ecf2cc2c655c5a262ac054563cb60929cf SHA512 ecf652ae9a75fea78effb229d700bae8c3912ec9d9f8f052bea111d491dea7e758281c6345f72784a216b2f07e92ef6821e55674be880b27f77f3df040e3e7ec WHIRLPOOL c6f7869ada05f35f06c6ca87c4a75ea6ea25be4d42dc4f8804e31d60d6aa732a113e8f6ccd9af7711780e186cfa6ec8d664161474daf54048bfeb5079c646c3c
diff --git a/dev-perl/aliased/aliased-0.340.0-r1.ebuild b/dev-perl/aliased/aliased-0.340.0-r1.ebuild
new file mode 100644
index 000000000000..6739ddbe58be
--- /dev/null
+++ b/dev-perl/aliased/aliased-0.340.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.34
+inherit perl-module
+
+DESCRIPTION="Use shorter versions of class names"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.39.0
+	test? (
+		virtual/perl-ExtUtils-MakeMaker
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+		virtual/perl-if
+	)
+"
+mytargets="install"
diff --git a/dev-perl/aliased/metadata.xml b/dev-perl/aliased/metadata.xml
index f53c778e0d38..83ef8e99b1fd 100644
--- a/dev-perl/aliased/metadata.xml
+++ b/dev-perl/aliased/metadata.xml
@@ -5,4 +5,8 @@
         <email>perl@gentoo.org</email>
         <name>Gentoo Perl Project</name>
     </maintainer>
+    <upstream>
+        <remote-id type="cpan">aliased</remote-id>
+        <remote-id type="cpan-module">aliased</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 2a25204ddd99..0ea7eb0eec02 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -4,7 +4,7 @@ DIST xdebug-2.5.3.tgz 279085 SHA256 4cce3d495243e92cd2e1d764a33188d60c85f0d2087d
 DIST xdebug-2.5.5.tgz 279491 SHA256 72108bf2bc514ee7198e10466a0fedcac3df9bbc5bd26ce2ec2dafab990bf1a4 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1 WHIRLPOOL da0fc418373d50bd927a5c2439703e9db28c1dbd4be727d963562a1ebc7941dd7f007badd09203e834c352ee75fc72fe85c25f095a54943184dff42361fc2b83
 EBUILD xdebug-client-2.4.1.ebuild 590 SHA256 4b3bc5f499267cda25574af22390621a2f495d38b6098e679397385a1d8dc10e SHA512 49462cfdf857ad66d962ed64f68017fee8b642bebfd33ad6cbe96beeea638a6805142164b452bcdf5862c792f44fa023d7babe6a1d975a9df4993f508502dcff WHIRLPOOL 01c4e8466358d01126a1fc76739492223485ca3a14f6f2c15b7ea13593553c169b1a2e5e5f066c94778b2acb40eeb31f33e0f854d59e32fc202bc40187b3fe3f
 EBUILD xdebug-client-2.5.0.ebuild 594 SHA256 4739301d862e51eaa9909188be83b1dd779c20f0684c750c37ccb149562b99be SHA512 45082c878e5adb1fa175021b17195101c5ee2aa7bff6d3bd4360dfe651c544c5afa5f608b5844c4ecf9b38e5ff9a789c9386217af526a1d5c2d71178e3377bb2 WHIRLPOOL ba880a7d7ef18b72febc83409a23597f6baeb6a69ca33253aaa6dd40ee78ec5125339ddf39ca8bbad3365a307b1ebf4c4b8f3d8d9577e19f28c3a6094de4d3b8
-EBUILD xdebug-client-2.5.3.ebuild 593 SHA256 2d58476eadf193c0fa2a1114f379ce3079240e888e7c1c769c43830c937bbf73 SHA512 253037fd43717d855315fefcef2c9473a5612e174153ca49abfc0ae7130d40a6ee925ddb97f66e755886321ad9285ce8c41c74927ba87d644b40bb365208a5ea WHIRLPOOL d1f54dcc9bb407d07d304f843d6edda1dfcb8afca0237c8c02ad1fc1d53babde8fb3cac90d92aec81268b9aac845b9c1d7683c0b7451af976956a7f81205fe60
+EBUILD xdebug-client-2.5.3.ebuild 592 SHA256 5a2a0fbbda9ebc67e54568fa628167aacbdf82c7af8f5c7e03a10bf7ac02d235 SHA512 03d5a4803f8c88453d64c8b82d4376142fddd16125c51a95b7b70a41a11fc7acf2588157677084441134a8078c091d5f30bcd03c16ca60069669c389ae23feb7 WHIRLPOOL d39ce7ead6d0cd532a1d0f8205b86e3eb5ab2c236e4d9ddeff2f71baae95c28367b2db4e8235b10abe9684b7a0574b7f9254b890b485d1b9f504b4dddf4a4bc9
 EBUILD xdebug-client-2.5.5.ebuild 594 SHA256 5b73812cb2e9cc4d2e35ced4025ee398a3e9cb916fd7044847bfdc51da2ad0b5 SHA512 fcc3ce0916280c1bf1c3133e898129209e808788fa0b40147aebfb5b9692b755354d5fec395f8bfee05b1ed1a933c578c93bcd86781fb2626f9ea10f7e4d82df WHIRLPOOL eb6b2a3419ead87f011e2e98b73937ff246a6fd3aca82d9c36b77d9e71ce2b69ac19dd03b19a559a90a47a91489f539077cc31a94f3ff496da67128a25d50c53
 MISC ChangeLog 4661 SHA256 0c746cbe7eada2b3705a8867c7ccf048741095e24b71f7b821bd6b672c0043b9 SHA512 a37ca22b46bc0ef506f450096dd5105b2cb6aa7e501ab0f68b5c1dd419a0ddb2d908a274ac641068db0f7ef7a96a655fd10e9087e712a72ca2c2e61f145f6cc3 WHIRLPOOL d8c9bf692cc6e6309a08691adf15dd2895803283e82fbfd515ad4baa409ae0c5c927b2cf8611cfb8526441f5a071b0940a963ba336284cde78b5de14246a00ed
 MISC ChangeLog-2015 10873 SHA256 edb7eb8afe9ef13b40f08f73957927f6b0f2d2d4106e09e88ae5f53e6ae739c3 SHA512 de9b200f84502cf48d16b3d84a876bd3717fba2591730b9b06d5e4543032ac3598dc134f97d4595848b44b1bb3dda1f8f429e2a8a7cb98523c3d39f77b279ef6 WHIRLPOOL 34c4303307ed65aff6fa7aaa2b8b05b2ebd60ee40dabe30489a43f4a7c90de6c9f5c95eb8789a61aff47c0139c45e0938a355c83b6a4636ca22b7422c31698b5
diff --git a/dev-php/xdebug-client/xdebug-client-2.5.3.ebuild b/dev-php/xdebug-client/xdebug-client-2.5.3.ebuild
index 9bea159fbca8..a4e12ae721bf 100644
--- a/dev-php/xdebug-client/xdebug-client-2.5.3.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 ~x86"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 3abd46559edb..8ed074022af3 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -5,7 +5,7 @@ DIST xdebug-2.5.3.tgz 279085 SHA256 4cce3d495243e92cd2e1d764a33188d60c85f0d2087d
 DIST xdebug-2.5.5.tgz 279491 SHA256 72108bf2bc514ee7198e10466a0fedcac3df9bbc5bd26ce2ec2dafab990bf1a4 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1 WHIRLPOOL da0fc418373d50bd927a5c2439703e9db28c1dbd4be727d963562a1ebc7941dd7f007badd09203e834c352ee75fc72fe85c25f095a54943184dff42361fc2b83
 EBUILD xdebug-2.4.1.ebuild 1006 SHA256 d2191adcb23ad3caa58174de0ed7c5c4bc952b84a71611d51a4647e25174dd71 SHA512 f8558d5c12d5a52c091fbe11751bbf84e147832a1c2c8acbe82d68a6f879bf74ca94302d41a50df27690579425d8795a694e1fe73bfbdf0caa15cf4c90e3dca3 WHIRLPOOL 2e44a2762a1fc673ed711de0353c188ea21045fc5522cf46489411556a1613267d5be067a94a3de8e993b56ae7f2603a46b84343b93db27d2ac34758bb4f7371
 EBUILD xdebug-2.5.0.ebuild 1039 SHA256 9562108aa52675c527a3c27ebe20cd8df0dedd50f12592ab2141fe5f73a1fed1 SHA512 605b9fd1101edcbb5270690e3e4339b815fefdf2a1291a21d1397c4d98c4884ff635bebb93729a039c6703cc20925e08184c45d5334efa403e67a421ba9c05b8 WHIRLPOOL 9349e3ff04f5db482edbad3cf5f4745494e5612f9952a65c9e15caef3304febc1cd208a9c398b45e69ede5ddab5c6c3fb511c7b7d3797d82987c0758c0042d54
-EBUILD xdebug-2.5.3.ebuild 1038 SHA256 6a1dcef890200fcedd0d8adee1355de2acffd8d4091d39feccbc697bb7e7038a SHA512 64483d0afb0af25fc87301d8f6f8ff383519bbd76f1b63ada02a421c8ca8b80ca3b4f5f460e0dd551d634575e018fd2807303f829eaccbab4ead669abf437741 WHIRLPOOL 2460ba0aeb8ddbc057fba52e19f5689ba6558e13ff98f7cbf2da66063119d7f5c069a6fa4fa62f705f13aca968ad472be68e2a3ec6ca94a67989a9d9fe13b6c7
+EBUILD xdebug-2.5.3.ebuild 1037 SHA256 91cc7a721ea3226e1be5597ce40f1be383b665b6d141553bbf161c7dcc3d27ce SHA512 cd0b2535c85e015fc83821dbc6f92fff32c281566a8ab6b936960b3d0d869a9a38611928b0d2e3d074663ee9fb5515f0e272d0991745fbae3726050b47df9d4c WHIRLPOOL a7abd6e7f54913fcce262200c0a69dbe7d485ddbbe410639bcf28ade50b0311b18fba223b83aa316cb2654577ac18cf27ee8279a033dc09fc225108e2301e8ec
 EBUILD xdebug-2.5.5.ebuild 1039 SHA256 f1327c388da1973f5239b042be30aa6e5c78527d494f73c9a1d018aad6320f64 SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8 WHIRLPOOL 6c217ef84555da51939a3965107a8165f0d0905cb5def8fb6ae43ec9db6a0ab6e6934404e92271bc7c3e0c2933c4f806a9aa4ad6f6c33a88f48312686e3176f0
 MISC ChangeLog 4305 SHA256 2c818d34bead5e48650bfb4a10d1e2ea0baa567bda5110dd7c98c998a3fff609 SHA512 0ea042e489cc46d024a4b3737fd0f00d492423bd840694c1e45fe997e3682031fb0aca0f9815fe0ed23a8f7ea70510de0b8593ea912dccd3644c50fe904e22b2 WHIRLPOOL b835acf665982561e1ed69664c649cd9e1f5d0cbf1332300512e5fa0fa363a8ed986fd207da97b570cd483395b9ae0870638c4f6d6ae0b633d4b0a9b4a31c34f
 MISC ChangeLog-2015 11516 SHA256 e402c2f5411ed1e5599a3093bbaf7da9cc224d3c0f9380914cfe94ba7a6e732f SHA512 9edad23f984343bc8912754a55758b6e2432343c9ae22dfe0f8f03ee765392a0629b098e71723d264bf6df42f286a344031154ca0e8a34c03e29f69bf0522cb8 WHIRLPOOL f119d9334a89600530570d8533ee6049b8c756af42e281025288b79972bfe06596e646f74cf048b9518cbc6f476f66297673d055edd42cf185a7a731f5361b43
diff --git a/dev-php/xdebug/xdebug-2.5.3.ebuild b/dev-php/xdebug/xdebug-2.5.3.ebuild
index 6b6efd1db872..b95f69ef719e 100644
--- a/dev-php/xdebug/xdebug-2.5.3.ebuild
+++ b/dev-php/xdebug/xdebug-2.5.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 ~x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="http://www.xdebug.org/"
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index a11326490b7f..90c308f38125 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -3,7 +3,9 @@ AUX catkin_prefix.patch 1619 SHA256 ca7f0d3febd5e86cc0a57d5f2eb0aa2c6954c9d835d0
 AUX infinite_loop2.patch 1274 SHA256 545df24d04998671cd82ba130f8a1d69cf2576a3515b022fcdb2b04ddf45e662 SHA512 a736242c2e42d0e3c97556f565d7ebc3b06c203a21b805fa13db789ffcc396b5f79793874418c389dd0013c36f9ba6f5674026d03d26653ea2a69fb0a95bab9a WHIRLPOOL cf2dea7bf38538cbcf294a71c4a75dcc7ed8a8aec6066ab5e7ec5b22fc2c0f4b207c9ccd1e605a124c524520d2fdf6bce3bfb8cc0f09a8668e735267fecb88ff
 AUX ros_packages.patch 621 SHA256 950e261d19b15444034c1984e14878eb11ee9df5d6d6291d2aca2dd8347dd123 SHA512 446c19801306f2f0116a4bdfe228ddc192a84458fe0803bd5ce9b99d58620bf2c3bf31bcc3f078a4c18281f64f7e68cbfb711d683959e71457b05b7aa63a6ecf WHIRLPOOL 4052d22449e7f8ec48946a030c15a998fb724c2b25de727235e673618d4616edaa0d184c1e59edc291f3deac613bf3b632c61cd113ccbdab26aa860f8170f0d9
 DIST catkin_pkg-0.3.6-gh.tar.gz 47637 SHA256 b05797352a89986a6c637ef33685a8cd004a8e5138b553f42a82065bc02f808b SHA512 191ed93271c9e592040110c92a572570fa8dec328ae3203dfea9e1fb6a1cb906350c436d3a9416d6826e57a1d59ef42200797d6a5bdc390aa77d352f716e0cc8 WHIRLPOOL 83f73ddaad17b5cfef4945a4d0c900855586877c47962b903e68f821772f4281f7658d82c4adfdf8067889e82f1264d843f1c4f336876ac8afa1bdfe48edeb37
+DIST catkin_pkg-0.3.8-gh.tar.gz 48281 SHA256 5d478ca6df90d7360a3ee4ba14771e64bc4692620cf3909eff838d886f190ae3 SHA512 3e20a8ab807158d6fb6a1c32737747db373824eeb085a6af2fc586c08e9445b40f118f56c3765512b5e6cfe25e2f875bea4d408cbe61a994cebbc3fd1342c024 WHIRLPOOL 0921c0df706c692ab79696fa7d703840dd75a0fbe2d6f45337869994be2e50a8eaff4dd43582021ad3d8082d4a541ea74b45f85128819731a04db7c665869be2
 EBUILD catkin_pkg-0.3.6.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
+EBUILD catkin_pkg-0.3.8.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
 EBUILD catkin_pkg-9999.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
 MISC ChangeLog 2147 SHA256 04a5fa7473218dc80a59d3d87d86663506564c00ca736c2a00be0756a36936c5 SHA512 1312dcb18e7ae5c84a8654fa8e336b34baa98492ce58fe9c790daff4522bc303ce4661e3561cc175790c1cc66dfb94cd11ff622f421d4c81d2e9e2c2f158dd16 WHIRLPOOL 1da74529ea3775f1eeed4cc6bf764777e95aab26acfa86e2e110b66d822e61b725720bf455495194eea8b90b31ca95bf9c49461fdb58882f1cf08486d470ca21
 MISC metadata.xml 343 SHA256 8e283f2089b6cb4306afba398198483765592713058d3ecffcd44157015973ee SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862 WHIRLPOOL 99cc69cbf235b08f27c40b2409ea3216a71d1cf9d663b5f3683d2e38e0828fd04468886d99249b0722a98bef55d67252d4cfe1ab49f6286afe7cdda136742f52
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.8.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.8.ebuild
new file mode 100644
index 000000000000..0967bd6ff8e6
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop2.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 2477bc83753c..9defe337157d 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -4,4 +4,4 @@ EBUILD discogs-client-2.0.2.ebuild 904 SHA256 57ab89fdfeeece617bf0bcc5b0ddd41cd6
 EBUILD discogs-client-2.2.1.ebuild 833 SHA256 da19a482a99708e89d4033816cd37cc86fd362ba5b3b249aafa5d15db056f434 SHA512 75dca816850a24cc8a52ce722b4551be626651c4981f1e351f8f6f86346936f71831c4aed14d8e7439d3af22b667c4b4befdfacbed193e0924236cc7826ce08d WHIRLPOOL 93cff6df9a2bdf62aedc2f6bc8b15c92b8ef0ebe96fd180d2856303811946ee1e12980f3b9e2d14903ca250ec3207db2236282c526cd673c3528f8056a49c301
 MISC ChangeLog 2882 SHA256 bac10008d807ff286681cd9d887ce618165aa8185559f3e03baba1c703e61951 SHA512 9c7b334bea780c689fdd359096915364b6da00ba73e149a2333c780fad743a133ff2c946816cec589fc996826b5e9b0b6343a6798fda28b7f8d242afd60bd29c WHIRLPOOL 7e28d0d85f8c2e1def22250b6facf796eca9e63891d7ea98c39c15bfa06c2e0f48451d4b2f50c9385579781766e013f0a727e937b3456d38e43298b84ebc8235
 MISC ChangeLog-2015 1848 SHA256 4fc0378b9d1d729b0f3845ba32fee6dfc1cd3e003148220311cdeab78cb6e41a SHA512 a238062718b8e5d68064483e05d4e623d67ff3623e8879975e3504ca71fbdf3d1a37a645ac5077725d2576c0fc764f5dd41a7b4af4961f4c9e717f03fd395de6 WHIRLPOOL a61e9efadabe3895e832c0b2fe5e5622bc36eedd7c8faee8aa5c031d8508100cffc74e438858f55c6afdeb9047d8586b04743d345f30cb554265cd56c9278966
-MISC metadata.xml 510 SHA256 e11383e5d6ec4c773f68366f3a022cd85556f8353ef3e8cdce100cb82e781af0 SHA512 eb5c50a58b9047724cadf5435ade2ce815fd90d979a2e900becb98c1eba411a24e2087e6f691f5b54128419472bc15d8ece13a343e7335c1c4a007546dc57441 WHIRLPOOL 8ee9acb8812a81625b6b56a64fca2ff373fb27f30de37742c14aca2221ae0bbb997a7064a189b0348c887f253986059f060033e4a22b22be69ebf9ed5a7797fc
+MISC metadata.xml 391 SHA256 7265e7c9fa50c43d7baed18e54106f94e5d3e5cba54cea0e510774c119d7a852 SHA512 37252a778b2f529b74e72a6f873bb1bb693c339619a7d9c236ad96a8693d9ec04e40299f4be8a03efe48b3f0ea052a676b5508871e3d03c82d2ba814ac325bd9 WHIRLPOOL 66f212589f1ddedd67f098b3eabd9ab2270ccd46aaf257cff0678029830b90e9cdadab43f1ae9332a7b9c3fa31851a45a26decbf9a6b81cc72c9643f328e7abd
diff --git a/dev-python/discogs-client/metadata.xml b/dev-python/discogs-client/metadata.xml
index 2ecbd1d91959..f4f520916edb 100644
--- a/dev-python/discogs-client/metadata.xml
+++ b/dev-python/discogs-client/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>int.teo@gmail.com</email>
-    <name>Theofilos Intzoglou</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
new file mode 100644
index 000000000000..4fc5cb8305a5
--- /dev/null
+++ b/dev-python/flask-paranoid/Manifest
@@ -0,0 +1,3 @@
+DIST Flask-Paranoid-0.1.0.tar.gz 2619 SHA256 7a757c115e5f9d1acc5eda3ed2356ae8c21ec3e14f25d1d3c0dcf4eb2877e0cc SHA512 435b679d7ad027d813b887bfa1211318aa122c6bded879dcb3e803535671e21f81e52fd5abb3b82c998d862441e6b5123290f4bb2da70a4dec391b05601eb639 WHIRLPOOL 01effc285494b7f186cc396bbc79914a97ca7ab9e25027bbd754d26cd9a2fc522fdcf739d872749df1655594beb0ad9c6cd94dd0a07f740c9d500c2116f4c2f8
+EBUILD flask-paranoid-0.1.0.ebuild 527 SHA256 2aae800d6a90f543caa025e623574a621f58d8e020090b85449edf92800fb642 SHA512 0183b5bcd63703d52fc43e6d1a0cc1c92166e756ce2e22d137bf694b22333812b8a2b69a7ff626b3941e0f94b8bcf49ba3ff1cd34f988127b79a611bf5498596 WHIRLPOOL 8fd7d3bf3ab215ccaf8cfb8ec59694dfa098b7f96b5bc3ab8e0bb99be564b4277bc9103d1c2d9633215991b0e9460167aba2793fd5154cf6a40177c47750dcf4
+MISC metadata.xml 431 SHA256 3ba2ba5adbc53c0a26b96d09ec201ac896c8f133625dfd89378665c2d822f40e SHA512 52469023be87cd14845fffb7290a1c0fbf087bd60759fe87ae2ead185664f7006d899494f1c0d6c29dce49900cffa27526241fa9ac715efe27d23e0bd5dbf415 WHIRLPOOL 63d09991701a1b7937cc02d36e3f39bf44260d3d7edc23bd9852c238a4c2d90fc92f807c88a306eb02802ebfe866864f66cbed8b039eb40e4ac8a2f72efdd1a2
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild
new file mode 100644
index 000000000000..9af78fe167bb
--- /dev/null
+++ b/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Flask-Paranoid"
+MY_P=${MY_PN}-${PV}
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Simple user session protection extension for Flask"
+HOMEPAGE="https://github.com/miguelgrinberg/flask-paranoid/"
+SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/flask-paranoid/metadata.xml b/dev-python/flask-paranoid/metadata.xml
new file mode 100644
index 000000000000..9b4a931e5d0c
--- /dev/null
+++ b/dev-python/flask-paranoid/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Paranoid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index f409f4c1e50b..868f6ead8629 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -5,6 +5,7 @@ DIST psutil-5.1.3.tar.gz 341980 SHA256 959bd58bdc8152b0a143cb3bd822d4a1b8f723061
 DIST psutil-5.2.2.tar.gz 348413 SHA256 44746540c0fab5b95401520d29eb9ffe84b3b4a235bd1d1971cbe36e1f38dd13 SHA512 df4878d03a6ff98beb611969edd5a4d704ac269d38dc286d84def3ca271936e03367241470f2a192e0d71d0f64fe1f252223b0d67e964918146334a807d1a997 WHIRLPOOL 3c6a2a74ede27f52f5113b060f9786a75169394309ca42f07cb56f839916c4f263877cd30cdc45328195b3ade3ede09cbbfe707bd360422eb7dbbe29e73428ce
 DIST psutil-5.3.0.tar.gz 397265 SHA256 a3940e06e92c84ab6e82b95dad056241beea93c3c9b1d07ddf96485079855185 SHA512 fbcb467fe5cd7e9e5ed149409e427d992510eac3e8be73a31e71c60d5e576bdb9c36f6ebd1d84730a0ab250973ad618800a0e864076f978f66c1117d90147a40 WHIRLPOOL 6a99aa4df67520acc2706cf98232aa46774033fb7a8d2a250c0badea48f2176f279ec239e3ea27006bb81ee499cf1b713f566daf28122517242d76fc8abf0633
 DIST psutil-5.3.1.tar.gz 397075 SHA256 12dd9c8abbad15f055e9579130035b38617020ce176f4a498b7870e6321ffa67 SHA512 93bfadb19e603f7ccc7eedfc91aea05af41f2aeeeac1f2f11518b011c53f1672e07d550e6db6999fd3574c6b49adf4ffcb1a68f1066e8851be12689b0daf9595 WHIRLPOOL 23dfe92e9870b929c8dd839913cde2be7cf9a4df51cb9fe50f3b2afed58a6f64f4e8a8f200025bc9fb1ebb3bec993ccd2e9a2258b7f5837619bdf36eb5d78780
+DIST psutil-5.4.0.tar.gz 406945 SHA256 8e6397ec24a2ec09751447d9f169486b68b37ac7a8d794dca003ace4efaafc6a SHA512 2a971518a7507c20885981707b6bfa608c1105503965750f7e4d9316f91cf079c5a33208bbc6134f4fcb1d581422cc72a5b119a329682441f52caca27aa65b30 WHIRLPOOL 938e581268955e7d9108e90074a1ea4126a30e6bdf6013cc5b9bdaf68b8ce072200066f0aade3fd2771d4bfbd992009e5ecd280fa49ea7ec020a45a996146460
 EBUILD psutil-1.2.1.ebuild 577 SHA256 7e6489c189cbe3cb3f45c65a3db3d28e74b5d62081ae8d9f4e46208c8e0fa1ed SHA512 8ddbb64a6ef392047d8a23f286aad8427f64122f5040d0f20f363390f9084dde440e19616457919b09b1a41dbd90d099297e77618675e9195a198e5e9153abf1 WHIRLPOOL 46fee079949b022b7c56d08a9684d4febf66f1f09f63884c7345152b909dbb15c0ee9fdcb41464368157e989e07ce1df64c137cb899965a279d11229f15dfc51
 EBUILD psutil-2.1.3.ebuild 673 SHA256 486c4bcbf509295ca38e822216a0be27eefb8853d4135ddb0feee8c30e68e31c SHA512 19eb266d399895dd97a8bff95df71e4dab14bd86ee6fc381b3eb322f139ee49d57c1804c568c3bbb4f0120bd093206d464f462b9fcdc37837014397df04e2bff WHIRLPOOL a4791dd94ac52f7dde8518d7911f8c181f2de8e3d9e11669031da0d21e93db87bb6a1d1fde848e35513aab8486472a2ca677d1b3c0f7b11e57ad81e7b0abdffe
 EBUILD psutil-5.0.1.ebuild 779 SHA256 4a5327bc5fb993d57e99109d93548dd0102aa02680191f8013e4f164ae5a4c96 SHA512 d5b720450aa0f2211a8bf28635c0e47d0a13d1cc4f5977f583c48254e07a3bfd2403f4d2ba6faf299d29a1e88466ed9036375315b7a9579233b47d950cb32009 WHIRLPOOL 5e144a03a535ddc255ba40a609b217275181d094105f29efb1648c67583c1126222f0ce1bd3f522de9a86e763c86c9c3959ecb5d1168e8af92bb963391c24267
@@ -12,6 +13,7 @@ EBUILD psutil-5.1.3.ebuild 782 SHA256 5178a171842f732b63b070f4a0742f02c66495afa4
 EBUILD psutil-5.2.2.ebuild 779 SHA256 4a5327bc5fb993d57e99109d93548dd0102aa02680191f8013e4f164ae5a4c96 SHA512 d5b720450aa0f2211a8bf28635c0e47d0a13d1cc4f5977f583c48254e07a3bfd2403f4d2ba6faf299d29a1e88466ed9036375315b7a9579233b47d950cb32009 WHIRLPOOL 5e144a03a535ddc255ba40a609b217275181d094105f29efb1648c67583c1126222f0ce1bd3f522de9a86e763c86c9c3959ecb5d1168e8af92bb963391c24267
 EBUILD psutil-5.3.0.ebuild 782 SHA256 5178a171842f732b63b070f4a0742f02c66495afa40999843552a8375d8e10b1 SHA512 a69266a36f5a8579e024b2fa29c0ca2b47261d0425c5aa4bbe871733a9bc783baadd531b3681d1dbc010074b3c0f66f19c6884b96ab491701e358d42a2b43f23 WHIRLPOOL b9b369b15b72c73da04b5acce49920231febcf2d79f162dd60f54a10e6955a67135e3f61a69b8091934916795a6a54ad14eb84d73b9c02703a6d804723ca01ad
 EBUILD psutil-5.3.1.ebuild 782 SHA256 5178a171842f732b63b070f4a0742f02c66495afa40999843552a8375d8e10b1 SHA512 a69266a36f5a8579e024b2fa29c0ca2b47261d0425c5aa4bbe871733a9bc783baadd531b3681d1dbc010074b3c0f66f19c6884b96ab491701e358d42a2b43f23 WHIRLPOOL b9b369b15b72c73da04b5acce49920231febcf2d79f162dd60f54a10e6955a67135e3f61a69b8091934916795a6a54ad14eb84d73b9c02703a6d804723ca01ad
+EBUILD psutil-5.4.0.ebuild 782 SHA256 5178a171842f732b63b070f4a0742f02c66495afa40999843552a8375d8e10b1 SHA512 a69266a36f5a8579e024b2fa29c0ca2b47261d0425c5aa4bbe871733a9bc783baadd531b3681d1dbc010074b3c0f66f19c6884b96ab491701e358d42a2b43f23 WHIRLPOOL b9b369b15b72c73da04b5acce49920231febcf2d79f162dd60f54a10e6955a67135e3f61a69b8091934916795a6a54ad14eb84d73b9c02703a6d804723ca01ad
 MISC ChangeLog 6149 SHA256 624d6ef498b5c2904ce92dc25dd98f2831b909fe48a9f1a1fe0d5b07ff2d55ef SHA512 f0e6e6396907b486248f50a544d4f4b6fb342a41cd2d81e473ac48ba70407b05ce13a5b392b9e1ea7e6b7957d932b4f7369d1620fcf8b70a2c3764358ef1740f WHIRLPOOL 4ebb0455fc448991aa05193ac8f29b94b500b82dec8bb43a71be57b7d651ceb9bea1239d98c62d6f6bd7f0fa9fecc27e9d905255ea56f67cc1182f5ff5d20c47
 MISC ChangeLog-2015 6585 SHA256 ce04bd08bb7993e368874ac7b26feea52bc427ab6042929994b0eabd59b6a8de SHA512 1db8336909c3e28a2b794eaa3fa5bcb2a27d00bfe3e29e12778d86bdfcfc402c5936af82fc424ed7d8a4d29d7e99dd99c058d60c88cb9977e3a3ce4756345e59 WHIRLPOOL 9da9c587d2225c789ff39e46d4437ea04e8afe270d764774c362450d95d76ecd3dcc0f74981ad4ccea47894440306fa6b37292526f23d200c1b1b5810c55f648
 MISC metadata.xml 377 SHA256 5ee32592fb176c7b7297e612bb531ff057c567fbcf4498882ec791c823c00e69 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d WHIRLPOOL 398d572f27a1e2769aa09e6b99314aa2ec333fec74740ae2655db3791edf71c8243b10b03047dd5c1de95733e29e2413a285ecc71afdbfce1525639b5097d8f4
diff --git a/dev-python/psutil/psutil-5.4.0.ebuild b/dev-python/psutil/psutil-5.4.0.ebuild
new file mode 100644
index 000000000000..ab3ee8d3bb2f
--- /dev/null
+++ b/dev-python/psutil/psutil-5.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/runner.py || die
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index baf20d7c618f..49af9162db1b 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,8 +1,8 @@
 AUX gentoo.patch 662 SHA256 85c83188b57f605171e10240dcbf849b59c7129619c9420511c0f6fa805a9fc9 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153 WHIRLPOOL 3b384bbce4d26766a9a15778621a6474af70dc3b131b8a0d82826651a5a88e82ea8331bac0d3771ebd810193c115d3d8c6d0847c39786b013e770525b45b643d
-DIST rospkg-1.1.2.tar.gz 89536 SHA256 2716ecff9b08ec97f000d716a294a043527ada7e6e46586dac063ea36fce6b58 SHA512 4fcabb88e749c0b756bc7230a8e3343098b3fc35b74bb70332e4a1ffd0df80054b9220604fb168f28ad819a3201c096a9f98ba450921a774aa8400703a7e7525 WHIRLPOOL a41b70a830846678949c4bdbfa6895c3cfb1be12428292540192c683ef62e6023a4b6d4d46c35c0e4be0211beb98009b5b1ee5644f57d79a0f723bb6499d00f0
 DIST rospkg-1.1.3.tar.gz 89534 SHA256 ba0948fbb3be14082f9e83763cbe3a12857127eb78e142748c9d16d41ab4479c SHA512 2bb0521fbb87492dbc83d2582a8de3034f2e5548c1a464cfc558915157f3ef9d34d6166a4378d5e5cb226f2c8f714df86879220f7041d37b58a9ad33be2ce3cd WHIRLPOOL 77082d0927626a5350300c556fd15eceb3527ee3a64239ade75aa2758288c1835e3f7797425ea6921674cab187593ec494406717a8daa88093dea874efad95d0
-EBUILD rospkg-1.1.2.ebuild 1006 SHA256 c5034caaeced20590443ebdf5b1fd565dd245bc56616646c87e5205b32e2d690 SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 WHIRLPOOL 0b478f904785836e55da0c5a53596e1cc388adf66846b19f575aa1e252435a49f4bb4c273f847b479706b40c30097f2aef13ff60902a752867c82bebf3a61837
+DIST rospkg-1.1.4.tar.gz 89554 SHA256 9d93bbf646c3db7e5ffd9814a879fe76cf45d2aa0a0bb210f44e807ea41a4c70 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5 WHIRLPOOL ab3eedf4df5bac5cfb19c50e8452928c8a879fc506a13e1ff2f92cb37afdd610ade43efd367d5c5cf09fbbc331177e42d79f8825da23ed05fae2f9f3953b4ab2
 EBUILD rospkg-1.1.3.ebuild 1006 SHA256 c5034caaeced20590443ebdf5b1fd565dd245bc56616646c87e5205b32e2d690 SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 WHIRLPOOL 0b478f904785836e55da0c5a53596e1cc388adf66846b19f575aa1e252435a49f4bb4c273f847b479706b40c30097f2aef13ff60902a752867c82bebf3a61837
+EBUILD rospkg-1.1.4.ebuild 1006 SHA256 c5034caaeced20590443ebdf5b1fd565dd245bc56616646c87e5205b32e2d690 SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 WHIRLPOOL 0b478f904785836e55da0c5a53596e1cc388adf66846b19f575aa1e252435a49f4bb4c273f847b479706b40c30097f2aef13ff60902a752867c82bebf3a61837
 EBUILD rospkg-9999.ebuild 1006 SHA256 c5034caaeced20590443ebdf5b1fd565dd245bc56616646c87e5205b32e2d690 SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 WHIRLPOOL 0b478f904785836e55da0c5a53596e1cc388adf66846b19f575aa1e252435a49f4bb4c273f847b479706b40c30097f2aef13ff60902a752867c82bebf3a61837
 MISC ChangeLog 3855 SHA256 636c61f28c5e0013bd5222a3a8f5650517898d095e9b30e8d38e3256241bc81e SHA512 9184674ec8e30e518fb1106f00c3780dcc1a0bfe5994db452dae6ba56752c9689c9a2814d2aa7218b19b9045a45272305b970ab0b87c15037035c040d5ba26cc WHIRLPOOL cdc5a7d3f0013ac99eb014d67a8c81ea46ea973b622f295651a06d649f956d031b35d1feb0867472b50bf111bceb62d12076ede6641691e026b61112b7d80d57
 MISC metadata.xml 339 SHA256 d82004a55dd7c03fbb548e4af6bdfa81d884e3628b7413cd4387669001193a2c SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7 WHIRLPOOL f0c205f78ca65c5afc7d5dfaa82d21c68afb24575e03c6797de29874a35f96e44f498384c96430b5b352a4e740bc0e8637b8e8854306b2dab8a31214b53bc8d7
diff --git a/dev-python/rospkg/rospkg-1.1.2.ebuild b/dev-python/rospkg/rospkg-1.1.4.ebuild
index dff594067afb..dff594067afb 100644
--- a/dev-python/rospkg/rospkg-1.1.2.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.4.ebuild
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index 03c385dfcb3f..3841f0cf14ac 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,10 +1,12 @@
 DIST simplekv-0.10.0.tar.gz 16142 SHA256 61ea1b6deba90c459b2b886598a86af324f7182f90f9f9b85a02f6a017618915 SHA512 58cf95e963631d11f55fa654e3a536ea5ce3deb8f9abefc05c2eb192fd87cd7cc5ff54d17da3651289d4fe1b7e827f82a27ee77e62df87e7f0b5a39f4067389d WHIRLPOOL bb5f2dc027ca363f1501c5c25c04281d4001807aa5dcda359410e147a387650c06e416b58b008f6ffaf4f176086026a5ed93b1764753a5b5ff26a79c9e8ac4b2
 DIST simplekv-0.11.1.tar.gz 19286 SHA256 d7a34c7cca226c6f8545f10563b88519dc1be3581e5f56b5ebeb01a1343d42c6 SHA512 ad9fb57fea115ad9bdcfd1b2aba4ce1adb3c6b36f859527a311ec0f281e915db4c145d33217e6966b527a81e3f2912e63d5be9b9af0640adc77f3f519b1e1c66 WHIRLPOOL 655b6a33777e62906d40b1273fc688e9e737dae6685c0009e4efd85376d12079592c00f88775cc6f2b7a89b1ed20da049e8b1e166ba918a8b282824b87d545af
 DIST simplekv-0.11.2.tar.gz 19325 SHA256 d1a62057e3184bfdde71271c22b714659bbf69164ec72fb3ba10d5a02438ff88 SHA512 73846870068e260bf44a716805e89184e68a7d348b3b3e47b4f6ac46e541188bffb6e37485cfe82a2b5f4eb0fc61391042d82a709cc25ce9b16853ebe9a4ae95 WHIRLPOOL 60d626174937976c20302ec8e7ea2c50fdc065da92e86c7f8fc9a9fe7f6f5f7b28c3db35688f488545ad7e685d4ddb21453c5d6bb1805d2eccb28b31ca8e4a00
+DIST simplekv-0.11.3.tar.gz 19317 SHA256 1dca8769c86029c643b1746ac904de8c0d5d97b5e22e7154e12f9ce0f332d5e8 SHA512 db37649a5ccc6b105280b1cc291bf2933eb7ad9d2c2c09add61cfa3f1e064e279228f916c0106a0c8673a610d4476c46f2b5eb80a6c52a1b54474734058d9ac2 WHIRLPOOL 480338368aa16215bd5be4debedc608d7b2e0270d14feed0e3d9abc52023cfb9c9b64fea86fef41506a90ef42ddce8916aafb51fc4f8304b23d5d58254079894
 DIST simplekv-0.9.2.tar.gz 13750 SHA256 448608199a9f76a25529005b5a28a4e548afd623e2b7109563b9ebe6ef4f3aac SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045 WHIRLPOOL 40f62efaba344aed99b3e6bae80eb22021a93958654a2fe2d881ece808a93f830923fbd2f00d96adb46442d6bcf3c66a71fc805a49f46e331db10df24c1b2621
 EBUILD simplekv-0.10.0.ebuild 462 SHA256 1488f15e98e31d10c950865b1528fcade0a16801ad7dbcafbec625a7f82c3df6 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d WHIRLPOOL 1e4ef00503fcb0380796288be5462072f966bbc0f8d2ffbf2791b81d29d83fc32d3d2b7731c09abf45bb457905c5cec714a611d4e784f306f697786bef51687e
 EBUILD simplekv-0.11.1.ebuild 462 SHA256 1488f15e98e31d10c950865b1528fcade0a16801ad7dbcafbec625a7f82c3df6 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d WHIRLPOOL 1e4ef00503fcb0380796288be5462072f966bbc0f8d2ffbf2791b81d29d83fc32d3d2b7731c09abf45bb457905c5cec714a611d4e784f306f697786bef51687e
 EBUILD simplekv-0.11.2.ebuild 462 SHA256 1488f15e98e31d10c950865b1528fcade0a16801ad7dbcafbec625a7f82c3df6 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d WHIRLPOOL 1e4ef00503fcb0380796288be5462072f966bbc0f8d2ffbf2791b81d29d83fc32d3d2b7731c09abf45bb457905c5cec714a611d4e784f306f697786bef51687e
+EBUILD simplekv-0.11.3.ebuild 462 SHA256 1488f15e98e31d10c950865b1528fcade0a16801ad7dbcafbec625a7f82c3df6 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d WHIRLPOOL 1e4ef00503fcb0380796288be5462072f966bbc0f8d2ffbf2791b81d29d83fc32d3d2b7731c09abf45bb457905c5cec714a611d4e784f306f697786bef51687e
 EBUILD simplekv-0.9.2.ebuild 447 SHA256 db6040799a62ad137a20ebd02856fa9f9e7681f0831eea7c6501de27f13487a6 SHA512 348c87cc0280d4877f7d08c21a0db437996668a7392cc5c91ff9f2a9c9c0ad0bca2afbb5b9cb2734349cc29f49361f9039796e44fb32023ab97a536cffffea8c WHIRLPOOL 3a73f6633d068fcf8d4a78b462809c3a655c2d9e705a0e7a3ee6d16f5fb09eff37b6ed8e7d5d2f2d38c2888c85694477eadc5367c646ee161f13535efe542f62
 MISC ChangeLog 2662 SHA256 cc927f74ee4be9dec5c1414e629f08752c4f86d574fdb5594c0e7ed177fe6dee SHA512 cfa6090cfa812136c7a8f4d82d430940707e6b389ffca99b2bc43c7bbc434506ed81bab6916db548d836fe37889e71db966ffc2748a3dc5dd6b4697e89fabce4 WHIRLPOOL f0cc4cc9f50bec5efa95122a0d0b490b9b30ba5b7d6d1d7bde6a99ce6fac3388181e465c2245bd4b2b1d7b7b8bbd40db401e83cadd611f202f87e2a07730ae3d
 MISC ChangeLog-2015 783 SHA256 ce14efeab9ee74a7b10a60855e9d02209a3db3b1c00af88e176705e541a13dae SHA512 0b2e6c0948c1fa3fbcf7d19e1bb784fde1595000125d50c32107ebf6b6b09a60c728be8621e1a0e54c4a05b23a03efa12d66b573fbc964a6361ffe21182aee92 WHIRLPOOL 4f57a866e37c8560304d7dfd05ca9c986fbb7b51f6e79e0f14c7f7e5c14e3dcbea335b63ca691d361a2c3cb98b307cdb0220979189d9ca4c77efbb2c0078dfbf
diff --git a/dev-python/simplekv/simplekv-0.11.3.ebuild b/dev-python/simplekv/simplekv-0.11.3.ebuild
new file mode 100644
index 000000000000..8f596d13dff9
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.11.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index d43a9510c7d7..14331ed71053 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,4 +1,4 @@
 DIST uvloop-0.8.1.tar.gz 1719488 SHA256 923b6e4982aea14a23565e6e62335a691b7a939bcc6802fbafa2a146ee3e8ac3 SHA512 45dba019a0dacaae6c2a732c3f321402c19c945b0d9fa35b9cae28f888a54c7d4b322b450c55a6cf21c1aac01dc49b90eccdffbf4cb8c812a5ec8b9e805e01e4 WHIRLPOOL 3f5352ceab17f487278827278a85885cd6c075781411b7e38e11914af3d63aa0e09fdd6e65cea30baa80d236405f0ead9fc84b3a050012f2e2cad1ce56ca3b39
-EBUILD uvloop-0.8.1.ebuild 1018 SHA256 9d71a62b42b3336af2338705836c36fdb6bb1b6a4dd674161980c9637d398b50 SHA512 d038074150f7157231ee53c038bb9d0e670ec3d2e5a2d9991b73510ea66b37c348d5922a18d5550b1a647579da7a772cdd581d46a02511a6617b2017a657ab93 WHIRLPOOL 93a46fef5a6de2a3c642491ed2c763054e08a9f643c4523334feada900269f70db1532d8e082d022ebb38794b068a338b9579f7dae553a3f4288ccd2362f83f4
+EBUILD uvloop-0.8.1.ebuild 1011 SHA256 03a61062b9bc5a4babd49eaae6627d7e55dfcd0965e1835faf9188b611d53933 SHA512 49e5aefbf9e4084e00a941ed316fe86372ce98ae02ec7c1c09e8d808e9a30e9f84d316bbbfdf8f670dcc3d04a042ca0522d65ab44bd67f6f5e23f3663a227947 WHIRLPOOL 8f665b05a614bc8e7442fc778aa0f62193840693d0ece184900f91a138759296204b4638ec4e47eb750878b0d1f007741a5f1c3bdd50a3a2a006dffd506da8e6
 MISC ChangeLog 1250 SHA256 882ca485e7cfe774e3048415aadde04e5dc00405d759194042f5517e31adf934 SHA512 a0c17b8fd9f774c563eb0abe4d9a49a8e87572628d71700d32f282b992ea883a10daa299267eb55249e76941466a45098bd4fe97bd68d36ff0a6e5ae084349f3 WHIRLPOOL 8d4b5c829899a61c5766abc81bcc0f83efabc829ab1cb06c9376a7ad14a832e3436eed1a9b3e36397a84d0f700bb00b55243ac2952e001a2a5aa67c8dff5303d
-MISC metadata.xml 676 SHA256 8b3fc21c719befbd80085ccb8e1e822b158626ed82015f48b1def525ff8ebfc9 SHA512 31c3dd1bf4aa7f60ea9771164172dead405c5d34e2ba3de52d43f1ab32df150a873cd28d972e4fb1c5b45854b59ccdf51ad27e90d6b5caa99717b846a473975c WHIRLPOOL a74ed3c9e03e8231bd5c7e9829f031667f78a11f741c4c8cde7334f15d3ae3deebd213610d58c39dff130dc6d6612bb167ffed24975171a079716344d7046451
+MISC metadata.xml 700 SHA256 eeca8fc13c7fcc9d5e13ff4b7c1ab7d31c3b77166a182fb2d73500922f8d5e6a SHA512 c4fd3a1a846bdd4e30272fb923a69da10c97a6cf41a26c255c29412ce0d49da2bb962fb0232c55a98721217de882435260ce4f658bc38b7474d19264eea9ab6d WHIRLPOOL bef7ba2842fec929937801e347daf6be28c35548088c9eec7536ce33482d1d35c858e6319f399fa93b4c9362e7e67ab8c22aacd25d97aabcd12427d5dda9b3a9
diff --git a/dev-python/uvloop/metadata.xml b/dev-python/uvloop/metadata.xml
index d7bbdfbdabf2..5b546cf7d7a5 100644
--- a/dev-python/uvloop/metadata.xml
+++ b/dev-python/uvloop/metadata.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>elvis@magic.io</email>
-		<name>Elvis Pranskevichus</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>uvloop is a fast, drop-in replacement of the built-in asyncio event loop. uvloop is implemented in Cython and uses libuv under the hood.</longdescription>
-	<upstream>
-      <remote-id type="pypi">uvloop</remote-id>
-      <remote-id type="github">MagicStack/uvloop</remote-id>
-    </upstream>
+  <maintainer type="person">
+    <email>elvis@magic.io</email>
+    <name>Elvis Pranskevichus</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    uvloop is a fast, drop-in replacement of the built-in asyncio
+    event loop. uvloop is implemented in Cython and uses libuv under
+    the hood.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">uvloop</remote-id>
+    <remote-id type="github">MagicStack/uvloop</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/uvloop/uvloop-0.8.1.ebuild b/dev-python/uvloop/uvloop-0.8.1.ebuild
index fd91fc222426..84f83ea36651 100644
--- a/dev-python/uvloop/uvloop-0.8.1.ebuild
+++ b/dev-python/uvloop/uvloop-0.8.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
index fb1d0715aeb5..6557ca4d7968 100644
--- a/dev-ros/openni2_launch/Manifest
+++ b/dev-ros/openni2_launch/Manifest
@@ -1,5 +1,7 @@
 DIST openni2_launch-0.2.2.tar.gz 3754 SHA256 a8b7b28b82bb5d58accb96e4710e257547324a1f9131cf425d792b6f20535810 SHA512 1bdbccb6b29f1f3a1909faf959e0a2faca48c8229f5c7469b2b279d962f161940ef0d5b879d1c915d725e8c8cab3173c76aabe67bdacce970727cdfd6cb4073e WHIRLPOOL 56b862f859459543140947c8c0d43972c8c709dbb1f72aa2e8b6aa1878c64dcb149385d56c9c5c2b6b92e4422f34d0d2e88b5d81aabbaba74c5ed0729dc0e034
+DIST openni2_launch-0.2.3.tar.gz 4565 SHA256 8b43a4b15f334f07efbf0fffdfdacc4387e08ef69b7df71b5165fb6a271e5226 SHA512 5f76201fceaa07edacc06e7732bb12cc37ccd4e04da20815abab3226fa7fdac763df2a401c4f1682dcabfa48bc337ee94ba6a5b3a14869a8348efa1c8624752d WHIRLPOOL 6a41290f39cb60e03e2ba9ab4e77f0622da1518f2eb21fe91844ad63dfb48ca0e931457e16dbf10ae311c783987f7462406a144b372dc85c9f6da83cc63e67f8
 EBUILD openni2_launch-0.2.2.ebuild 485 SHA256 d74f58f36097d9b06e38edfee5308659b602ed44b6309638d3599aa1802dbbb7 SHA512 c70210181690c747de4668b77b9eede1b555b4ff606d18838a0ccf00a19e2e0a367297d78816135bf43f20923bbdcb58783f1a171b69bc43ef777e33f136559e WHIRLPOOL 5d5135acc9a8f4e75af2fa7b419aee8656bb2ae7226881d7580b6a74d6df4f9a64a036bea48cee92ad4c3f0c9912ccb701e954a15d48748bfe832ed910da5567
+EBUILD openni2_launch-0.2.3.ebuild 485 SHA256 10316f931e7232cc09fd519031d3d49bfbe6e1f5874ecfae05037b5b5d1ee473 SHA512 3b082cb32748439b799dc6baa20cabdba594f90a62f59ec9131f6761b026bcdcccfb671c1daf0d259f53d7d5a6ea688ef874d21b4c7d5797a94869a2b0f53d16 WHIRLPOOL a293fa8be8a916cfae9273873ee3f4ef689db4a5a5208f0198a33874df469946d600c80d82fac591c0f9ecb32c4feeebff37ed2661513a2d4410bd4989280fbb
 EBUILD openni2_launch-9999.ebuild 485 SHA256 d74f58f36097d9b06e38edfee5308659b602ed44b6309638d3599aa1802dbbb7 SHA512 c70210181690c747de4668b77b9eede1b555b4ff606d18838a0ccf00a19e2e0a367297d78816135bf43f20923bbdcb58783f1a171b69bc43ef777e33f136559e WHIRLPOOL 5d5135acc9a8f4e75af2fa7b419aee8656bb2ae7226881d7580b6a74d6df4f9a64a036bea48cee92ad4c3f0c9912ccb701e954a15d48748bfe832ed910da5567
 MISC ChangeLog 1335 SHA256 aae73dab7fab5bc18aee57a387478d97054fc54c348c76b7b993db369113dbfd SHA512 141f1090c12555a4a86a37a2c1ee68d637e0cda2941085f3dd80d8cfddc6bb9144e5ff191e51d72bb442de11059b3eeab34d0faafd54f72d1ea15246ca66d36e WHIRLPOOL ef363af730653c5d1d6b395241909cea63ace66b67905b5b78df31799d59fd8559d1672a6437b43bdf126527a7a9a91780b7dd1a8c2a15a696fc1ae718c33432
 MISC metadata.xml 340 SHA256 7fa24fa5671ca00d0ad6a83ab37032397824069b7a351d6dc43efbd483f9ff98 SHA512 5fdcf4ac865e7456967ef7e20b7694a7dd04eed9658eab3dbaa1754538a843e499ca1671189d444730b47ff85267d643518c6f1faa708f374fabfeb4d7af7caa WHIRLPOOL c8b82a87f7a2364e27f2dcf0410559005526d5eba1856515884c2c38b3c8c30b196deec8ebc8d49f68795993c8fd261b8aea71802cc1b76f9c9812f9dbacd50c
diff --git a/dev-ros/openni2_launch/openni2_launch-0.2.3.ebuild b/dev-ros/openni2_launch/openni2_launch-0.2.3.ebuild
new file mode 100644
index 000000000000..51ec73aa716e
--- /dev/null
+++ b/dev-ros/openni2_launch/openni2_launch-0.2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rgbd_launch
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/openni2_camera
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospack/Manifest b/dev-ros/rospack/Manifest
index c2a4079b5db6..ad3d546107f3 100644
--- a/dev-ros/rospack/Manifest
+++ b/dev-ros/rospack/Manifest
@@ -1,7 +1,9 @@
 AUX boost165.patch 10361 SHA256 1eeddbbbc2b525d11a712b5e80e53eec6436b2a60719439bcea14291258a9cb2 SHA512 c486badc23c76a96ed84a7dba0b2f90d4d1ef98a699229efb7c94821a20fc3f32345632f4f5a097dee60b4aace85affbb0e5fe11e3df7a00531138c73340ab10 WHIRLPOOL 75d0d0d2a0d2769c7089ab89c65dd812f696ddfcf8d1d482e252a1ff5a991643afb76e422647f9af97c4c0c7c83708de0d91f7846988d636feb9a4fe75a6a12b
 AUX gentoo.patch 576 SHA256 ab951bbaab55a9997e276b79831a3d4b77f09420d6dfd009ad14f7796d7699a2 SHA512 85bc49da821ff4a31d6cff838f2ff006625f0f5041c2bfa8f742c92173c48fc6d2a4601e370058478afe66e1b0aa5e237964b950554c40710f9f411e1e04bbad WHIRLPOOL 52dcc69ac2159bb7c6b2acfc757d1398da0b8ae44f857d710cd39363a1af7a2acb715e0e4d890425b06418e377d9888615172a5fb274623caa89162fc268d945
 DIST rospack-2.4.2.tar.gz 71938 SHA256 5ef87c11d492759608f12d03113bd538cdb61bbc3876ebd91be078c9b56241f7 SHA512 f5569ba19abcb41b888d98c272bacca19d7be68528550154003e8394bd431aa381858f0a4440f708b5d9ac1814fa0e093a7ba34c3c192bcedb2de8040f364605 WHIRLPOOL 5e747bc9904fdbf1d5c33af46d912224605fb755aa2c5339b9efaabdc8c2ef5b4e5ab2a56714d43ca45030a83e36429a31a92b6bd79d0c20a584019e50b00189
+DIST rospack-2.4.3.tar.gz 72327 SHA256 e7434df39a6c4d83ac4613ef24ebe699d5b470ce64d1f1fe0fcdc8b9fc9e54d1 SHA512 4396ef24d0bd826235d7ac0da8a0b502557ecc0086eadcda96d44779ed5d8134e9a53cd861ee135a4b1da53074bdcf906dc4cb6ea0c36798326c17788ee1e2be WHIRLPOOL 2ba441b8b5f65fa1e9cf0c5977292745a785995269b6b177e2703cf1ca77aa918a06f1e06edd8f844f30d0f827bc6c780af4d61593741cf743e2987f2ece30f7
 EBUILD rospack-2.4.2.ebuild 594 SHA256 90dbdf68ec53b650acef95023d1cf793f24142112d747e2bbe208e1fea99f5f4 SHA512 be26b5072a612ca6e40bb8d63969aed639c2923279a4970aba2270a92f5940e5bbb01a533ae0aa7a13fff91d0b426bbb5be5510c4358416284ce0a77af499fe8 WHIRLPOOL fa21aee927616a6ca407ba1543cf2a09a79f1eb057ad28bd3fc3884accc6696f93a3d89db9ba52f2fba2422a04caaa4d2d7cbdc9e7f6314a29a22d45a92c0fb3
+EBUILD rospack-2.4.3.ebuild 564 SHA256 7d67ddb6c658542fae95860c0d2e93aa8ce655374372697f6402078e32391224 SHA512 9814190d49aa220554bf3a440e781642eeefbb5f1b5126c1b74e0fbe98ddd946327f38973fe7215b27b0de6d5a799af221940659c51294fd28906423e3be19be WHIRLPOOL 1c53be8422d58d8c0e1301244cacccd581dda0e76f210582639b70a744b3b0a3a6a363daad254724e4358af2d4c0b07573b1ac6fe760603162e3710dd0eadf02
 EBUILD rospack-9999.ebuild 564 SHA256 7d67ddb6c658542fae95860c0d2e93aa8ce655374372697f6402078e32391224 SHA512 9814190d49aa220554bf3a440e781642eeefbb5f1b5126c1b74e0fbe98ddd946327f38973fe7215b27b0de6d5a799af221940659c51294fd28906423e3be19be WHIRLPOOL 1c53be8422d58d8c0e1301244cacccd581dda0e76f210582639b70a744b3b0a3a6a363daad254724e4358af2d4c0b07573b1ac6fe760603162e3710dd0eadf02
 MISC ChangeLog 2586 SHA256 498f2ff44d0d42c5315f2f5c0014f7d2c97ae8bd454c7d89e6204eb73e4e2354 SHA512 2e1a0de13ff7bfc46659fb7675b747e77992339bd565c1b43db456bab9aacf0ad541dbf0770ef2f4eaa92ccec121accaeb22adfeed117c8d1dd6d741a91c1026 WHIRLPOOL 39b562b629c6757efb99f27e9d656c016d70e2cca7a371ee2f130b177409b2fd47218477425211cfd02b2cb7675aaaffef8c62b2da42ca3f416de7eff11846a4
 MISC metadata.xml 325 SHA256 4dde5a05e61c886d9a1363ccdbe9684143a6c44cf7ad9f903346c53ee23adfe7 SHA512 2718fee8c06627957b95d0e99b517d2dcb2428279925a22e6cbbab1e56ea6d25da57c7143d316e7406419b7d2ff75187950957a705348adfb4008413923dda5c WHIRLPOOL b2f122a22500fab4eaa11f970c37976744989c232845fe50648e00f58316c84b98ab9ca09b391b5da05542db5c5a631bc3bca0ab9725de9bcb45db75fc7c0f8f
diff --git a/dev-ros/rospack/rospack-2.4.3.ebuild b/dev-ros/rospack/rospack-2.4.3.ebuild
new file mode 100644
index 000000000000..18b9f633ad3f
--- /dev/null
+++ b/dev-ros/rospack/rospack-2.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/rospack"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/tinyxml2:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	>=dev-ros/cmake_modules-0.4.1
+	test? (
+		dev-cpp/gtest
+		dev-python/nose
+	)"
+
+PATCHES=(
+	"${FILESDIR}/gentoo.patch"
+)
diff --git a/dev-ros/rqt_bag/Manifest b/dev-ros/rqt_bag/Manifest
index 267884c0ccca..b1b72652b26e 100644
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@@ -1,7 +1,5 @@
-DIST rqt_bag-0.4.8.tar.gz 50064 SHA256 0936b25acecb3906d88493bb6f8056ac7bbb42eb4dbb1de7a63dcdbfc71d6d47 SHA512 f9eae9c0cfe9caea40c3bf785dc320ed7642ce566bef67637adaba55c6a25a470c08f85e8a0af02d17e73bdf80daeec8a1a7ba7b1b35c847268e83d0af55e173 WHIRLPOOL 00fd1593fa06d6397ef43d517ee173e005c0d0eb9d35c2f0447882d83c89a026c48290b7e1f521759565de867c7886f5d6aa2a06cc075415f94e10e60b51e8e9
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 SHA256 83153ad89c67551c3fb4f36cad7f056d90c559958ac80203e2aa4605beb49a7f SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7 WHIRLPOOL b002f836ee0f5ea213ec31be8e59910c7c3c9508301389309e60eeb7dd35989ae4e4dfa5fa9ee592371f05e6cd842a6e3b0ccd6ac4ed7a9efd8d60c36b1e6d65
-EBUILD rqt_bag-0.4.7.ebuild 651 SHA256 9b6a72dc9c6dd8535137830d055106978c22804ea093255310bd4ecb31838ece SHA512 8b392dab694235201d412a8b5b23e21d4c0e9b6180d178bfd63116c362895fbf0a55501270aa44832f53cfe42dbd39f703fa479ba6edda1101839ddf55e2168f WHIRLPOOL fb2f62fd162e58440fa92357f73a1147d2bc563f1b5f956f2c5459ad81a7184679077cb4eb7da09163b01cffed0411726e807ed4da03804b2f9bf864dab4227b
-EBUILD rqt_bag-0.4.8.ebuild 640 SHA256 78e799cddaee4438cc44a524c3c6b87671038fd66c8647b79b6d8866c50437a2 SHA512 4a9f521b12f0fc9ae808c73a8041b6667be01836eb3b9a1c2ca7e198e473928d5fa99bc7ee306fb137b64aa321083289fa7d5b0474a8428d86679b41e116ae05 WHIRLPOOL abbaf03b18f33715554b1eebfd5d12658b4b1f54c6e7432b3d8cda7b0917d4784196458bb215c117effd8f64c8376eb1dadcfb322da35ac589abc490bc6a60e6
+DIST rqt_bag-0.4.9.tar.gz 50135 SHA256 a46a7ecacd7117a5b1e94558c2480401873c9b9f31555282b28bd92ce6646596 SHA512 1734db3cb7ed34dcddadaf875c13ac97c7b5a86e8028e744d55e5d7bba13a6a4fbe3db628975c847d100332642410d2eb84c2d47cc439b367d9be94c205aabdb WHIRLPOOL a546f6fac051f81ed7eba32511d83189566353aacb565f99a427cf65c221b69eee14751d04962ec481ecdb720d7760015ea17011707a5f73edebb6a3943e321f
+EBUILD rqt_bag-0.4.9.ebuild 640 SHA256 78e799cddaee4438cc44a524c3c6b87671038fd66c8647b79b6d8866c50437a2 SHA512 4a9f521b12f0fc9ae808c73a8041b6667be01836eb3b9a1c2ca7e198e473928d5fa99bc7ee306fb137b64aa321083289fa7d5b0474a8428d86679b41e116ae05 WHIRLPOOL abbaf03b18f33715554b1eebfd5d12658b4b1f54c6e7432b3d8cda7b0917d4784196458bb215c117effd8f64c8376eb1dadcfb322da35ac589abc490bc6a60e6
 EBUILD rqt_bag-9999.ebuild 640 SHA256 78e799cddaee4438cc44a524c3c6b87671038fd66c8647b79b6d8866c50437a2 SHA512 4a9f521b12f0fc9ae808c73a8041b6667be01836eb3b9a1c2ca7e198e473928d5fa99bc7ee306fb137b64aa321083289fa7d5b0474a8428d86679b41e116ae05 WHIRLPOOL abbaf03b18f33715554b1eebfd5d12658b4b1f54c6e7432b3d8cda7b0917d4784196458bb215c117effd8f64c8376eb1dadcfb322da35ac589abc490bc6a60e6
 MISC ChangeLog 2127 SHA256 a86440e36bf9f358f0c7f4d173165c1eaba8aad0118fc438bd0f6eae99f88b41 SHA512 aae920fb975b1a1f495668e0e68150286fac161dadc7ae132209da7a7b8599601967f79b439b3b796a1bb36bbf488aac868ebfe7e928e5f61364ff7bc0c74b91 WHIRLPOOL 83164e1f50f2c82bcf66d5d47a283c8c0ebda8205f7f425f0550e58138da983229e3c41e76f811284a89d284c3885b4c8cb4292f7d823fa6744e0032f7941080
 MISC metadata.xml 339 SHA256 4bd1a4b8526937b95eaa7a21c7659d74c67a5c3e3e6bf22bb175725fcf419447 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16 WHIRLPOOL a1983bd4be871a516cf82d04f7c0704cc966c32551570bcd2dd7a035ff1ef448569400b9de2c820b0c07aab90d8e70781cedefe0aede0af0d3fccd677a87c18e
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.7.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.7.ebuild
deleted file mode 100644
index adf5d529a2ff..000000000000
--- a/dev-ros/rqt_bag/rqt_bag-0.4.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.8.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.9.ebuild
index 9131e47b8514..9131e47b8514 100644
--- a/dev-ros/rqt_bag/rqt_bag-0.4.8.ebuild
+++ b/dev-ros/rqt_bag/rqt_bag-0.4.9.ebuild
diff --git a/dev-ros/rqt_bag_plugins/Manifest b/dev-ros/rqt_bag_plugins/Manifest
index 4877f2920600..a25429691517 100644
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@@ -1,7 +1,5 @@
-DIST rqt_bag-0.4.8.tar.gz 50064 SHA256 0936b25acecb3906d88493bb6f8056ac7bbb42eb4dbb1de7a63dcdbfc71d6d47 SHA512 f9eae9c0cfe9caea40c3bf785dc320ed7642ce566bef67637adaba55c6a25a470c08f85e8a0af02d17e73bdf80daeec8a1a7ba7b1b35c847268e83d0af55e173 WHIRLPOOL 00fd1593fa06d6397ef43d517ee173e005c0d0eb9d35c2f0447882d83c89a026c48290b7e1f521759565de867c7886f5d6aa2a06cc075415f94e10e60b51e8e9
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 SHA256 83153ad89c67551c3fb4f36cad7f056d90c559958ac80203e2aa4605beb49a7f SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7 WHIRLPOOL b002f836ee0f5ea213ec31be8e59910c7c3c9508301389309e60eeb7dd35989ae4e4dfa5fa9ee592371f05e6cd842a6e3b0ccd6ac4ed7a9efd8d60c36b1e6d65
-EBUILD rqt_bag_plugins-0.4.7.ebuild 851 SHA256 3dbd9311555fa76b9842c3966f5423a30196999b6b6e2508bbc88f73f520ee65 SHA512 fceacc61c4e8cabc2964b7963440530a530ff0d4c06ac45cd142c1dc6188fbb805a58b20efbbc2c01fb7dce6cc426c9d8f37d13b6d4c9a959253da6dae5184a3 WHIRLPOOL 4ad3e9d514c75173a19ccba7513c434315861241e7fd9135097023e64a9ac5a87fee3fb68185d8896ac4909cb9a7a2bee4611d1ba57162274fc2f7c54992ceea
-EBUILD rqt_bag_plugins-0.4.8.ebuild 840 SHA256 8591fd210a1ee3d6a3b0eaf75e3ab169a939569205d408e4d63ee98528f57be1 SHA512 57bc4cf92d4875605b96db4a12829488d75aea356f304a715ac3c9047c7d0367c97451fb7f53c8c9c1bbc389daaae99fa50242010c413447127289ddee8b9588 WHIRLPOOL af1d63799f5eb3e34d423c4452166c346bd31e9ec036f14525aceecd65d65d4fe3d7114324e3992a532ea0fe33ff279c07246b7e4640b5e9542c712f467cbbe9
+DIST rqt_bag-0.4.9.tar.gz 50135 SHA256 a46a7ecacd7117a5b1e94558c2480401873c9b9f31555282b28bd92ce6646596 SHA512 1734db3cb7ed34dcddadaf875c13ac97c7b5a86e8028e744d55e5d7bba13a6a4fbe3db628975c847d100332642410d2eb84c2d47cc439b367d9be94c205aabdb WHIRLPOOL a546f6fac051f81ed7eba32511d83189566353aacb565f99a427cf65c221b69eee14751d04962ec481ecdb720d7760015ea17011707a5f73edebb6a3943e321f
+EBUILD rqt_bag_plugins-0.4.9.ebuild 840 SHA256 8591fd210a1ee3d6a3b0eaf75e3ab169a939569205d408e4d63ee98528f57be1 SHA512 57bc4cf92d4875605b96db4a12829488d75aea356f304a715ac3c9047c7d0367c97451fb7f53c8c9c1bbc389daaae99fa50242010c413447127289ddee8b9588 WHIRLPOOL af1d63799f5eb3e34d423c4452166c346bd31e9ec036f14525aceecd65d65d4fe3d7114324e3992a532ea0fe33ff279c07246b7e4640b5e9542c712f467cbbe9
 EBUILD rqt_bag_plugins-9999.ebuild 840 SHA256 8591fd210a1ee3d6a3b0eaf75e3ab169a939569205d408e4d63ee98528f57be1 SHA512 57bc4cf92d4875605b96db4a12829488d75aea356f304a715ac3c9047c7d0367c97451fb7f53c8c9c1bbc389daaae99fa50242010c413447127289ddee8b9588 WHIRLPOOL af1d63799f5eb3e34d423c4452166c346bd31e9ec036f14525aceecd65d65d4fe3d7114324e3992a532ea0fe33ff279c07246b7e4640b5e9542c712f467cbbe9
 MISC ChangeLog 2482 SHA256 61d58fb62de36c909b8f39503dde59a022e0e838295736dc88cb9000f7a0ffd7 SHA512 461a2e78ec13aa9a5461a1a76a74dc7f4eacba89ca9deea66512fcfbd1a893fda9b2acb31af2414d8eb45356e7a6a6188dfeb0df635e5653d2f6c159bc6c5023 WHIRLPOOL 6e17e7926ab5de14df769515dc6c8a9ac178a8c16b60352aba6f03303b309f818323a187f27709b5a42dda1d32d3f4c769a041ec7bffd80da1288f6eed8b1156
 MISC metadata.xml 339 SHA256 4bd1a4b8526937b95eaa7a21c7659d74c67a5c3e3e6bf22bb175725fcf419447 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16 WHIRLPOOL a1983bd4be871a516cf82d04f7c0704cc966c32551570bcd2dd7a035ff1ef448569400b9de2c820b0c07aab90d8e70781cedefe0aede0af0d3fccd677a87c18e
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.7.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.7.ebuild
deleted file mode 100644
index ced2f0e7d420..000000000000
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.8.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.9.ebuild
index 48735760362d..48735760362d 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.8.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.9.ebuild
diff --git a/dev-ros/rqt_pose_view/Manifest b/dev-ros/rqt_pose_view/Manifest
index aabe42ba735c..80874bd290c5 100644
--- a/dev-ros/rqt_pose_view/Manifest
+++ b/dev-ros/rqt_pose_view/Manifest
@@ -1,7 +1,5 @@
-DIST rqt_pose_view-0.5.7.tar.gz 8217 SHA256 857191b2a53e9ad688d8757d1ca44b5e7c417f64f13141f4878a43f6a81a217f SHA512 34103deaf3fadc505c17e75f5ccc11acf93c1752a2ab76d2552e842b6072cce9c2cd73c5a7520a38f57e3a053a8ecfa5f29f9317c128275663d2435d0a660007 WHIRLPOOL bbeec4d042358ece77eb9d94c2783e598b3126c83b74e4707674c6c26f71f3d66677fd2f411f80c942aeea8f7837b027e357c84bcd7200bed0779a312b51292d
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 SHA256 d5f1b509df54b253d3b2952560e8dc5e764c3259b0e9dcff08541e27ac9fed71 SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51 WHIRLPOOL a90882b1e762f5e53b7ce7ff92695ba8eb63242b53304a08c928f2667ceb206cfda72e64d81b73d1d951e6b92cb5f16327528846f6b54e28b2acaf898424a664
-EBUILD rqt_pose_view-0.5.6.ebuild 775 SHA256 b46a218e39965bb13dbc2e8c279512aa160c981df43eb2532659787f30b09198 SHA512 9cc0b0aaae4a26d02a17b8d97e79af5d240ac7ba4f673f562fd9d1a2e8b5570941efaf75a11ee0b639d350efc349f8a6ecfb6a30db0751bbc50969db011b26a6 WHIRLPOOL 7ff750bb5fe1f0d841f0552f5d06649b19ae2eccd49652a8e043cd49d6aded5062e92805eb469d9403c7d24aaf77d588cb1d9cc78ea362d94a1d883cd9cbf47c
-EBUILD rqt_pose_view-0.5.7.ebuild 754 SHA256 a5d44c9befd0540e2f7a568ab26c6e5c8eeda21fe74cde09d334a8ba80f3b238 SHA512 f3729c92e30107e8574e10b6c02720221b2f30646bf1ef367b8a480320df849cb17bf3f72052ebe0719167eb5d17e5a38cea5d3ffb9eaf3c351e3a9d4290759b WHIRLPOOL 4949d6d7cbac378b5e221b1112b1dd92dedf97d882c049874f0b3dae0ec835473d9f7a3fd951f640d6ddb1cbfd85148778f8daefb48932cc102890b8ced7d70d
+DIST rqt_pose_view-0.5.8.tar.gz 8299 SHA256 72e82d3faf086ab5409a051be7e0d56cd9aac2446f56e0eb2c4895d965e06793 SHA512 a3a53989c4fe73e6dfebea7e2f01fcd807faa0f011f452208ddb3df1be84939e7b1e26430a098f8b3a6554b781c9b0bf962ed0d115932dae5bc144225926f50b WHIRLPOOL 13109e8c31b311ecf8da2d2080e73bd71da94d7d1035ea5c590798e740a183c37f396e8772920031f399de39e8979de0b5278651eec963c6e44d72a6f13116a1
+EBUILD rqt_pose_view-0.5.8.ebuild 754 SHA256 a5d44c9befd0540e2f7a568ab26c6e5c8eeda21fe74cde09d334a8ba80f3b238 SHA512 f3729c92e30107e8574e10b6c02720221b2f30646bf1ef367b8a480320df849cb17bf3f72052ebe0719167eb5d17e5a38cea5d3ffb9eaf3c351e3a9d4290759b WHIRLPOOL 4949d6d7cbac378b5e221b1112b1dd92dedf97d882c049874f0b3dae0ec835473d9f7a3fd951f640d6ddb1cbfd85148778f8daefb48932cc102890b8ced7d70d
 EBUILD rqt_pose_view-9999.ebuild 754 SHA256 a5d44c9befd0540e2f7a568ab26c6e5c8eeda21fe74cde09d334a8ba80f3b238 SHA512 f3729c92e30107e8574e10b6c02720221b2f30646bf1ef367b8a480320df849cb17bf3f72052ebe0719167eb5d17e5a38cea5d3ffb9eaf3c351e3a9d4290759b WHIRLPOOL 4949d6d7cbac378b5e221b1112b1dd92dedf97d882c049874f0b3dae0ec835473d9f7a3fd951f640d6ddb1cbfd85148778f8daefb48932cc102890b8ced7d70d
 MISC ChangeLog 2222 SHA256 180ef1f7de55c66509599a27cf28830d248b4e855b0e133682cfa6fb8a9d7e89 SHA512 703de7d36d77aa1e08a19dbe115ccc5c595e77ee380bb1444689175589d2a6c5903c2630ad2b8b872c919864a5ecd48f1caf8a96ccdf2853a8f0a43d0eb6b3b9 WHIRLPOOL c1b786289b67beca18b2958cff4822989e518b9dbfcda5fdbe18b796d1a6fe9d03b11bed5bc340c01a1916a2d5afa05e5d76a92988bd819f6623a44c8ed10904
 MISC metadata.xml 345 SHA256 fd48a9f7aa85f02485e2d121b724c5e5c2b30e3915572cd940ae9b9fcdd0e48f SHA512 774daed773f2070d016eb616daa80e65f300c69ab1d436edf5aab5cc256f7e2ebdadf66a3c0fc5571ddb3dc496fd7353eed9dbf85cae48ae4f468dd4be95f22d WHIRLPOOL 9cac9c254a55e4708c19dd473a358d39b063728f11fc2a2ef61cf91af8b499f610e2c91ceec1bb8bc160604740de9e4e0dd5adaec498ea18ad37e84a31ed9161
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.6.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.6.ebuild
deleted file mode 100644
index 515ae61769ea..000000000000
--- a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing 3D poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.7.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.8.ebuild
index f4b93343f49c..f4b93343f49c 100644
--- a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.7.ebuild
+++ b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.8.ebuild
diff --git a/dev-ros/rqt_robot_steering/Manifest b/dev-ros/rqt_robot_steering/Manifest
index 5cc975a372e1..3b912269cf49 100644
--- a/dev-ros/rqt_robot_steering/Manifest
+++ b/dev-ros/rqt_robot_steering/Manifest
@@ -1,7 +1,5 @@
-DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 SHA256 d5f1b509df54b253d3b2952560e8dc5e764c3259b0e9dcff08541e27ac9fed71 SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51 WHIRLPOOL a90882b1e762f5e53b7ce7ff92695ba8eb63242b53304a08c928f2667ceb206cfda72e64d81b73d1d951e6b92cb5f16327528846f6b54e28b2acaf898424a664
-DIST rqt_robot_steering-0.5.7.tar.gz 6402 SHA256 950eae6588107633f33fb075dcf4a5a3ed0466401b281d075bd386f1c9bf2b39 SHA512 1819d5f26b98c35d2d3de39e4159ffd6b1d59dd3acbea589c1c72082a62f380bc0357578931bf2279b5ec4be100b7e439390f8b62d17bbf4abeabb8bf2afafd3 WHIRLPOOL 632d56861990dc3277f31c697e438541a90042af69198be1d122f831f3e26e3b6f42bacae22f28614b99b7bdaed56c313fecc1977bbcb77ed772b0928ae849f3
-EBUILD rqt_robot_steering-0.5.6.ebuild 604 SHA256 62cc09863ef25aca5cec177c1edf81f8f9e83c254463964b095c8da6a783f27d SHA512 d0582ac2b4db9f393a64b17b56fd73a60c01292233add2fca8a7532d0ad20d5677f7694874ad60f1e6a7a6613e3acc949a5d483d5d8e0e5222613c32677dad21 WHIRLPOOL e7efaab03f852ff7ef3bb96c045e0981e8b83ec1c5f53632f71e3854f38e3b10f706dbc5c12c3f7dbd6b5f45cde23ac1bbf1a92aa77d87a3fe394bc9e5205708
-EBUILD rqt_robot_steering-0.5.7.ebuild 588 SHA256 c07adbfab26fc2fdf4b94f6cd62759722a75862ff2c86dbe0604c5b1286a966d SHA512 b12ebcb3ed59f0f17cc63301f4057290e347dac256ea782de3038cbf36a7a88332a4b4c04e247c8e58a12550651717b5687c3b41fc4159d35698147307e98f2e WHIRLPOOL b304cc0bc8bb90e5e0a00906df77ab7c90b6cc14e88987272971b26d84c59ab6da9982d0ccd9adacee6c09c6a079198276b009f63e4e0ffbd3cafa9af985580a
+DIST rqt_robot_steering-0.5.8.tar.gz 6449 SHA256 553fa836ff8873169cd2bf6c61b151c99e8873be0c64df832d72d8c9029ba4f5 SHA512 25c7715c0fc4123249f7ae7489e34ba357c5c07827c687b88a59e30823cc9a111e82a7cfa6917253555607a84d69f45f6e2069b45bdac1d428c1fc920c8cb73d WHIRLPOOL b9f9f91626fcdb9e517bc908ea4244b2f0a671a976438b0ebc4a0d88ccdde61245966f6f2c23557875566b2f7cca2d64703c55b21ea4687eb9336ceb7c0554bb
+EBUILD rqt_robot_steering-0.5.8.ebuild 588 SHA256 c07adbfab26fc2fdf4b94f6cd62759722a75862ff2c86dbe0604c5b1286a966d SHA512 b12ebcb3ed59f0f17cc63301f4057290e347dac256ea782de3038cbf36a7a88332a4b4c04e247c8e58a12550651717b5687c3b41fc4159d35698147307e98f2e WHIRLPOOL b304cc0bc8bb90e5e0a00906df77ab7c90b6cc14e88987272971b26d84c59ab6da9982d0ccd9adacee6c09c6a079198276b009f63e4e0ffbd3cafa9af985580a
 EBUILD rqt_robot_steering-9999.ebuild 588 SHA256 c07adbfab26fc2fdf4b94f6cd62759722a75862ff2c86dbe0604c5b1286a966d SHA512 b12ebcb3ed59f0f17cc63301f4057290e347dac256ea782de3038cbf36a7a88332a4b4c04e247c8e58a12550651717b5687c3b41fc4159d35698147307e98f2e WHIRLPOOL b304cc0bc8bb90e5e0a00906df77ab7c90b6cc14e88987272971b26d84c59ab6da9982d0ccd9adacee6c09c6a079198276b009f63e4e0ffbd3cafa9af985580a
 MISC ChangeLog 2297 SHA256 d0d10849815717647d608bad8f7af419ea86d3bb3b755cae4a4f6191ef7a6fe0 SHA512 4f6c1a1027b0758489d319789446cd04d92953c86fd4f2c47ac4fa87ca7dd77e4ed3109e252a9e1c6761586c660cb3f00226f601226105f413c4d708b990af7a WHIRLPOOL cb2f03839438bb978f79436bf633a861ad6a88d37a138e8d6349b67977da003b40c02c5cc2ad9cdeb7966c8ff65b702da88b938b45f04c3c88f42150051abf6b
 MISC metadata.xml 350 SHA256 7b8e26ea3668e93105da1ad2e3859affd25f91bfa92c7f51b72c75816ed3b4ff SHA512 47e26558ff516f790cea41312c4d0ee293a86c437339026479985be2b6b7e6294d865aa895129d93f456cccb8d867886a7a1a9b190a15e9aeda4c5799bc5fa6f WHIRLPOOL 4fa94413b0ce0556f6bfddba129f9ef22d9c64ed478c9defcec05c8b1b76a28fb2c445abdb0814d8970d550e99364f5cd431014631e7fee43b1bb74a69bb48ec
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.6.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.6.ebuild
deleted file mode 100644
index c38c92c11c0c..000000000000
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for steering a robot using Twist messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.7.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.8.ebuild
index 4e1e8da7698f..4e1e8da7698f 100644
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.7.ebuild
+++ b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.8.ebuild
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
new file mode 100644
index 000000000000..4960a81475e1
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -0,0 +1,3 @@
+DIST elasticsearch-ruby-5.0.4.tar.gz 213565 SHA256 61151bcee155c6baebace1fb5d4091dc715af53251dc32dbca7d6fb0c9f5ecac SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217 WHIRLPOOL ebe23cdee9fdb56bc1c05fa86ca8dc8667d1ef36f3cc7cbd556cd3186dbfa9a3cdd5160a3a7a5e7464d69e264136beb3d9280107904f9f7f519b65adb2a4ae2b
+EBUILD elasticsearch-api-5.0.4.ebuild 1140 SHA256 5ab215a35b7d9dc05ce2568306ce6778d87c648e2b214f65fd2685330b837297 SHA512 83145115ca1c7965b25174d97d9605b87a5fcf028bde18d19ad42758f6834f3a15071bd8edc92b81ba3f16f5a0c971cb6dfd6034e5ad94117048c8e03d3da645 WHIRLPOOL b527e481b8ad6fa1f2f5f525cf9a36e45f5b12313e5febb880504e24ef45a5c0a57f8065ff0d9de5034625eacd766d248e7d3d7aa24162ab85d34a8a446fc5fd
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild
new file mode 100644
index 000000000000..d13733c73e3b
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/elasticsearch-api/metadata.xml b/dev-ruby/elasticsearch-api/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
new file mode 100644
index 000000000000..e0da7d212d9a
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -0,0 +1,3 @@
+DIST elasticsearch-ruby-5.0.4.tar.gz 213565 SHA256 61151bcee155c6baebace1fb5d4091dc715af53251dc32dbca7d6fb0c9f5ecac SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217 WHIRLPOOL ebe23cdee9fdb56bc1c05fa86ca8dc8667d1ef36f3cc7cbd556cd3186dbfa9a3cdd5160a3a7a5e7464d69e264136beb3d9280107904f9f7f519b65adb2a4ae2b
+EBUILD elasticsearch-transport-5.0.4.ebuild 1129 SHA256 58e7669d27c57bdc2789f1becd47548a8c108b7101f6865880a26f7d6dfce92f SHA512 0ed4dd9a9893186cc3bcde5d8f6a16e0158c76c47619018d596e308397f287518dce71d03bdbac9f1e2209306bc46dae854cdf4daa27922217aa5ba36b929e31 WHIRLPOOL e0e9b882d3ec80709b0771f69a767f678892a6439d5d583fd54da077ecd713c188b21ae9175c6c9b65b2673e15c1aea23ccc0b17c3a3ed28ba05689963cf5887
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.4.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.4.ebuild
new file mode 100644
index 000000000000..4632c06b875c
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/elasticsearch-transport/metadata.xml b/dev-ruby/elasticsearch-transport/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
new file mode 100644
index 000000000000..9da5aea74cf5
--- /dev/null
+++ b/dev-ruby/elasticsearch/Manifest
@@ -0,0 +1,3 @@
+DIST elasticsearch-ruby-5.0.4.tar.gz 213565 SHA256 61151bcee155c6baebace1fb5d4091dc715af53251dc32dbca7d6fb0c9f5ecac SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217 WHIRLPOOL ebe23cdee9fdb56bc1c05fa86ca8dc8667d1ef36f3cc7cbd556cd3186dbfa9a3cdd5160a3a7a5e7464d69e264136beb3d9280107904f9f7f519b65adb2a4ae2b
+EBUILD elasticsearch-5.0.4.ebuild 1177 SHA256 2172c4b437624536c00ff26f70940acfba10a5bc6563df58901e8af98a00ac48 SHA512 1481cd35b95c2298b340ee841fc41f03720ae5072ba09baa8a85db1c587719fef8855108ac296e02e611f135508de5b6497bc19417f4d3951334d2584e0ba00e WHIRLPOOL 754b43ff9738a6fde4ed39ef6e0bb335af41f79fc2b65175dde53d5ba7fe3b3595cb031bf36d5794f87f81188226020ff318aeaab9de62e68048f0ad2af40a13
+MISC metadata.xml 247 SHA256 34d6ed4186bad4ac57e0b4c08b657b14e28852a83c4ccf4d8a62f7829063b1cf SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282 WHIRLPOOL fbd18b3e6e3d777e8d78e91b8d32c5e357fd2a1c754d2c9add4622be682521e59556f466cba397d913f0e63265202744ceaf76dc7823be0a172a9bf4da6a2579
diff --git a/dev-ruby/elasticsearch/elasticsearch-5.0.4.ebuild b/dev-ruby/elasticsearch/elasticsearch-5.0.4.ebuild
new file mode 100644
index 000000000000..71731bacc022
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-5.0.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/elasticsearch-api
+	dev-ruby/elasticsearch-transport
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/elasticsearch/metadata.xml b/dev-ruby/elasticsearch/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/dev-ruby/elasticsearch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index b9801034df5d..fcd42ee056be 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -4,10 +4,12 @@ DIST gherkin-2.12.0-git.tgz 605964 SHA256 09206d66e437bfa2cb917a251899e3e95479c4
 DIST gherkin-2.12.2-git.tgz 1764938 SHA256 139739eae42c7da925c816c859a41dcf539a361040ffb64c174e90e3fd9425b9 SHA512 1030bcaf31791c7031f22b8e4c5d94ddbddf012b8686d06a7598fde99a28f8a1fda45dc66dbdefdb825a045730b077a10ca1134835630710551e20364886ce51 WHIRLPOOL b5bdcff4a1e8e8ff32c202cac4e33ba9f07dac09ad723b9b6ef202dfa6a86413aff4e5fe24c69962edccf24158c9c85e8d32fc75a92ee0243943dff04327fe7c
 DIST gherkin-3.2.0.gem 30208 SHA256 712404a266c65f6679afcf09978c048a2eee955010de276538f6078f7a8ead14 SHA512 28bccdb94e80945d2f435d15bd0c83355fc59fab7ba8e76f689227015f4c73f6525ae45391536f6cd5db257b74f8e4b1392f83d27dc17798a19afcb3e186a705 WHIRLPOOL 4ed7547b57b73233afd1cfcae18f60cd832d984b1358fda70971cc5acb251010c148b3a5f777ef3f91523aff660398653af8aceedf7362f815a64c822b64cb7f
 DIST gherkin-4.1.3.gem 350208 SHA256 e9bc29c0352dc3a2054b1bf9c6f76fdafba69062bbf784974ccd63e12aca28b4 SHA512 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e WHIRLPOOL adcd36c4991b7f548481089c927a8cca24092f392b4403fc2ec7414460a5786844801736290d83a1d7bf75a251926786e9e1f4d8ee9908906a1ccc57d28e43c1
+DIST gherkin-5.0.0.gem 340992 SHA256 c70bca25bb4a0f0fc47b47338713e53608431fc4da136955d8ab38cda4872e2b SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a WHIRLPOOL f9b26222d7df5c04e5f32ad267e768fd331e145de7986f6d74c0137fea92e1b9e71d96f18413a1288fa4ea6a019801e3d7b3a7fd9dc65a98a37c391fc98836da
 EBUILD gherkin-2.12.0-r3.ebuild 2700 SHA256 d570370e3d450c1831e94f25bf01792eb6fb4064b46879279dd91a43c613662e SHA512 a3571be17c8f17a1b9aa710890b00e0126e0fe224b1fe3e7d02cbe11e9b55ee64f6421a02a1c326e32710feb29f3bb4bd0380a4f24b83c6f7e6d2f1a8ee03ec7 WHIRLPOOL 9cdebb41309c8a79e60882cbfb9ba5a5a3df3d666ccfc5008c59d2b00b195cf014f0e3882c9ab830729ab290002faa3b2c0a220b4d7b3c1ea819388a527457e3
 EBUILD gherkin-2.12.2.ebuild 2624 SHA256 f4f27239e0b428b9518efdf22dfd70892140edb417222588fc225c66ef4bbe31 SHA512 c6a085a7a201b2d58da53f3678b6b3efc47921ea2e77d272910cc06e56479dcd7380dede251f0eaaf1ac66a5cd335e28b614d3f1d2a7f97d55f66e1d1bed1b18 WHIRLPOOL c6903de289395a89507804e65f7e3c476a57562f26c4e3f6aeac9954720f1747e3cfd7478166e147c65933267d5d3f22dbe346ecc5484ecabc39ab1f6dfe7881
 EBUILD gherkin-3.2.0-r1.ebuild 558 SHA256 f1549a8a2c5d0134345efbea93e9ef85d033aba471c480824a23c7d7092fc287 SHA512 bb271af131bb7ce5ba01eeeaf6c88160976447acb4c98a458c3053da94ff36f4f83f38cd0027dbce4dfdf88f3925104d45b00a2d792d45656d88db343ba820b1 WHIRLPOOL 0112f8109360cb7d78211973203da5b1ff5c0fc737874beeb542cfde72301e76cc22f84612b653de1867c3c8ad3bb988acafdbce72df6e350f75ed648daa1635
 EBUILD gherkin-4.1.3.ebuild 577 SHA256 e162c45585e0f865c7899b8ec7b88e0607e33b9099b835869450a02cbdc79b96 SHA512 6c4a4b13489c611408b8a94adc1dd1e3fdd7120319c32209d2f393a40e9b06c39510263a6e738d79a874501babc806d8c4fd30ea4ed243c4e577822681832757 WHIRLPOOL 88d5fe8760460ba2148a1b15056476da0a70c18552e8962eb3f7904fee9bc1f7a82b45ef1abc26f2e5569e69e55771314be1d42a6fdfd552e583d0b937bfe930
+EBUILD gherkin-5.0.0.ebuild 570 SHA256 1a5329de5c5a9397c3e721ad9ced829ce477ee8d3aafa753085967068ee50ab3 SHA512 2ff4378fb44a32d53f7f067d5ccc447f0e9647d9a7571fad93f843eb4458b0c66a3873dec55de533f947bb704a96729ccedaee038d4d0a65ae92ff9e8c24eb26 WHIRLPOOL 10d31271ab535f03229b7252d3528dc1fa6230c8d4787b72e39a018ff03e8368dd9dfd18615dd56c08b1a9b3953ba3223e003d03395ea7f1298b3ca08246fb96
 MISC ChangeLog 4517 SHA256 7b57c7705c790527feb8211a61136f1ffc30d71c8154ca9e940d0189b04e14f2 SHA512 b5699fca6f0df2e52a38477e1c518877e0c7cf9d705f81b10e8b5aa992fbf590f8be93a180bf544916922360663f2c0134397b5e49b65dea2224c4b91f6ff052 WHIRLPOOL 9db191bbcac64ebb4b2c0b86d2d2a7217bfaf57dcd0f5b9f7a8859d050963d14226ad716ea217433611dc6a7b6c648cb333a5d58847741e64fa065e9371a1c9d
 MISC ChangeLog-2015 12213 SHA256 95d3c0d4a5e3a2126889ca815ab2861c2e59507f6f3bc945308d132ad1867951 SHA512 2b3489f57ba309a77f25d7ce3bfd5cf1a22d4f4651dc8107d77b6d377514ec82f93ec97cd8bc5bcf2b8b9292e25c00ddca25ffdd2aefc6e381f0e2df66b12511 WHIRLPOOL ccc9fc3a2e9089b69e61e7fe37312887e87c1aaca222c8f1bd5acedc66ff6a474e071e3fa37fcb10687617039967bd0fbac8915e833af1a5e2039126425d36cf
 MISC metadata.xml 342 SHA256 5fc2a7a339b3a1e20182e3619f3500780adf1d7341137c3e07154c4d515683b0 SHA512 83d54811e863b8af9f5ba53f081e140d12af0d20ba5ae7273317fd42aea5a5a0fca8f742352794dacbddcdca932dc2ea60e1201f3d6429315210da99578f844e WHIRLPOOL 4d1c3b8867ffb814bd8b88bfaf60e8e803d25966d1fe0978992bfbc0bf9bc8eeaaa4f282405727a8a29d7d5c7441273d0d99844c7241da3f550c30531acbf90e
diff --git a/dev-ruby/gherkin/gherkin-5.0.0.ebuild b/dev-ruby/gherkin/gherkin-5.0.0.ebuild
new file mode 100644
index 000000000000..8241679795e7
--- /dev/null
+++ b/dev-ruby/gherkin/gherkin-5.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+# Don't install support scripts to avoid slot collisions.
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser"
+HOMEPAGE="https://github.com/cucumber/gherkin"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+SLOT="5"
+IUSE=""
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 0f77d43ca7ea..7d5a3abc19e1 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -3,12 +3,14 @@ DIST http-0.9.8.gem 66560 SHA256 517790c159adc2755c0a6dac5b64d719d4dd8fb4437409e
 DIST http-1.0.2.gem 62464 SHA256 90f0b96e221d6c4bd6cfbdb6e2ec5426e1bdbb61f833e2fa23ac8385cfdeb34b SHA512 fbfa76f588d46b10dfa0d3b319d0ca1a5a92749575cf27791febaf5d55f2e4458cf34f48d8b9792d4e220c89c702b75b039ca5b66d3c43d31bab982082312113 WHIRLPOOL 8c0d4a94aa182d0d38e2e27e2eb21272efa7b2b48309d7c225acb56aa6a169a1d399a693e897a2ae0cb19b98ba09972370d31fca7b74a24df8002ecf36cb2920
 DIST http-2.2.1.gem 66560 SHA256 59d3962cc8193540d014d9671d16079dd88eaeccd1dd3f126f7d5d96f2d14671 SHA512 e8edf381548c04d0fb2ea0f28104d85eda92d6de6686013190e84127c4ce118fe8b8a562267aed41ad23481ca54e21a215613d7e3d920d6c5ea9f9a3c4a2032c WHIRLPOOL d5e310bd902bdc1dd5813ddae6393256c04f3bd5de9594c543f7db8931a1d1514c80c13ba9f2dbf36e7cf8eae91c1f3fe0ebd0eade3a812531a9b80b24eee655
 DIST http-2.2.2.gem 67072 SHA256 391515043d4a37cdd6856b8bbf4f8af70fba1a9008ba77ae9f39d48d2e4e8dcd SHA512 9c22f7f4473e5cb0b605b9c8d25c1a93c34e7e440fb7cf4f3690cb9dd9e65ce3619d0575da3d97da6dfcf8e1560113b638bb447340605bebc160f589fb007bed WHIRLPOOL 1f4f665f24758a682a99e03fd9cc43747e80b1c97a78f47557ff9ce6eca740017b81fc6fc7851bab54cc6393ee8a0e0d930f800937addf492ebe915f7fe4c9b5
+DIST http-3.0.0.gem 69632 SHA256 da797d880d2d731097ab8ea4431ab7b0905e2cb02b19bcedf87920dc1e9612d7 SHA512 ef8c4148b68838e0669d5012c3548d373ef99d9273eb2ea25e7e0237027c766ffdbcdede766eb890f042b7211c2ed953688a372c46b120bf0bbd045c06b8aec3 WHIRLPOOL 2d678bfeefafed7809a10954dc5d6a1b4c392e73762c155a72add450219d43ede00e73d8b64bcb0b71a4a0f0e0fcbbcca7a6e2d96cbadde4bd0ea49a5e35e647
 EBUILD http-0.6.3-r1.ebuild 662 SHA256 680943967badbca82e777004c2b3de2026401886b2157d6f8c9d2ee749f30c7d SHA512 05cd5e3bc1a602e663435ad119def021de42cc280869c5edc951ef9f9ec573ca4f57ba731538865525a48a0f8f2ae84ee0ec94e4cc5d6a7652d639dbab8a3aae WHIRLPOOL 7fff5723902ad21cfa5a009da493de6bb1393794f5098dc4bfaba84861fac95acca4b667e025b4459ac34a309eab747e591d05bff9909382ba54adea9d3162bd
 EBUILD http-0.9.8-r1.ebuild 1074 SHA256 7ceb42a8dfad45160915813cffea077e926becb5a79027c95c414cc6e9f6a94c SHA512 2d6a011ed34e02db88def4272ef89f62dd40225ab20841fdda84e5b4915b13d3e296093c6194cbd743e2df1d39121166d498bf062e7ee65ed19f5a82e37f5a58 WHIRLPOOL d47ba053a6881186c128f851fe339a69431441ff3129f1248e6c14973fb662d0e78771edc794cbb16e35f6998aab6dd144622f7d0de77e5c0da358217e9b42bc
 EBUILD http-0.9.8-r2.ebuild 1064 SHA256 5f1b4fdcdbe97ad01d7740900de6067a3a454211bc7ebb314e170f21b620fefd SHA512 b48a9f677ff38988d576dd05e82c87f1f4a7fadea34a139063fcf67bd6a854a7d5f589e11c57ba908afc1a8d1b85f2b82ba67bd150d0586695bfba251c20f7cf WHIRLPOOL c2e62d34cd92258e54df043174e66fb8f4e61a26ae33bc2afb5f440a31a8a0c7ed7b6208216aa47691e8efd125c2a9387f8effe26fcf594361551d24bd6fdd91
 EBUILD http-1.0.2.ebuild 1060 SHA256 147b875aba32e028739e380233f26936a35855e12dcdde3fb705f0b556bd16a6 SHA512 9739d72f20b8012c3b0926974dabe6c9c5a31e7ee6a6c7efcf981c992f7f3c7559d4debe6814e150ad034d062e4ae5c03ce118309ade63d23c11ac46009e9da8 WHIRLPOOL 45c608922dd200bf6a8f6a2f3460808d01a58b8dab3142c80158a775446bfac0f9982ca71e54c12d80ffa600f3144c05c9c829dbf696299c9f82a9504ad3fd89
 EBUILD http-2.2.1.ebuild 1221 SHA256 ecd2362eee009e765448ae3d82bc9ebfd289f5fd6355317b2e314c724c0eee3d SHA512 899b602448c6df724890c989ad25d41e0e5098b9e3e78adea9ea7f1794712b61baf075a786e86546b596047d12a4732cc70479a5d4a6ffc7f8898a461e2a800d WHIRLPOOL 6ce2a50034c44406b7fc11f99b5db6e85bdf06eed693ff925f62fc301184b308af92572f1af4784051542e62da9a3276a11c6e6e3a4da2ea7fb0d69a9376d056
 EBUILD http-2.2.2.ebuild 1226 SHA256 a2af3ec460bdef434d0ea9ddaa885598fea93442c4c7c6b3fc71b515256bdacb SHA512 253356dd0196bfaefdd44ab4fa8d24fb247d610fc3c428ab22892569c59615eed76f9ea6f8e3ce992f23f8700dfdd1ca419559141321f7275a8a1ed0974c9b22 WHIRLPOOL f37d0138dfe956de1afcacf9611977fe25a688a60b113ce67aee23f91d38f04ffadf5f3f3d2a9b92a6fa1f05f540a8b4a82b34e5c129b22434f64668e760017b
+EBUILD http-3.0.0.ebuild 1212 SHA256 34e404cecfb4a9d4f471b7f51187549dcb5b6ec0c0b44787b482259e06d07345 SHA512 5a1f0e066519b2b19b92a437186a9fb770031f2a4acdfbbef903f86bfe7274f9da037b5eb4a14496d55a70d562d1a391e870e71abd6991b61f73532c052bca1f WHIRLPOOL 61ef964183af44fa86c2aca3dc997b6c1cc3da0b7fc4be528c754f01bb89597db3fc46159d9b0540f413d98ee9231b6062cdaf252dc06440c1dc38c5dc0f1620
 MISC ChangeLog 5190 SHA256 9adfb6eacb0125f4ee10606a7ffeed49243d1d13b5cd4445fb56d0ea7fc03dfb SHA512 59f510eabb91d9f991558867fa97ff5ce791b4bf6767d50d44877f2fe70a7e201b5694acac7eb0742b01ab1aee3d69ff44850e85d5e5722cdcb72c8a5fa12f24 WHIRLPOOL 13b7e1650d6bf8202a42cc6aa73fdb75b1bc4912c9b0f1670e576d4717c5a7b5c8575123e05a9c16e18fb2dd7836be12e36fe2423b624311d9c42327abec98ab
 MISC ChangeLog-2015 2752 SHA256 ea9b4087aef45c1f8f4e20423121c9f4c0958d65c75ff72bf5f64d65d980a15c SHA512 5b080d6d47a9f3b92a42e90d123a2eb29ddb5e5e1fd465b125039644bfc7c5cb9b7b81f850f9d1a9a6897b3ae9dc92767b266b4b75c1455e1205052de567a358 WHIRLPOOL b7a7944a960517d099d8ab02ab4c7787fc82e390ae82ed88ff764a353a565ab5792991399c4e7164684ae4574936ebca33d375ecdc760ce4fbe48ddb74e9caa9
 MISC metadata.xml 339 SHA256 97d4251ae3688f020e8bd5ee2711d1668c7fc157ceed549caf51176e50c26293 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1 WHIRLPOOL 9b45561d57005c1b32b010bb9946d36e195be79d77f45c0a13c17167d496c2b21174e8c4fa0b3373ca1617f719fa0d5111271bc6bc23ad3d54bda068d87231ae
diff --git a/dev-ruby/http/http-3.0.0.ebuild b/dev-ruby/http/http-3.0.0.ebuild
new file mode 100644
index 000000000000..06a9349cf240
--- /dev/null
+++ b/dev-ruby/http/http-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy-to-use client library for making requests from Ruby"
+HOMEPAGE="https://github.com/tarcieri/http"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~ppc64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.3
+	>=dev-ruby/http-cookie-1.0
+	>=dev-ruby/http-form_data-1.0.1:1.0
+	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/end/ s:^:#:' \
+		-e '1irequire "cgi"' spec/spec_helper.rb || die
+
+	# Avoid specs that require network access
+	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
+		spec/lib/http_spec.rb || die
+	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
+		spec/lib/http/client_spec.rb || die
+
+	# Avoid spec that may fail with a running web server
+	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
+}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 533aa0f392ac..645304eeaf63 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -6,7 +6,7 @@ DIST json-2.1.0.gem 140800 SHA256 b76fd09b881088c6c64a12721a1528f2f747a1c2ee52fa
 EBUILD json-1.8.2-r1.ebuild 2076 SHA256 39a27b3f18d67234cc4050d91e0d978da1d807c365ef18e4a72adb301d36e357 SHA512 99ce2593c742309f7b9d2d984f53eb6d71c6743fe59571e42a173a62040455ff8a46d5a2169a49784a40e8bfd3cf8b54d190281821c35fd6ba81b87640b3c0f3 WHIRLPOOL 699c12bd7f87a799c3432cd162a6e190b74bc4b116b6eaebb6ecffe661d23eedf8d323ff355801fd3fa14822399c2f0dee3abb1c9b68b554eead242c24292250
 EBUILD json-1.8.3.ebuild 2091 SHA256 773113fe37f7b0279e37885f38482b3ab948000ff9c5b1ce16693ce50961ec0d SHA512 3601ceb5b0bbdada74836475f3730f11da8c7a6bfec49397e7eecdf9686571917f5b51fccfa900656991baaa2e99c154a1e7b31af1cefbc5d8b6fbd966d3e6b7 WHIRLPOOL a5e7768dea6034ea17f66f754e029a9b83af463158b929e67bce026d98094962cc1b57f91f6ddd304454ae87d029ffd391c518ba8575e68fe6efadbfa59ef595
 EBUILD json-1.8.6-r1.ebuild 2112 SHA256 2e8470a852c89b565e10b4fdc1e1f1e6ef757d618c4fcb0c9202c63168da4709 SHA512 ceb6f70688c5ee61b3b27c8970d7884e8de09ca77e70019c6a0f0e74be5d29e3fe3cfeb60409d286232dd409ee508ad1aa6d05e9b33f6dcd05f0857b3bfd65f1 WHIRLPOOL 3755ce1d84af3c641f668f783a6c0d9aca401a02ae07c7ee9906d805981148e703793328f06ae27684bde11bb68b26283a140707f20be19b5573752ee8c7ae23
-EBUILD json-1.8.6.ebuild 2072 SHA256 63c2c41007efa04c76cab32def125fd36191455de71227adb6885b63000805a1 SHA512 6ad22157e84c0b69370558cb7fa31e1d8b93b289dd6ed751712306081635251293013f712d841620b7e4c79946554f960e39df70e0789903b2cc9ea3833bc5cf WHIRLPOOL 4c19749f7c43cc07d1c161550e584c488d683bb1e1e5cecc47df4bde0a53861c6ef3f53582abd6b84fd58d69b7c6ec4e4e8dfaf19a32021dddc45e1668c6dde2
+EBUILD json-1.8.6.ebuild 2071 SHA256 4f49c8101efb92fd4199b3a072be7e8982dd870aec4568059bfe32e681e4e73b SHA512 bfe55a86afea8a96f28feeac30edd2e51729b99a74a680b12b8799794c8697554574826fef5ddcffc37a14c5dc90d55c886d2e3a7dfbef5c5675bdc32424f55d WHIRLPOOL b620e2f8c3c4e4c5521dbedb04fd41c43ba44e8f3d6ff0ddec1c3bc4968b53023da3994dbd9a00a156e4ead62541384cf4bd9285d8d5174360d0d04c465289cb
 EBUILD json-2.1.0.ebuild 2063 SHA256 f855d12cdaa40f0e6c5ebf8ed52b6c156d7272ffa1f5e9b1ed73dff2ddbe5ca9 SHA512 296d0175321fd6811b144f37bbb39ebad763edf5f4424a0ef35a6f4a3c75a555df35629ab356e12813e09eff35fd0f5564ad46bbbf655d6fd4a7de52e9bdcb64 WHIRLPOOL b4d6f9693b03827d97256e42407960ea6536c172b39957768e2650eab9beaf718b7a8375c11da6c16a4987cf5a3e7d9aba2100082b31068fb5d37d5f5cdd8232
 MISC ChangeLog 5018 SHA256 750823aba9ab4df34144d05f071a2b36c18527bab998f6741d59b4f99c4701f2 SHA512 b268c64bd0e58227ec1052ea12713b8d0d51ff1280e6641fd2117703a2e9517e8bdf1e138df610037b1cff980a34dd844326dcac7e7cc8b3491a0e25c543e708 WHIRLPOOL 577b200a89cdaffce3fbf40bcee0c882007faa982647c7d1b79833465e517d084a2db2cd81ee25636b348f833a0f90abd92431ecff7aff37260a6f0982f2058b
 MISC ChangeLog-2015 20045 SHA256 e3f3ab67700f231a561d3ab99988db930c1dc066698b4730c407fd39cd832524 SHA512 f9d82a3e6e29acba465330a216bf28e3b7d6a5c7ed0a4d2d39ddee4af85a075c3a6578f1e17219f55a7b178c702b75c2510b5a3a9148007f4c7daf15f541492a WHIRLPOOL 8b47239e0bd8006fe488c1998db10b8b52253590c472b65d3c375d6a90aecbfcb75c42affae3ecaf6d74ab18bf6c81c6c004fc6812ee791066f1e5f669a9cfd9
diff --git a/dev-ruby/json/json-1.8.6.ebuild b/dev-ruby/json/json-1.8.6.ebuild
index 0810a567dd1b..9d07714ac4c4 100644
--- a/dev-ruby/json/json-1.8.6.ebuild
+++ b/dev-ruby/json/json-1.8.6.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="|| ( Ruby GPL-2 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/maildir/Manifest b/dev-ruby/maildir/Manifest
new file mode 100644
index 000000000000..7993d17c231f
--- /dev/null
+++ b/dev-ruby/maildir/Manifest
@@ -0,0 +1,3 @@
+DIST maildir-2.2.1.gem 15360 SHA256 40739ec2778b54691a3b3d4040f75aa56804e1e5675ce9d4e42938312ef6b0c2 SHA512 4c366333c802bbe0cbd19e6abaef1fa31ad84596518d24ddcc33aa3afe39890896d107bc864c68787c90c3a38115979f6a4fe8b442aecaead39306122d560f18 WHIRLPOOL 6d1645435b13fb43f2b08902dd393ab4c5faf73e82916448b66a879327f1fa8f6dfb74a8746daa6b1288746712e22e744e0f886cec9ae29d0d33ff9468b279f4
+EBUILD maildir-2.2.1-r1.ebuild 961 SHA256 f05f1dbce6ee473db2d85c5112014951e10d0634a1e9ae532a69b2fab3fa9c5f SHA512 c1d4d90d6b83e00c1b0cd9bfebc136ec6407a4e975708acc589ef87302a18e1ccae497e34fb90c78a991f8220da7d4f8ce052bc8975bdc475e9263ae4848ed77 WHIRLPOOL 7263e14fa24b75a5cfbddc6620e430346cb1a229acd6ad6bc2a355c69e9938f4147dcca9e84759711bc9578f115e2ca22974a1ab2b7ccfcbe8891fc18fe43b0d
+MISC metadata.xml 341 SHA256 4ec03f75746e155fceb586e6dd95ef200155dfbe0d9db0a4a78bdfa5b98f306b SHA512 68ef596ba601b4886488bf164b786fc0deaca4a10441ac164bd6eef0502c12e380ca27215f6599660467fafcfc3b6183fb7ae0dd847888aa8919437896e6119b WHIRLPOOL 60e018bb47ed08e195d639041085d0e394d1af01696e3286d1fcd43c491ce336f50f479ab512a8a861ea9e3c28ceca578b54b41b168c764df6eef3dd6bc2ac39
diff --git a/dev-ruby/maildir/maildir-2.2.1-r1.ebuild b/dev-ruby/maildir/maildir-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..58a9690259b9
--- /dev/null
+++ b/dev-ruby/maildir/maildir-2.2.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
+HOMEPAGE="https://github.com/ktheory/maildir"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e 's/shoulda/shoulda-context/' test/helper.rb || die
+
+	# Avoid tests that appear to need activesupport for .blank? support
+	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
+	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
+}
diff --git a/dev-ruby/maildir/metadata.xml b/dev-ruby/maildir/metadata.xml
new file mode 100644
index 000000000000..524f23aed803
--- /dev/null
+++ b/dev-ruby/maildir/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ktheory/maildir</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 159c87a2363b..9a0f783f8b1a 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,7 +1,7 @@
 DIST multi_json-1.12.1.tar.gz 25579 SHA256 1ec98fd529284e99cd6156509542ccd290cfdd5bce03910ceed5127bb84cbb42 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df WHIRLPOOL 93152310d15ca126960814c53a24d8d1e7c6241eaabc913f88f1485451eaed70288d8c7e5b7a19260f73e2a25de17b95c46fb15c16e7758980b79a48be53b498
 DIST multi_json-1.12.2.tar.gz 25630 SHA256 1d5c51ea6ce8b4ead8c93964104e4935896452430e9209476550c57839abb3ad SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9 WHIRLPOOL 6a550c7ccb3e234a12a42418048ad45c5abfc7aad1be56a13e9fea9b66c4864574e38cec69e2d184f46fdeece5cce8e1aa227dc69e9f3de6689f70cc44e22672
 DIST multi_json-1.9.3.gem 30720 SHA256 631390d4b6c3d3753a3df0c28339c8e7840704083dfdcefb1323a22ab97b2281 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5 WHIRLPOOL a96f1c1e53865e153bc83079fc70b69af6c941c4995f4215317ca53567532d1406adb174683fc8c5229fdc3563f5e8d3c2c662d77cf9d9d55367aab2df5b34f0
-EBUILD multi_json-1.12.1.ebuild 1925 SHA256 b5393143444c84b6f5bf0c651d5a0ab67f0960589a9224182ee4fed9a0612cb4 SHA512 9881263fc3047090318df181337a71e01aa874a289148ce49de6d4b4528c7384cf93965d6c5b60b62c3ae713cc4fe9af755d04662d555cc12aa79ba35a482986 WHIRLPOOL 36c58e2d00e33e1e8bfe932b5a92086318953802828d5f790014ac7e7e1b770b89ee81958d87d7f800eb5ee22036f5263ae46553663a2bff2f3a5a5e60ee95b5
+EBUILD multi_json-1.12.1.ebuild 1924 SHA256 96358d07fe9724dbd114e9f8e7bb51ee9fb85c6fbf9c5cfe382217922e853014 SHA512 22e16098d1d0743c4d4f4d466e14f23a1f343fe3a54cdb23af1bda6ce44a689e3ffb2dc6eaf6584dd16bbd829dd433b377f870207754c65495935ce3503d6548 WHIRLPOOL a85e5246dceb0843fcddb06f73e9a5253b84c4b5fae5eb42c427f7267903d7eaffd341376f5e814543d2a53b13037fd7dc5c0c232a6032c042505bb063b817f5
 EBUILD multi_json-1.12.2.ebuild 1922 SHA256 9d49315b4d7c3980bc7a7e72c0da3c10a444181bf21e0001b3c6cf8cb4217aa0 SHA512 429d8f7036473500cc478d690e28ab4baab02cce66a474f0c73e03b2362e3b9124248520bca8ce1c2c89ab46f6ca41dab196b654919f8bd43e66e76c6e04e9cc WHIRLPOOL d64d902f8dd7ef079ff81289145be853f7eee6f776d655c7d838b5903103314a68855a9553381a4bd6e3d1454c9a8547c2f9d32274bef42068c528a549378068
 EBUILD multi_json-1.9.3.ebuild 1878 SHA256 a235696f516491c3aa082fb82ff53e3784d91438353b360d602c1248dc07d10d SHA512 d82cea8ff2899461a50592acaf261603c5f5d12c44153b663387921ecd12ee34615a09b6c9b410782e012326e2bd36d7ae2dcedfc900adfcbc03ced229ffb816 WHIRLPOOL cf89a2ac618338df57f775a5f076a3e9488c045fd13ca284d61cb6b83e116ed68eff3545ee6e706b4399f31a5efefa80a6e4b87f59bc2468f83c8b126cc6b24f
 MISC ChangeLog 5287 SHA256 4434696da49b2b23606f9159a616f6c08d2b702bccc130f990af6c48af1f60fa SHA512 29e82cdd07ce0787e6d9e2745130b0bc82af4613af7d7d813c1a5e17e19e5a8f23e7968b481e83d3e61d699bd73276ee948c82f0776bc92d9de1dd1096532174 WHIRLPOOL bafa5560d535f41ae8cb8eec563b11e9bbfcc002b6b149fb01bd29f03781748c9f9fcbfc8c5905deab3d2f53b1fa394cd4e47e21d96f4841e688d5955f4b44ed
diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
index 8660b9d9e4ac..cfcd3b5a27c8 100644
--- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index 8201423c63b0..3fb942dd1c82 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,7 +1,7 @@
 DIST ruby-ldap-0.9.17.gem 66560 SHA256 951ab18e8dbc2b9791555c38833df07e322992d3eb53aefca88a085fc55686c6 SHA512 b6400faa4ae19f3d783810a6b2f7af36e89cbf001aa48a343e1ff6e5f9e74639bb84db2dc58a1465f91130248eaf17767a6c125e1d416aaf7d45ff8c14c3b68e WHIRLPOOL 00b9f4508a94b0c4ecb61e3f3749142b2daa4645d80feccd86d7ed1ff9163a2cc5dcec9d516ebd4b8587573e49abdeadc31427b09e057494f8389b35009ced49
 DIST ruby-ldap-0.9.19.gem 91648 SHA256 8729230019eddd6f5a13baf5116e95e2800478636f66027e76011db274213981 SHA512 0ed931552df00c11855297ab44fd1c9a79e751937758d38189147f1d37cbce9b1da6fa42e64a9fd44610e948b1c13031013b7931ed473cd55b8425e64a50584a WHIRLPOOL f82e718f03feabb028f7490f8c87a3da159b6d2cf26c7ed9c7872183f5a029978dc56b26976223d61fd6afc576c489997e9340d064341221c8ea1dd262face0d
 EBUILD ruby-ldap-0.9.17.ebuild 1080 SHA256 75b2d0f75bdfbdaf1a6d343f1edfeab3e163921cde32920a2d787d651e97eb1d SHA512 4827aaa3a4103d4d617f566a531e404f9a19894d63560d37de59c10f4a96cb65d228a29dadca584d8c1044f222330a45eb9445b342f7e376bf75093a4c998152 WHIRLPOOL 1c7f6a4d26a364e800509e481dc6aae9059c0a67c6e1cfaabec2efc22189fc11b94c8f20116ad7c85dfbf33bfff618aea7afa8dd95662dca3ef3fff2c98f45f0
-EBUILD ruby-ldap-0.9.19.ebuild 1094 SHA256 836905a634b7d5cfa187600f23c135491131d92864c9992eb571baa1d9c2495b SHA512 a53dd4afaff904747f25d7e0024b28618f24c102720b956b62e659a8c6cb562d2ffd55fe481acfbcf5a62ebd640a408004a31696d3bcf73e73f6f72f7bb4cffe WHIRLPOOL cae31e5c9357e2ad651afd1b034c67f05f3fc019e88b78117dab5c3bf4e75e108639cce7f63b06c55535ee583001d58ea486d4a9b7b875b06d087c3faf224296
+EBUILD ruby-ldap-0.9.19.ebuild 1093 SHA256 9c1d3eef0029e3e0a336b96ee06b01cc8e0ded1d43cc12577a22682a9a62b3fa SHA512 764f6dfb05fcc84745e883b3573a15ca1e2e27097bbc601e7bd09228b4a59d8b118b9d0ed06756ff5fef210b0930a3b55543b082b2db38668a26b95a62f61221 WHIRLPOOL 554aadbb9edee2c2e3409b761446403ea5996ea394bb355a022b088392896e2bb605f3f80be41b60e96ebda5065af504457b6a4abd8ddd8280c513b2191be937
 MISC ChangeLog 5582 SHA256 2cd5209d012834e261ef6a6b47d55a785b4c27242d7fca159944c9e650c154cd SHA512 990d380837e47fec177b796220f1fd2b6e68ab28f8d12dfb60e274682996741e897e9a9b807200a53fa815c1a29caa6399f3bd42bb99401a52a95db7f798b984 WHIRLPOOL eb1f5f76851ba0ec7508bcfdf53d49294aae8486ad7baf093f35518d3316431e95f4c36dbe8d9e268b68062765bae45373a0788067c2ea05053fb9e64aa38341
 MISC ChangeLog-2015 9388 SHA256 34cf99976d494cf4bcbe8f14ea9a3474270778c237e904f45fc3b40995c4547f SHA512 38786ba3e431da49a672c096a84ee8537ef6dce778a20608e21bb549fb4247868a1eadbfe1276b04e76c3849610291abfba69ad07bc87af30bfb407259edeb6e WHIRLPOOL 2623a59c9e5f9ae6e592d6802202c5b9e9589e57fb7fd9a9b431d31b8bd31637f23be0dd6561126a2dd91e5dada100cac56432f6bd70c7cda16b43b85b28620e
 MISC metadata.xml 390 SHA256 1f37f1eb657edb3c89dc9e66164169af7f6e605fdcf0bff4eefdfad45bd22273 SHA512 55f9b63787f86238cf1f6a465e2eea49496be45c0e80fd0175b73434b93f7ce495c46b081833b5f3d7ff3322c1de31c86ba524f3327630908e424b0346dc02b2 WHIRLPOOL dbee7b4c79851adaf85ba81d92067a7ef92ed86ba3bdf882c4ab0aebbd6bd76f4dc05bb6ee1880fdba31b801d3f307e6476b201cb972d429352c1913f1d77c39
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.19.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.19.ebuild
index 4adfc0be9d68..f366747ecc09 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.19.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.19.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A Ruby interface to some LDAP libraries"
 HOMEPAGE="http://ruby-ldap.sourceforge.net/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-macos"
 IUSE="ssl"
 DEPEND=">=net-nds/openldap-2
 	dev-libs/cyrus-sasl
diff --git a/dev-ruby/ruby-opengl/Manifest b/dev-ruby/ruby-opengl/Manifest
index f8f69ca0814f..74d7ae10cc07 100644
--- a/dev-ruby/ruby-opengl/Manifest
+++ b/dev-ruby/ruby-opengl/Manifest
@@ -1,6 +1,6 @@
 DIST opengl-0.10.0.gem 565248 SHA256 e3bc0fa92dafe5ece8858259ccc47f156edab3b6671786a75873ae1d05355a89 SHA512 8d85d7f8a25e429b18245a10c186d07a85fdc8dc4e158b0001cde2b6e4bacfe4b09552a3b3fba5e14439d2fdbe000ad23bba89563f58f612f79958283b588dde WHIRLPOOL 53c3ed2ca848e7a10a2089e40a2875aa800cad69143a3a5356805d08a1787b4f8fa8b1a6fb765c71fe1f4bb236531286aecd22b8545abab1cf4981676941bad5
 DIST opengl-0.9.2.gem 444416 SHA256 cf421841af7c8beb9768aaf755124e17a09f726ea7c91af0f8cd92941036f2cb SHA512 0a7fe8d064e90df5b0507d667d30c3158671861c944086660470f23950606bb821e431735067dfbb2f9b97ebf68041b4937d4330907c4aa3daeb21d5b7e61c37 WHIRLPOOL 7d014cbfa7c0b3eaa206ad9a3c29e78f1cb03f170a10aa5a537fc8504176e794144591131b2ff0db029907b2ba9204b6a47c59ce733d6f2a4c7c8667a08743f4
-EBUILD ruby-opengl-0.10.0.ebuild 1011 SHA256 f22a1be775f558c04803c67dd040125e7d07d490f696e23d2c3cf4c31b0eabdd SHA512 b16ec3781f1ff8f24e40edc4bea9b0a9cb8c0b75040f3af9c38d4d3212c01daed4a8ad412d4e53e828a8092bc553c7570ef843e4eb156a5530c131c653c9552b WHIRLPOOL dc4449893175fcb91ef81b70d1a8390c7b40b24c162176ab54835821c534fc2cfd5857e134b3051365b5378aceb788e74064988890b5befaf011cc8800641931
+EBUILD ruby-opengl-0.10.0.ebuild 1009 SHA256 a3c8108cf18fcc0fef205f3b26a423526d718c9fb0a51d9c068fe81914d95748 SHA512 3162ac0f0492ecb9b7e76fbdd15a3bbcb37a216ae7346d2f340cf946406ae0a3cc866b54bc7c4264ce3b6cb4c220e8ba57186ee28dfbf48b0d69c8b7c5b4066e WHIRLPOOL f9c1001c6f27a89a4144ebec62cc2c1279a1ee936b593e7aa9c8ea63f9d3896f24bc96a9e35d649eae11c1ef3c1e9b07ba9cbc6f6e20fb8f3750d771c44ac056
 EBUILD ruby-opengl-0.9.2.ebuild 990 SHA256 424dfdd48cc9c945f312c99abcdfbb9788207dfdf637260a71cde1fbcc61bd60 SHA512 26fda924c3873890c5cccd5ccbbb9d8e08b69f5acb455fea4c656c9722658d535d9aeb9d156efd57733a51be50e64812b6d8874e779a09dd4bec3515d9813fcf WHIRLPOOL d703ed976c1629229b05a68a9c6888cac0b124f124553cc9131f341fe277854f5344f491410d3c3e5164ed1aaf6220bda4cf1284a61b292e2fab1872f708fb90
 MISC ChangeLog 4756 SHA256 da489979fe767a3045c681155236177674aea7b13f8719568da23fce7976ba64 SHA512 4ba9d810745d06f513abf8d0b45866ffa3e0b1037a57875a42ab5ac3c8132d4552f3ce0b6459fa1f07a4543a1bfd84ebef3f325d34dee5556293e0c839c6f1da WHIRLPOOL d4b8f1cfdda50b1f5ecbfa666b3b14be37e754afe0e7c4fb2e4fe317553d976219d591524a9e9c2252f80a12114e27bde656ffbb98aca43601683fa072764bec
 MISC ChangeLog-2015 9619 SHA256 329fdb573b11e7e6c7ba51bfc9fd42d64ac901b5fae75a3241b19980409063ad SHA512 add2b6ce96de9b165e6b163aa96bb5e5e6cde1214d3dd0beba90f41e5aa2a31c7dead4a52029dd2e4d34c5720380c299c8dfb97af40c6fd70ef3a7626e67a584 WHIRLPOOL e002e1f333c2183755c0e804db9bf7f33632a1d38612233c501acce306fc6a3025725e560635810949a22fbfeff6bb28e50965bb59d55798652c7ef9f3e5044b
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
index 59d68824f4d1..d589bed47c6d 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/larskanis/opengl"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 35dbe654259d..4033702dc8aa 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,7 +1,7 @@
 DIST yajl-ruby-1.1.0.gem 557056 SHA256 95b85940c96c0745e780f363170b8bd1b7b66d36073a061b1461b1788834446a SHA512 bde81b5fbe467c6403d27b49075822ff07b5cf356c05f711757fea5162543af36846f1f1da36acd5da359133f05e2cb3186215dc5597f3255da74c76cc8bf3ec WHIRLPOOL baa8f6ec2bfe70cd8f3441c971b2854a99b9f132eb2cae22f9fe6a9de7c7ccbf84f0f3ec982296d4cbc998051529b464aaf16b268049193aa4170ec7ec1ca11b
 DIST yajl-ruby-1.3.0.gem 550912 SHA256 f1941b3606aa8da0800ab0a5560929454a1ba9c7ec41cb5a2905eabb2f155069 SHA512 351e46fb7037541096172bac5c3dcadaa6ac9650ac6aae46de2b4ba31b82427f596bade2b233d0d8e916927800e83b7930b5ceeb9d7340edd02c323f9c0b3116 WHIRLPOOL 8de8b6575f3972dbb2503315d33f5701f6141b0ce11f9f3b027a7c15ab257823e772d14400dc3db94b41135e90b25c89a89931fb2670a7e0de72a0ee40d885dc
 EBUILD yajl-ruby-1.1.0-r1.ebuild 926 SHA256 b15f57d4e86e477a4e203f5c609fe8efe12fd36d28bb5b594ac1f73fb4396dd5 SHA512 53665219df16267cbf79029858e425226d0872484a11d9178ea3eb6698e236f3d70634e4301416687f9cdee4f555be8df1df0be4866f70d9b4da3edec9e73dfe WHIRLPOOL cdf1b3141d4bb3b88e24d50f9c75164b4210e1b0be1aa9cd481c63250c91281a8119266436e03e934e3e9df9f49c47736a22a20b00ea3d3e0c858055ecadc671
-EBUILD yajl-ruby-1.3.0.ebuild 1243 SHA256 0c7000a45df7d9bdd30a480a748403ca99e6b06db6a40f77f13fcc9a87edb206 SHA512 fb85accf5b42ee7b806ca97add5ac6f85f16afc3a7d8e55b6010920e6ec123a59956d6f390a2307ef056c2d8c73c8f2ee8b3950cabf8f69b99d28cf1e7d341a6 WHIRLPOOL d9b76110343d1666e3b09d89ea808720464d0ce7770aa3a2266eb4ba083fc00a2a8a07a88fa6bc4de80d6eff380fc071c66d31c83e565c492663c2906317d34e
+EBUILD yajl-ruby-1.3.0.ebuild 1242 SHA256 d929e03733b22725c6ed38dced96271b0f4c6f5fcbfd5e320c9c4da11f4233b3 SHA512 7812284eda8eec7abbc5bb925d19e9b4682e3b9089b2a978988a8eefd6ea21e8015521ddee5c1ea6066ba922dd5672f9f1610c9bf01bd9321710d42e5639d536 WHIRLPOOL e081a645f8682fec38941fe9fc6cacbcda2d807e0cf0fde3e8319f40fffbad018a4cc16e8dd44c5a7ecc93c71c7ec4ccdf9472ae2ee7af635c7514ed2bd7c038
 MISC ChangeLog 3572 SHA256 901edca3664616cf0a19920e344198a0e4097af2877aac92087634c1b1c9b51f SHA512 5db12de2004b8896974616bf843bb0c238961cdbede9ee856cce5bacfe4b8bf4c80a7a0babdf3fa8c3faa7470a6d0701eaa3965d7b0ca5de86cef0445a0bb788 WHIRLPOOL a247e75740c3fbc525ae8c87c0ab89df27b21532e8ea319780d19303a63257960ba54b4f6b2020b7fb184111d5b2fb32613c4a8d58c1f34a8a9b3509ebce80ce
 MISC ChangeLog-2015 5765 SHA256 2bef41d63b19325834543228f81b8d7c5f2a197f6da13b7e6cb69e56ee5d3b7a SHA512 6242d29a4558892524def055860f508b016caa8674315441cc8fda999fd58b7715f21e0cc4ab141120840074723cb34717a79199f89a61d4078c06041b739992 WHIRLPOOL cf74a6bffae07a40f998d4faf8485db22f685729ed92e3ca9387648aa75af172812f5eac16c442ea5713faad6d65d490b35ec87df2857184c246879cee44dba5
 MISC metadata.xml 346 SHA256 b6133ea502856bb3b19eb89ed6431204e4678f3e7b53bd8b06e72216e55aa497 SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae WHIRLPOOL c96706a8b829eefa7600bba4557cf028fbfe5c329a85701612535acb493400d604444c14179da1d175516a07be036ee41318eca819cbaeedead6a5cdaf34d367
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
index 8ef2241712f2..8a7ecf923276 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 618c2714a6b4..fe0a2caf8ed5 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,27 +1,9 @@
-AUX apitrace-4.0-disable-multiarch.patch 1239 SHA256 65eb0796a9ed1e1c996de5852a99281154e35d691a6b6b5bbaef9d81444ead88 SHA512 30d67873bdc6da9085a0680765473873d1a8020c468e951be740a81bc3e4404bba7b636ee01ee1d20af868861dd6d7f5b82104b914bfaf994cd3be029271a43d WHIRLPOOL ba52fd3c59f838da622cf282af9214b270e7cf92b2cca44c4767e1279b9d8bb07a1e716b3544b7629c75fe9ff8297602e3ac96f412e30575537ee95e0f37931c
-AUX apitrace-4.0-glext-texture-storage.patch 3765 SHA256 3f6928448d9b82323a0731a6b66ecd02866d9e5b637582e844c9291b61d77406 SHA512 9bf5523af9aa18d141a6676577364c8c29560ee231f4a7913006d6fd8a796b66270fcb06974eb3c62562d087a79d9453a5f3dd3b38be7f627879361919d15901 WHIRLPOOL 4e2caedd4b964c33595a79eb7a95fe47771acc9a19c6b63b6fa6110fdaa12954d05de99936064a0bce1cd1943465119ac1260e6307aa5b740d4cb7228ea6aaa1
-AUX apitrace-4.0-glxcopysubbuffermesa.patch 2715 SHA256 6c5ad45f5015a95bcae9fe39691d520d15a6382d2c29b7d220b1ba57b2bcc40d SHA512 817e13d7668a2d95c321bf2c9506829b9a0e3e96139873220783c7d80fc9cdd5ce2408765fcce5ce3dcb37393d3921257a9d9c0f48b820cc325dde61f6e4a82a WHIRLPOOL 67483b27b8dadfaf57cab9870e561d059c337b3ed7fac6f8fe8e02decbe8474f62f5947ae781daaac07f1a7e2e037c75b117f88685ed7225dd70aa40e4902ba8
-AUX apitrace-4.0-glxtrace-only.patch 1641 SHA256 e4b0318763b2cd7ad79e684052674991515b612534dc7a9033e4e1ff5d86d3d9 SHA512 103d646d35e5b0b198b224088c97b4b6639bde8ce05e4b1889b124bb835c29aca38116354a674ba9802056e60a31f649afc05876458ab0995fde56893ed910ac WHIRLPOOL 7a3e96b0d678c5e11762b1ddec756d60ac68d99a5bd85f996e3b998e27b7fdff65050d0e15c9cbfc6b89d8adb586d764eece02b17ff1788506f345e9e8d456e6
-AUX apitrace-4.0-memcpy.patch 256 SHA256 233102422b76746a6b6d71bd22980b4f71fd7b39597b500e9beb89fec2fb365d SHA512 d0392c2e4dbdb3ea3a7ad3ecfb51e383d59c4a1d0ee2fdffbf0d0d5ea939fc03238ca8b9ae0fc8eb7799806de783292bbeed19ca94154fd09ffc62f24369d5e3 WHIRLPOOL ebccdee8fa7d703bd3843129e6a75c53bfdf2d2f51d889288e6ffa96addc2cdc2aa99f479e3808ecf364ab173f5b310497591b800a8325aa05bf7016932ad4ed
-AUX apitrace-4.0-multilib.patch 1457 SHA256 d6ab2a72fe9c696788a1cbb996006ff9a0a0909aeb33cb51adc43fb1f7e6f45f SHA512 a351cbdca7d02ec7a7570b32bff2d138779a8543a2b04b72d23fe8847b188b2143f826bfaf93c35a53831ba6ea93d4032eea0514d238573fbca6225d61ab7bed WHIRLPOOL ea525b48d838db7f1c42bc211f45807ef3b783c95c936d4a47cae649cfdae427b932b4eac0f10b0e89ed114f0e6d0ac5bcd9b2c27fde6bd197f8351f0aa2246f
-AUX apitrace-4.0-system-libs.patch 2049 SHA256 ebeb2c56565f696836863f2bc5882ded3bd6132d85837ecf91a1c9ccec8ecae8 SHA512 6831349d462a8abb5a660d5478c0a2ddd523d8af6347a0ed8da4eed2ae85d1fdd74b9b5f5d507a09b7b703b9b6e099743879a093cbd8b04fe2d99b034f011cc1 WHIRLPOOL c5a1f8e55b667f2b98fe95e71e8ceb6594063df076f5ad8c5168a71d3db35fcc619f624dd00292ba250b0f6c5990f0e50776c586541d1a440603c7380b75a9ee
-AUX apitrace-5.0-disable-multiarch.patch 1340 SHA256 c372309ea37a4f45d98a1f27cb6ec15d5711e99a908da4bea5b32a2292d773b2 SHA512 bea98c8060893d6fb69a59b0287503311f7fb8f3015a91c9a6121e578b71195ca04d88fc1f2da7c88502a8034c594f3f325a4ea7f513f91d8149bbc36999db4f WHIRLPOOL 645b288fbf4af16aef70e6f4e85704c530f111996bff06a1ab09c2ca90a9dd8041849b8b4c30d4d584ffd53d4e9c1f748961038b08a89fb62969db0fd4d64997
-AUX apitrace-5.0-glxtrace-only.patch 1798 SHA256 1c748e9cfa96ca26c73524a94c8311efffb642bd62ab12d4b3fac23e09eb9caa SHA512 f725b4ce98cf07ae3d2619cb49aa5f3634bd987a8523d95e8e6aae449efb490efe6be488236191a763440173e81c83be37d577b803df960f28f2bb36e1ae03c4 WHIRLPOOL c50cb7e633b7904599ac1cd989696789a38223237692d7c60d1020c94a28ba778045444657c72dc787c57e24ec2a315ddce7697d5d3cf1dedceefa465d7b35f1
-AUX apitrace-6.0-disable-multiarch.patch 1252 SHA256 424a0f54dfffd0f57d9598cbd21e79a9b165d4062020ed29c16c2528a7c98fe2 SHA512 fb88abd703bc48464d04aced4f8509e741f9cfd62d44d54b40771c8f45b42ab9512e4aab90949be751ab236e5e1a05d18df659c9d8d636d1137744387513a97e WHIRLPOOL be5f8ba58b013c06a9387c96f1fc47d733aace4e2e0b95a8db0e02d9d4deaf579074dcb91dca85328298aa8219dd6867f6c3cab9452a8f3c6e1650e50e280a36
 AUX apitrace-7.1-disable-multiarch.patch 1250 SHA256 6b0b4429b689ae5d09142582df1541b7c5776e97e7c133fd5e687d6a0a8d2263 SHA512 f9ec915c3221697ae81f9d49fcd56d846a5cc8d2f5e44d3da5df0ee3674c790370dbb4d58350d631d735f725a63fc323b1386f5399b89ae311ec783e29b0d396 WHIRLPOOL 1f00e670a3f2da9a95f0b5c1843e1d1da8c0d69aea13a8229d06824ebad1fdbcf8fcd44eb45849b8c656153e691c3bdcf0238c659f1712eb4a17cd17c5321739
 AUX apitrace-7.1-docs-install.patch 526 SHA256 51d8307920093800bef0a398e31ad4ff037faedd84e58d85bd9d5c196056e470 SHA512 530d232c41a447ce0e95f5b9d25bd0f48cfcad2867c7efd69e69b7179d85fd35d60a27adce1295e9499a6449f968ef3989c9e5f874224fb11086b92a714e5831 WHIRLPOOL 01a432317fa3f183415ce11182c1e28560110e63e5190360576c9d12c4f15d341f78f965a515db71fac8fec16b501cda3e6bb0e70ae1426fd97f4fe773c18d57
 AUX apitrace-7.1-glxtrace-only.patch 1022 SHA256 2fb863d843681fc5684006658d40fd78ba21b323d250403f1bfe009fc8cd9dc6 SHA512 3cbb1b25dcfbb57785feba8ef83450e270f062fc771e5fd1ae99c8ac893cad6e33162a12fccc962da08778a77377db652690efe3c54d60b2a56a6d1971cefdf1 WHIRLPOOL 7ce2a7fad03f6d10e5d47af5bffc3d906aaf4a480db9828243083eab634199e06313a062e00f8faf608fb3bbd6f64e76feba135e755ed28295760728916391e8
 AUX apitrace-7.1-snappy-license.patch 240 SHA256 b0529be8c0bb93fabf7256e6a2b50caa4cc78635afb3ba489c4ee9dd35ae6f3f SHA512 0ea2d2fe38c0ecd12a41dcef66efda7e55d02c43a9a8ec52da621f711e50f040542efa65e855d52715fa0ab78d54b4c5620ee0cfc0795f4d9eb4a433d07da60c WHIRLPOOL 9ee7d959b89c26df67ba83cae52f60a2a9e059c9d481883b683e06627c550f2924f7ead134b2e1868bba4927b7b0f1d461455a87dc7f76306dc02e4903a30073
-DIST apitrace-4.0.tar.gz 1736912 SHA256 078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c WHIRLPOOL a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
-DIST apitrace-5.0.tar.gz 1868044 SHA256 c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512 af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424 WHIRLPOOL ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a
-DIST apitrace-6.0.tar.gz 1738830 SHA256 4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512 e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c WHIRLPOOL 1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0
-DIST apitrace-6.1.tar.gz 1741041 SHA256 0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512 218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd WHIRLPOOL 6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea
 DIST apitrace-7.1.tar.gz 2343156 SHA256 2103386d747d34f3d6fb1d01fde9078a45ad2e9976afab3a7489c95b08dde0a2 SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84 WHIRLPOOL d61aa9470faf61d4ffa3cd12a24fa13f993f9e21fc0bfcf0f2b9bf3d15803bc1c2120a1ed7e8c43668082dfe61f86434d5e297c5e21e4f2bbb1b88bf80b9bbe3
-EBUILD apitrace-4.0.ebuild 2428 SHA256 ef77e073af848c5216ca32905dd469cd403eb85918b88e60f47234e6f19e1032 SHA512 1d3466a7c4e79a0da9c4478aea70fa093776024b18ce8d70156722e85a72d63ec1d1251b6588d261ed03a2f1540891df1a52a668e59c8d0a321c8430e499e5c5 WHIRLPOOL 0d65452436143569e2e735f5505050fae073312a1fa1a7359b423ca66739c8e477cf99489fd59bba71492700ace91fa6313b3ff39c63971886f485e1540d2cf4
-EBUILD apitrace-5.0.ebuild 2270 SHA256 8b1a4906ac9cc4afdb6710dcadc6044ef0efa2f1015befe8599746338aec1ab0 SHA512 4a7eba7f4efad955d12395491685ace6cd47ce0c09b0e8188948103a72bf7261a7877a97df83d718168809e0440fd5ed679a05157d448293434b8fb1c844b4f5 WHIRLPOOL 24676d62472fc4eafcbf8941521f659f96cde66c01a9e781c21c907bc5c7d6b4eb5387947c8437b4bdcbc802d49f9f89bebbfb642e26f0b38a1a4190c5bfecbb
-EBUILD apitrace-6.0.ebuild 2279 SHA256 0f089236b0900bcddc3cb74a7814faab26de1eba647d864fa521fc02e0c141b9 SHA512 517bfd6b5e186ec63137ddac0ef4c7c7b9f89f32dbb3b838971bf608bced347ff3b571a999a18a8529045b05d1fffd8f7850dea727ace09519f881e7d83aec56 WHIRLPOOL 8d9c9b03b735125285f7cfdddf0d76608516c676d48deadeac2a607d34c82ab8d037927c138a2ce5ecb399593d81b66c0a3921217f6831fb24e84f05455249e0
-EBUILD apitrace-6.1.ebuild 2284 SHA256 b8cb074f50fbf20ea1c617108a5c538dea71d7c4e7c9f739ae349721e6cb9663 SHA512 094bb21aa5b37ffd39adb32173289155bd5f3671192998e31ec28c790d7c1f4554b79d8866fd39f2eeff0e00da4f5bca5bbe976e79b3d174724f8969b5545f39 WHIRLPOOL 4f03efcdaa4c835dbf9bdd0a909c198c3aad79710308768edcf61775f726c6ab0d1f0d8fd6006bf848d3440ef0a0bb6eee7c19102de6ac304dc3f6fe8b8acecc
-EBUILD apitrace-7.1.ebuild 2552 SHA256 56b602993061f401d349f1ac88ec780d88029bcac35d5c06b6c8b00dac8c97fe SHA512 433370c49d61f3b3537b9240dd5fc15e3490bebdf4bac160a658b219bc6fc11617d14bbc6067bb2f6abb12322b3de3bad3fd8d188d69a86a8b9b85103579e5fd WHIRLPOOL 9bb1e09b4d4aa55370d854d5c557b894b80deea0a0bcfbe49faf5369c6134dec036851acd3d62c283803d305b7d9f36704d771363548735a707def48fbaf41b0
+EBUILD apitrace-7.1.ebuild 2514 SHA256 8843617b43ec7d7391e77ecf1b7609fa6f12b4a371db5c0da43caba5edcb7b94 SHA512 c65aeb52b0ec152d4413d569172b2235434bdf2b17326e84cd85205880b028f0f390f2262a7a2d4aa1ca11dad48f208ab16daf0d0511a856eefd5fb583492595 WHIRLPOOL 1a1f8fd267b21a197084a17969aa963e52e92f18c84c99b1a51266951d20f8b3981767e27f47928a073f82c2b33e762c53bd2ff666525c21d84d7de029eeaf73
 MISC ChangeLog 3342 SHA256 c48eaebfab3bf2fb218038d7b7f7822d31c466210757f7b54bd1e2b1fa830f56 SHA512 39f341b50bbf91045e80c1fccd27ec2c28155a53ce26e26cefbcea30b50d9ba1697e2b3251c8bf0c1a9626877dab40754928fa175e4252236052b05c1cf4f7fa WHIRLPOOL d48376a9afb9f3d26af9abaa1ad7405f9ab16d8fa566495473f6e4b46b81689de7981d396b3a01c95f7d825a6d55d6c8a8736157a37ae82f48df2e2f947a2007
 MISC ChangeLog-2015 5308 SHA256 bcbf64895b2d12c90e903793c83fc086db336c48986b08562c7cc8c67847fa44 SHA512 472955bdccbf250f2e75c5be1b7fbf3cb6b121c5ede7234dd0f35841f0adfe3d6a7b61e1642d0c0b88caf0240910f4f33aecdb6d716a9a7bc50d233355410967 WHIRLPOOL ef5f27e3925d40672d7bb62e72f02a8fcd8eab10061261023ff233aceb77e605ecb89bdd11f2dbf2497b9d0b018897e016b5a3c4ae3b9f85134616740824b94d
-MISC metadata.xml 873 SHA256 73102a36c78e45ce4df0dd20d3d71a78a79702b43bd80e6405089b600c690267 SHA512 70888ddc502b5de4c1de887e0d383f7745a82ae58ac4f733789c919b014a78018ad89da7c7665011fc94ea91be0e32245b859ebadbb88661ab9949a1215d509a WHIRLPOOL 5d4bb986419dc9580871fe1d256816ff4c4d9a6a0759e8d672eac726d98f98d177f5aa4b67912cc3a949927efc2d7408bf9166c21aee75e1b60d9e383b19ca86
+MISC metadata.xml 845 SHA256 38c27002890300bca25a0d192a6c71c3d4f03926b8d52a50456eef38f4eb7ba8 SHA512 042a487ff68ee61aa55af21c50dce3e2e5aa04a60453500164f65f21e368c1ef005b823eb8538b0ad3a0f3cc3ba8cc86f2068c6db2398380cc922067d4691d30 WHIRLPOOL 9c204afc24998005f2ea3cefb55b915de2a015f7cac275e94da6ccf51dc982506fee9a56ae1d7995a8a73a5d4b1531f6b4fc86d7f4ba9f4a9b8d905279b7ff15
diff --git a/dev-util/apitrace/apitrace-4.0.ebuild b/dev-util/apitrace/apitrace-4.0.ebuild
deleted file mode 100644
index 9b529af04909..000000000000
--- a/dev-util/apitrace/apitrace-4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libs.patch
-	"${FILESDIR}"/${P}-glxtrace-only.patch
-	"${FILESDIR}"/${P}-glext-texture-storage.patch
-	"${FILESDIR}"/${P}-glxcopysubbuffermesa.patch
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-disable-multiarch.patch
-	"${FILESDIR}"/${P}-memcpy.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-5.0.ebuild b/dev-util/apitrace/apitrace-5.0.ebuild
deleted file mode 100644
index 712b310b5588..000000000000
--- a/dev-util/apitrace/apitrace-5.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-system-libs.patch
-	"${FILESDIR}"/${P}-glxtrace-only.patch
-	"${FILESDIR}"/${P}-disable-multiarch.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-6.0.ebuild b/dev-util/apitrace/apitrace-6.0.ebuild
deleted file mode 100644
index 9e36010d4e43..000000000000
--- a/dev-util/apitrace/apitrace-6.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-system-libs.patch
-	"${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
-	"${FILESDIR}"/${P}-disable-multiarch.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-6.1.ebuild b/dev-util/apitrace/apitrace-6.1.ebuild
deleted file mode 100644
index 3439c4a28306..000000000000
--- a/dev-util/apitrace/apitrace-6.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-single-r1
-
-DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt4"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-	) )
-	media-libs/libpng:0=
-	sys-process/procps
-	x11-libs/libX11
-	qt4? (
-		>=dev-qt/qtcore-4.7:4
-		>=dev-qt/qtgui-4.7:4
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-system-libs.patch
-	"${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
-	"${FILESDIR}"/${PN}-6.0-disable-multiarch.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	sed -r \
-		-e 's:OF[(]([^)]*)[)]:\1:' \
-		thirdparty/zlib/gzguts.h > gzguts.h
-	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
-}
-
-src_configure() {
-	my_configure() {
-		mycmakeargs=(
-			-DARCH_SUBDIR=
-			$(cmake-utils_use_enable egl EGL)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				$(cmake-utils_use_enable cli CLI)
-				$(cmake-utils_use_enable qt4 GUI)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-7.1.ebuild b/dev-util/apitrace/apitrace-7.1.ebuild
index 7ebcd73810e0..7eeab3135213 100644
--- a/dev-util/apitrace/apitrace-7.1.ebuild
+++ b/dev-util/apitrace/apitrace-7.1.ebuild
@@ -22,15 +22,13 @@ RDEPEND="${PYTHON_DEPS}
 	system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<media-libs/mesa-8.0[gles]
-		)
-		media-libs/waffle[egl]
-	)
 	media-libs/libpng:0=
 	sys-process/procps
 	x11-libs/libX11
+	egl? (
+		>=media-libs/mesa-8.0[gles1,gles2]
+		media-libs/waffle[egl]
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
diff --git a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
deleted file mode 100644
index 0ced4d84cbf6..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-disable-multiarch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-respect the libdir cmake already set up for us instead of using the multiarch crap
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -184,12 +184,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- # Installation directories
- 
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
-     CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
-     if (READPROC_H_FOUND)
-         add_definitions (-DHAVE_READPROC_H)
-@@ -205,11 +205,11 @@ if (WIN32 OR APPLE)
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-     if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-     else ()
--        set (LIB_ARCH_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
-     endif ()
- endif ()
- 
diff --git a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch b/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
deleted file mode 100644
index 2d04db408693..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glext-texture-storage.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Upstream commit to support GL_EXT_texture_storage.
-
-commit 0436cc01329b6be60801dd7bfe641be7d8be5bc7
-Author: José Fonseca <jfonseca@vmware.com>
-Date:   Wed Nov 13 13:57:43 2013 +0000
-
-    egltrace: Add GL_EXT_texture_storage entrypoints
-    
-    Prototypes obtained through:
-    
-      specs/scripts/gltxt.py http://www.khronos.org/registry/gles/extensions/EXT/EXT_texture_storage.txt
-    
-    Issue #184.
-
-commit 0bacf23eacd15c8f15413b85bdcb6ccc4d288f37
-Author: José Fonseca <jfonseca@vmware.com>
-Date:   Wed Nov 13 13:59:51 2013 +0000
-
-    glxtrace: Add GLES prototypes too.
-    
-    Some applications seem to fail to distinguish GLES and GL entrypoints
-    apart.  To have complete traces in that situation, generate wrappers
-    for both GLES and GL prototypes.
-    
-    Issue #184.
-
---- apitrace/specs/glesapi.py
-+++ apitrace/specs/glesapi.py
-@@ -255,4 +255,16 @@ glesapi.addFunctions([
-     #GlFunction(Void, "glProgramUniformMatrix4fvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Array(Const(GLfloat), "count*4*4"), "value")]),
-     GlFunction(Void, "glValidateProgramPipelineEXT", [(GLpipeline, "pipeline")]),
-     GlFunction(Void, "glGetProgramPipelineInfoLogEXT", [(GLpipeline, "pipeline"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False),
-+
-+    # GL_EXT_multisampled_render_to_texture
-+    #GlFunction(Void, "glRenderbufferStorageMultisampleEXT", [(GLenum, "target"), (GLsizei, "samples"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+    GlFunction(Void, "glFramebufferTexture2DMultisampleEXT", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (GLtexture, "texture"), (GLint, "level"), (GLsizei, "samples")]),
-+
-+    # GL_EXT_texture_storage
-+    GlFunction(Void, "glTexStorage1DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
-+    GlFunction(Void, "glTexStorage2DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+    GlFunction(Void, "glTexStorage3DEXT", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
-+    #GlFunction(Void, "glTextureStorage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
-+    #GlFunction(Void, "glTextureStorage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
-+    #GlFunction(Void, "glTextureStorage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
- ])
---- apitrace/wrappers/CMakeLists.txt
-+++ apitrace/wrappers/CMakeLists.txt
-@@ -393,6 +393,7 @@ elseif (X11_FOUND)
-             gltrace.py
-             trace.py
-             ${CMAKE_SOURCE_DIR}/specs/glxapi.py
-+            ${CMAKE_SOURCE_DIR}/specs/glesapi.py
-             ${CMAKE_SOURCE_DIR}/specs/glapi.py
-             ${CMAKE_SOURCE_DIR}/specs/glparams.py
-             ${CMAKE_SOURCE_DIR}/specs/gltypes.py
---- apitrace/wrappers/glxtrace.py
-+++ apitrace/wrappers/glxtrace.py
-@@ -32,6 +32,7 @@ from gltrace import GlTracer
- from specs.stdapi import Module, API
- from specs.glapi import glapi
- from specs.glxapi import glxapi
-+from specs.glesapi import glesapi
- 
- 
- class GlxTracer(GlTracer):
-@@ -104,6 +105,7 @@ if __name__ == '__main__':
-     module = Module()
-     module.mergeModule(glxapi)
-     module.mergeModule(glapi)
-+    module.mergeModule(glesapi)
-     api = API()
-     api.addModule(module)
-     tracer = GlxTracer()
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch b/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
deleted file mode 100644
index 4dd3cdc6be3a..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glxcopysubbuffermesa.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Upstream commit to support glxCopySubBufferMESA.  Modified to fix compile error with egl.
-
-commit 4dc3f3bdc3611ca1b3dec402f9242a036db8c8e4
-Author: Carl Worth <cworth@cworth.org>
-Date:   Thu Oct 17 14:52:21 2013 -0700
-
-    retrace: Implement glxCopySubBufferMESA
-    
-    This enables replay of a trace captured on ChromeOS.
-    
-    Note: Replaying on EGL is not supported, (will trigger a warning),
-    since, as far as I know, EGL does not provide an equivalent function.
-
---- apitrace/retrace/glretrace_glx.cpp
-+++ apitrace/retrace/glretrace_glx.cpp
-@@ -111,6 +111,16 @@ static void retrace_glXDestroyContext(trace::Call &call) {
-     delete context;
- }
- 
-+static void retrace_glXCopySubBufferMESA(trace::Call &call) {
-+    glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
-+    int x = call.arg(2).toSInt();
-+    int y = call.arg(3).toSInt();
-+    int width = call.arg(4).toSInt();
-+    int height = call.arg(5).toSInt();
-+
-+    drawable->copySubBuffer(x, y, width, height);
-+}
-+
- static void retrace_glXSwapBuffers(trace::Call &call) {
-     glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
- 
-@@ -173,7 +183,7 @@ const retrace::Entry glretrace::glx_callbacks[] = {
-     {"glXChooseVisual", &retrace::ignore},
-     //{"glXCopyContext", &retrace_glXCopyContext},
-     //{"glXCopyImageSubDataNV", &retrace_glXCopyImageSubDataNV},
--    //{"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
-+    {"glXCopySubBufferMESA", &retrace_glXCopySubBufferMESA},
-     {"glXCreateContextAttribsARB", &retrace_glXCreateContextAttribsARB},
-     {"glXCreateContext", &retrace_glXCreateContext},
-     //{"glXCreateContextWithConfigSGIX", &retrace_glXCreateContextWithConfigSGIX},
---- apitrace/retrace/glws.hpp
-+++ apitrace/retrace/glws.hpp
-@@ -127,6 +127,8 @@ public:
-         visible = true;
-     }
- 
-+    virtual void copySubBuffer(int x, int y, int width, int height) = 0;
-+
-     virtual void swapBuffers(void) = 0;
- };
- 
---- apitrace/retrace/glws_egl_xlib.cpp
-+++ apitrace/retrace/glws_egl_xlib.cpp
-@@ -244,6 +244,10 @@ public:
-         Drawable::show();
-     }
- 
-+    void copySubBuffer(int x, int y, int width, int height) {
-+        std::cerr << "glws_egl_xlib: Warning: copySubBuffer Not yet implemented\n";
-+    }
-+
-     void swapBuffers(void) {
-         eglBindAPI(api);
-         eglSwapBuffers(eglDisplay, surface);
---- apitrace/retrace/glws_glx.cpp
-+++ apitrace/retrace/glws_glx.cpp
-@@ -213,6 +213,12 @@ public:
-         Drawable::show();
-     }
- 
-+    void copySubBuffer(int x, int y, int width, int height) {
-+        glXCopySubBufferMESA(display, window, x, y, width, height);
-+
-+        processKeys();
-+    }
-+
-     void swapBuffers(void) {
-         glXSwapBuffers(display, window);
- 
diff --git a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
deleted file mode 100644
index 08ce65e2fc0a..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-glxtrace-only.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 3.0 version of patch to apply against 4.0.
-
---- apitrace/CMakeLists.txt
-+++ apitrace/CMakeLists.txt
-@@ -30,6 +30,7 @@ set (ENABLE_CLI true CACHE BOOL "Enable command Line interface.")
- 
- set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
- 
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
- 
- ##############################################################################
- # Find dependencies
-@@ -248,6 +255,8 @@ endif ()
- # - The packaged versions QJson are very old, and do not support NaN/Infinity.
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no
- # binaries at all.
-+if (NOT BUILD_LIB_ONLY)
-+
- if (QT4_FOUND)
-     add_definitions (-DQJSON_EXPORT=)
-     add_subdirectory (thirdparty/qjson)
-@@ -257,6 +266,8 @@ if (QT4_FOUND)
-     set (QJSON_FOUND TRUE)
- endif ()
- 
-+endif (NOT BUILD_LIB_ONLY)
-+
- # We use bundled headers for all Khronos APIs, to guarantee support for both
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
- # are so intertwined that conditional compilation extremely difficult. This
---- apitrace/retrace/CMakeLists.txt
-+++ apitrace/retrace/CMakeLists.txt
-@@ -11,6 +11,8 @@ include_directories (
- 
- add_definitions (-DRETRACE)
- 
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
-     OUTPUT glretrace_gl.cpp
-     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -259,3 +261,5 @@ if (WIN32)
- 
-     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch b/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
deleted file mode 100644
index 5b49808ada9b..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-memcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/465504
-http://github.com/apitrace/apitrace/issues/118
-
---- a/image/image_png.cpp
-+++ b/image/image_png.cpp
-@@ -31,6 +31,7 @@
- #include <assert.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include <fstream>
- 
diff --git a/dev-util/apitrace/files/apitrace-4.0-multilib.patch b/dev-util/apitrace/files/apitrace-4.0-multilib.patch
deleted file mode 100644
index 6ad78c7cde08..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-multilib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Upstream commit to find wrappers in lib64 directory.
-
-commit 3f9c2ecf18d8fa37fad5a7062f80952692eaa8e7
-Author: Alexander Monakov <amonakov@ispras.ru>
-Date:   Wed Oct 16 20:51:47 2013 +0400
-
-    cli: use $LIB to handle multilib automagically on glibc
-
---- apitrace/cli/CMakeLists.txt
-+++ apitrace/cli/CMakeLists.txt
-@@ -31,6 +31,7 @@ target_link_libraries (apitrace
-     ${ZLIB_LIBRARIES}
-     ${SNAPPY_LIBRARIES}
-     ${GETOPT_LIBRARIES}
-+    dl
- )
- 
- if (NOT CMAKE_CROSSCOMPILING)
---- apitrace/cli/cli_resources.cpp
-+++ apitrace/cli/cli_resources.cpp
-@@ -32,6 +32,20 @@
- 
- #include "cli_resources.hpp"
- 
-+#ifdef __GLIBC__
-+
-+#include <dlfcn.h>
-+
-+static bool
-+tryLib(const os::String &path)
-+{
-+    void *handle = dlopen(path.str(), RTLD_LAZY);
-+    bool exists = (handle != NULL);
-+    if (exists)
-+        dlclose(handle);
-+    return exists;
-+}
-+#endif
- 
- os::String
- findProgram(const char*programFilename)
-@@ -76,6 +90,17 @@ findWrapper(const char *wrapperFilename)
-         return wrapperPath;
-     }
- 
-+#ifdef __GLIBC__
-+    // We want to take advantage of $LIB dynamic string token expansion in
-+    // glibc dynamic linker to handle multilib layout for us
-+    wrapperPath = processDir;
-+    wrapperPath.join("../$LIB/apitrace/wrappers");
-+    wrapperPath.join(wrapperFilename);
-+    if (tryLib(wrapperPath)) {
-+        return wrapperPath;
-+    }
-+#endif
-+
-     // Try relative install directory
-     wrapperPath = processDir;
- #if defined(_WIN32)
diff --git a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch b/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
deleted file mode 100644
index 68468a30bde1..000000000000
--- a/dev-util/apitrace/files/apitrace-4.0-system-libs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Find external system libraries for ebuild.
-
-Updated from 3.0 version of patch to apply against 4.0.
-
---- apitrace/CMakeLists.txt
-+++ apitrace/CMakeLists.txt
-@@ -224,23 +224,14 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
- # - on unices to prevent symbol collisions when tracing applications that link
- # against other versions of these libraries
- 
--set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
--set (ZLIB_LIBRARIES z_bundled)
--add_subdirectory (thirdparty/zlib)
--
--include_directories (${ZLIB_INCLUDE_DIRS})
--
--set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
--set (SNAPPY_LIBRARIES snappy_bundled)
--add_subdirectory (thirdparty/snappy)
-+find_package (ZLIB REQUIRED)
-+include_directories (${ZLIB_INCLUDE_DIRS})
- 
-+find_package (SNAPPY REQUIRED)
- include_directories (${SNAPPY_INCLUDE_DIRS})
- 
--set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
--set (PNG_DEFINITIONS "")
--set (PNG_LIBRARIES png_bundled)
--
--add_subdirectory (thirdparty/libpng)
-+find_package (PNG REQUIRED)
-+include_directories (${PNG_INCLUDE_DIRS})
- 
- if (MSVC)
-     add_subdirectory (thirdparty/getopt)
-diff --git a/cmake/FindSNAPPY.cmake b/cmake/FindSNAPPY.cmake
-new file mode 100644
-index 0000000..5cd64c3
---- /dev/null
-+++ apitrace/cmake/FindSNAPPY.cmake
-@@ -0,0 +1,31 @@
-+# Find SNAPPY - A fast compressor/decompressor
-+#
-+# This module defines
-+#  SNAPPY_FOUND - whether the qsjon library was found
-+#  SNAPPY_LIBRARIES - the snappy library
-+#  SNAPPY_INCLUDE_DIR - the include path of the snappy library
-+#
-+
-+if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
-+
-+  # Already in cache
-+  set (SNAPPY_FOUND TRUE)
-+
-+else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
-+
-+  find_library (SNAPPY_LIBRARIES
-+    NAMES
-+    snappy
-+    PATHS
-+  )
-+
-+  find_path (SNAPPY_INCLUDE_DIR
-+    NAMES
-+    snappy.h
-+    PATHS
-+  )
-+
-+  include(FindPackageHandleStandardArgs)
-+  find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
-+
-+endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
diff --git a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
deleted file mode 100644
index aac018e65817..000000000000
--- a/dev-util/apitrace/files/apitrace-5.0-disable-multiarch.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-respect the libdir cmake already set up for us instead of using the multiarch crap
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17f3dce..c3fe52e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -216,12 +216,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- # Installation directories
- 
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
-     CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND)
-     if (READPROC_H_FOUND)
-         add_definitions (-DHAVE_READPROC_H)
-@@ -237,11 +231,11 @@ if (WIN32 OR APPLE)
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-     if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
-     else ()
--        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
-+        set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
-     endif ()
- endif ()
- 
diff --git a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
deleted file mode 100644
index 03e6143afff0..000000000000
--- a/dev-util/apitrace/files/apitrace-5.0-glxtrace-only.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Allow building of just glxtrace library for ebuilds without GUI tools.
-
-Updated from 4.0 version of patch to apply against 5.0.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17f3dce..3bba2a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,6 +33,7 @@ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
- 
- set (ENABLE_WAFFLE false CACHE BOOL "Enable WAFFLE support.")
- 
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
- 
- ##############################################################################
- # Find dependencies
-@@ -301,6 +302,8 @@ set (MD5_LIBRARIES md5_bundled)
- # - The packaged versions QJson are very old, and do not support NaN/Infinity.
- # - To make it easier to build the GUI on Windows and MacOSX, as there are no
- # binaries at all.
-+if (NOT BUILD_LIB_ONLY)
-+
- if (QT4_FOUND)
-     add_definitions (-DQJSON_EXPORT=)
-     add_subdirectory (thirdparty/qjson)
-@@ -310,6 +313,8 @@ if (QT4_FOUND)
-     set (QJSON_FOUND TRUE)
- endif ()
- 
-+endif (NOT BUILD_LIB_ONLY)
-+
- # We use bundled headers for all Khronos APIs, to guarantee support for both
- # OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
- # are so intertwined that conditional compilation extremely difficult. This
-diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
-index 4e37979..2607ddf 100644
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -11,6 +11,8 @@ include_directories (
- 
- add_definitions (-DRETRACE)
- 
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
-     OUTPUT glretrace_gl.cpp
-     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -282,3 +284,5 @@ if (WIN32)
- 
-     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
diff --git a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
deleted file mode 100644
index bc6ba03060a4..000000000000
--- a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
-
---- apitrace-6.0/CMakeLists.txt
-+++ apitrace-6.0/CMakeLists.txt
-@@ -280,15 +280,6 @@
- ##############################################################################
- # Installation directories
- 
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
--endif()
--
- if (WIN32 OR APPLE)
-     # On Windows/MacOSX, applications are usually installed on a directory of
-     # their own
-@@ -297,12 +288,8 @@
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
--    else ()
--        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    endif ()
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
- 
- set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 7e0a3f3a4d5e..932ad0c7edf7 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-    	<email>EoD@xmw.de</email>
-	    <name>EoD</name>
-	    <description>Maintainer. Assign bugs to him.</description>
-  	</maintainer>
-  	<maintainer type="person">
-    	<email>xmw@gentoo.org</email>
-	    <name>Michael Weber</name>
-	    <description>Proxy maintainer. CC him on bugs.</description>
+		<email>EoD@xmw.de</email>
+		<name>EoD</name>
+		<description>Maintainer. Assign bugs to him.</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+		<description>Proxy maintainer. CC him on bugs.</description>
 	</maintainer>
 	<maintainer type="project">
-    	<email>proxy-maint@gentoo.org</email>
-	    <name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="cli">Enable command line interface</flag>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d1c4eda93630..04f5c32287f6 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,7 +20,7 @@ DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5 WHIRLPOOL c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
 EBUILD cmake-3.10.0_rc2.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
 EBUILD cmake-3.7.2.ebuild 5503 SHA256 1f8fde3a0b989b81fa89d4149a9422d118b0459925de3c56106bedc9808f5310 SHA512 8c8b96355c6edf0e84e3cf837042922bc5558f8c488e9ef718553c28eef10bf630671b66a6205cf495e22ceb220fb37c2a7ea1926a5271a63f8c402626dffbb5 WHIRLPOOL ccfbe6cc7c39db516d7fb294a5f656a89d9f8ff9cfb256c389a3e20fe9a3b6c8d3c93b277f71ab4928bfaa88b4de48a2e76a4898caf71782dae9387fd30607e6
-EBUILD cmake-3.8.2.ebuild 5722 SHA256 55fcb6fcb1610d608e66c608dc0b17319db4d89b44c8c3bbebaf3d1d64a698e3 SHA512 c6415dff3a55b7b86088f1b5a5ca89eb33be13981253170c49f5c65c3a88d519b83478bd7159d23ce1e0eded95657771dcedf2257de20412f7138d5e49dd2353 WHIRLPOOL 9a2b275dd8bb1123be67c3512534a6ffb16114cee97c648fa1c31fd918f000b0d80c9875c41923ab979dad5e65008b0146816eee0963511229254dea8fc8b75a
+EBUILD cmake-3.8.2.ebuild 5718 SHA256 40346555e866d5fe562d5dfa13332473d7ea752ecd69d90c35db8735577a495e SHA512 906412ef4eec46e4b993ed8d9ec1da36f0c7b0b29881cd0e47c22d07b04024ae532fcc269502b2810a14ca75a6d3f5addf250dfc1a39307bdda35d1c5747dd9b WHIRLPOOL fa6c94c4a9d1c24edd9cff255a5007addfc4f49a3a6cf90ad3a8ba1b70087a6581a774ad9414f4e5df7e8e8e007170f875e4477b0d00b5459f2b4973d3716029
 EBUILD cmake-3.9.4.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
 MISC ChangeLog 19332 SHA256 2a3d0d8e5bfffb597c1906abb1eca3af3f997ac21673c469afbf6158a6b81b61 SHA512 83435d8060bf76931f512560a3ac4e9ae1f76073e9b8d05f75a5a4fb5d809a949bd55c4891b72475c7f8e19a4d31eb9e23799131fdc66ead7877790d43d3337e WHIRLPOOL 5e3bb823b8460257e98e0431bf55d44e5279f993724293f421e8348640ccf59980ca804bb247dc1f0f19d45aec45245dbf2f6c5d6bd075ed6350167782412c52
 MISC ChangeLog-2015 51428 SHA256 7e79c94e1bc0bc7071915d8e7bdba4812c823812de795931aec29749c410bb8e SHA512 cf217bebf0e7cfcb5771dce5a6df4fb9a4ecf77d296928de0dd2f3f34852a509a403b5b6351b49ab0ce6de755631d7e01b395a5bb9d6be5d6aa49f00185acc8a WHIRLPOOL 8f8585bf220e0a89a7f404108fdd4bc290ca37daf5d24ec3244b0bea8616b066725d7800d94697696a98fd49d6cb7cf834014ff4a0a2b77641119af3a186d451
diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.8.2.ebuild
index 15c2fb44f896..0faa524dfd2a 100644
--- a/dev-util/cmake/cmake-3.8.2.ebuild
+++ b/dev-util/cmake/cmake-3.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index e5e8cb20ef2f..3521eb10fc16 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,7 +2,7 @@ AUX ninja-uclibc.patch 526 SHA256 5864494d956310fbc8abf6d7dd7cd8968eb483a1da0468
 DIST ninja-1.7.2.tar.gz 180611 SHA256 2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64 WHIRLPOOL 43623778d3f96a87efb4bfd272075b257ebba3760d315c5650fa74493e2193699401c9b6d35d679e7c5235456d48674ac7e913fe1d45b5b98c2542c3b0a72e44
 DIST ninja-1.8.2.tar.gz 185226 SHA256 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 WHIRLPOOL 7afc5a6ba34f5c5b464ed47af8e0b5e50bc02a81beb4e5719e19348d60057e6cd3f156ef20f77646fe883b8becc1298d7998d85f1d8bc07ee6b0bd415a58aa2f
 EBUILD ninja-1.7.2.ebuild 2654 SHA256 f1e1da387aacfe5e7e20a410fccbe936b6b35ddfd81f6cc20d6e994184be5d04 SHA512 715d1473f7515354f0c3f3d8c7017abbf45509c477b1d66f6c4e7cd3d2dac0d85fe68a35feed89c77be4d1d10540039a9966abe35c453d3bb6965709686e0cd3 WHIRLPOOL 998aaf6b6ed4493b74b01dd74a80dcb85a6b4f656b2ef2835db58c0cf5fee418c61422ec41f9aa0462e3e1253be3c15c13f0bf1fa52c6334313f850a5d8f6666
-EBUILD ninja-1.8.2.ebuild 2616 SHA256 fb50fea53ffb0a670091cdd8ac8b7b88ffd236319d9485bc2f74840ab14ae01c SHA512 a1cf6b878c41ac8274c03abfa6c8c7b90b0fb80ec1c17664846fe5d995555036ba409e30e62a466046d326a56a0e292f18ff5b2c4b8e71c0d7f6e2a825f3b39d WHIRLPOOL c77957563226419e4246ef3b279db28379f0d606c53ac61ba593429ed7969dfc710e08cbe6322ef35f0ad03673f2bb6a4ac71cb9ebe751176b33d60d08c039a5
+EBUILD ninja-1.8.2.ebuild 2614 SHA256 a8052df0c7f255f373d0df51391e2023704e85188982bd67efcfc15be68e7084 SHA512 356613554f491e50d95afc5659360f735d3aa4e1ed45ea30f2ceb3235f864b59688107614244d029e3cdc3917399e1d9f8c06d5718911b0dde735ec932745274 WHIRLPOOL 66abe63d2eac7c85b8af0bba0a367cefdf054e9ef1e11e8ce6be0173b25553889128892d318a8d7ad4a933734a8d790fde20e7bab6914251868463d3b0a4b4cb
 EBUILD ninja-9999.ebuild 2617 SHA256 b92033b3a4b37c5f5770e3c1c1fb3b379b8c2dc72d78cba37f7640f80dd60096 SHA512 510034c91bc8be87f2e267e3d38ef86f0fe27dc8d2ca634e302b47a1752cd7caa379055f91c493d248693ae5c472ca4987870f0f126b41be0507dd0872ebcce8 WHIRLPOOL 2e0a8b4949f31056d4262d6937dfec1a7c5693d3e42bf1acc8f6c6ebed53ddb0c796bdc5ae27aac69a787022d5c82728d51abcfcca08eb45376bcf901a1e12cc
 MISC ChangeLog 5535 SHA256 06426d51846a9e0a803d92040f79bfde06554f00ff4999f8311e482d5305b62b SHA512 f2fffa79fb37ee24f392afe8a55e9cdcccf3b91a0191ff0573ca05b6b5e737ae16c367ed33e830ba70590829809f89ff45eff90f9d50bcd1a14b59f73bcabdcf WHIRLPOOL f11e09e4eff52d5b0e76e759005b5d2eed7153d679664bea5cd919dc3ad9515d711dde733da6c8ddeaf57476f341844ad1cafe45971bb32d029ed71e99a6bcea
 MISC ChangeLog-2015 6583 SHA256 bddeb0e9007198ddea2c83fa3d9fedfeaac320a7bcb78d75c7e272d3705f2d44 SHA512 62420fba29520829755b371c15d3e5abda58e62bbfbfef9c5ef81843fbb4053ad50f68c2919ec54ea9d32a1a7ecfd444ddab92a219ef19b8b95b8ef03e016e1f WHIRLPOOL 7819fc4209a88659bc3c1a202453a8d153a81ff78373924c0baff929689c3f1815fd7b9acfea04692fb747e116b4b77fa50aeb88fd0548057022defd6f04e373
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 20034f8194a0..cf9df1fec31b 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index d594dfa67fd4..a8d4c82cbc47 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,7 +1,7 @@
 DIST source-highlight-3.1.7.tar.gz 1600692 SHA256 e1b2e007cdd94595393d42510e2a84763c36aad3409f0c3087f05fcb50a389e8 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8 WHIRLPOOL 3d99a135abef73e865d2729bcbdf47fc7c143aeef91015b73a87d4a129323ca95aac153c3fa7d5207afb2a03ecba2f05db3e3ed8627b1e0477dcd9dfa830bbb7
 DIST source-highlight-3.1.8.tar.gz 1648351 SHA256 01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c WHIRLPOOL a05c3028816d0e0f0236ed18b806ce7f9f8f82be61b142774fe2156543c577bfcd5fb49bb259f03b4e97d5c01b5292e3b82720e29ccafa3a6bd7661f353ade5d
 EBUILD source-highlight-3.1.7-r2.ebuild 1156 SHA256 9f000c1eaa884515fbd7ef9cac72de9eb5ecd38eaec5984d97c763d50e43d49f SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075 WHIRLPOOL bc3e156e85e3d6c3b0c0461da5419877a6a962a05da6749143250a2036b02fae1e46a9280efbc7e5107a99a5de55a38382cb401dc3a22364a34bbaebd036ac47
-EBUILD source-highlight-3.1.8.ebuild 1275 SHA256 edba0d9846ce853aac2ffc5dc24a6ac6dd20165262f02334b1aec53e82683624 SHA512 b8a514aca099b6378287334e7df0e5849ee80f54e4824f6ff076ab2206f74275cfa07acf2590f5dadedfb8e64b168eb29e74a0243f188ca05ccdc3f20cfbc029 WHIRLPOOL f27c059c8ca43c4a71bfc97cf57dc0a1a4efad2f006e63400cf80217f52de1be9f838849190333c009bf598f976cf93213d49990c0392a3524cbfb321dcda96a
+EBUILD source-highlight-3.1.8.ebuild 1274 SHA256 7e91fcb2582ed64062d1d4db3ee4244586d96c1ffa1eec8ebf6444bd1fc88472 SHA512 ce6143846ad8d4338c9a3b5c897f44a0f34d3fde0180fd3f84beb8c45f4e2e415eac8dbd01769fef179ce79c2fa453a079a88a5662be52d09dcd8679812013ab WHIRLPOOL d1bbcb846d0e13f4387297e6c4d2277a87f52b86f588e32fd1af6d4b654f0fde596957323b52f0a4d2ccf2f65e6c0a1fa0db8bb7e89fea2f84901e63c517079c
 MISC ChangeLog 2658 SHA256 3ce8341779514bdbd2b350655d0806e56a921b10790c3c1096da9dedcbd05f21 SHA512 fe132fdbb7b7f1dcd3cf6077a0ac1cd03736acd0d5c1beb52861d1aa12de34fbc60fb2e8c3c55d72887b3d86c42170576a8bf0bf0cbaf6e9ca9570f3d99bb559 WHIRLPOOL 110a8acc4f7f162d557464d9288411178b5a67b4960ea41906121aa72bd105447ad40795929adea99ceac6695c497a1a5f7f49d5d61327aabb6c2a1555f45ee7
 MISC ChangeLog-2015 11116 SHA256 a0c4f9c8ad1fd05e3457f5625bd43b3adf5ddd2b35ef60d79c0ae5c9fc334bc1 SHA512 3ee6493d2a3d58a8e59bcc0760c1b8489e66cee03471d03b626bf322a4f9e184f6a725cac64a43c7e49dfb3ad3acfe9fe8f8bb6c207465e9290411e9923cba8b WHIRLPOOL 69b51e97b6eb22a9453649ba283dadbfb0ab585bda0b91076dc7b51a5ca54cde3a05e1a687f38951edd1193a8c726b43134323f6f29a0511611d56cf4f1f6361
 MISC metadata.xml 250 SHA256 e950c68e7a4e72f8096556d6bb21fea300438999061af252e040672516b06351 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343 WHIRLPOOL 7804a583de98e5ebb9478b76dd2a78071f8fe6973d88692ae4ec9107dd1dd7c54fd11baf66339a9ad4267da708ffaae3d8b1d0bf332db2d5db9feac46b6856f1
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index 26e96bfbcc65..71d1d5c44a95 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/games-arcade/yarsrevenge/Manifest b/games-arcade/yarsrevenge/Manifest
index 397e991f6d85..b309a82c73a0 100644
--- a/games-arcade/yarsrevenge/Manifest
+++ b/games-arcade/yarsrevenge/Manifest
@@ -5,4 +5,4 @@ DIST yar-0.99.tar.gz 535043 SHA256 2aeb58bd1fedaf5d35f217dc0be13457edec48cf890a7
 EBUILD yarsrevenge-0.99.ebuild 647 SHA256 f3657a26168c4ba4958d939fdc44fc78011b58800923849e8774cd924d934550 SHA512 c2c4ae671100879715ce122a3d7bcbdc26e0a97c2fa6822eabc52fd89af77e35de973d248c29bc30603f9b2a476463379bb19a266d41839a1b4cd5da503fa01b WHIRLPOOL c2acb996f9e976572095f07879eb84336820a5f296913044d3e2b2aa4d8d2e5cf3e73c143a6f01635ed787dc70b686755a1a98aa88adecf525909f8e0958f6be
 MISC ChangeLog 2689 SHA256 0de9d05d85d9684a615094dce08416e6afe77e190cd8dc562a6313b18fdec25d SHA512 c0fe9a47375d67bbe5e249ed5e6a63dfd0e4977d0984c0f0577cec14e5c1f25dce23ca4da7e06358e9c939075eb40d720a0c85ee503618c2c5e1661f2f43ac2c WHIRLPOOL 5e90f9b2ce911357c74561ec03d17dfaa77bffd2bf052da595a825fff09f88d4441d5119e25d8d5580460fabb7c614830fb1ad603c383fcf0c8a99c9e0f70788
 MISC ChangeLog-2015 1748 SHA256 7955fb6215b0a5a886965e68dcce09d6905384d51e2322ee12cfbd32dbf2a498 SHA512 d2881d3f2d9edd705f310c0448e710939cb57b86210c4d83d6a8fd8b0da44bfad40c803e1bef50e822eb0299dc5292f246912bec46b49b1b48e78ea7056d47ad WHIRLPOOL b754b812a2b23cbec1a2eb0f7a65872885f1e954b2e18f1ff91e5e9a52b0e3ffcb3e7972ebdc3f98ed410a747431e5e29f5ebbfc8c9529369a6c8e7973b5fed4
-MISC metadata.xml 502 SHA256 675c7b26b6ea3e0da65fa2da24a75d414496d488ee2deac6f52e381c3f89cafd SHA512 b0882ac57b767f41e07189d3cd9a5f09fbe101dda1bb946980485ad99f91601e1107dd04bbb19a0d950027631c655fa860493d0559f9a79182b0b902e9aa096d WHIRLPOOL c3266a7b178fb640192b3eeb57835aab31ed5d8131cd89213cd6972121b56ec36a71a1a3d3239244c1d4735257c4edde05559537d2dffcc5ecddc3fc70fb89d2
+MISC metadata.xml 501 SHA256 687c408bbb11c70b9acf731842fd4d0f11676c6ab94509e135b5550f880c59b7 SHA512 c822cb194e0fbc444a4b5a577d2abb319d010318cf2107507c87d24ca9ade92e2ce1afddac8d196f3f23667a3401224868ae157a559d761bc09ef668aa5406f3 WHIRLPOOL 7aef3170fd12f343824d61f687d631147b4998527d7b404ff658b52124b2828a386eed8d5ba1f808c6273ff8a4423b158913a2467d579309c551dd9033451b61
diff --git a/games-arcade/yarsrevenge/metadata.xml b/games-arcade/yarsrevenge/metadata.xml
index 4d2dc69a11bf..9a4a1e47a78a 100644
--- a/games-arcade/yarsrevenge/metadata.xml
+++ b/games-arcade/yarsrevenge/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<longdescription>
-A rather wierd shoot-em-up game that originated on the Atari 2600. It's more fun 
-than it looks. Just released so might be tweaked.
+A rather weird shoot-em-up game that originated on the Atari 2600. It's more
+fun than it looks. Just released so might be tweaked.
 </longdescription>
 	<upstream>
 		<remote-id type="freshmeat">yarsrevenge</remote-id>
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index c4f2affd8015..a4a7ad5f6be3 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,7 +1,9 @@
 DIST attica-5.37.0.tar.xz 60616 SHA256 573c71704b4116e82a9866a86b90e375a1f5022563246b14bb0866963899588e SHA512 4b37a553ea224cd4f37bd12492bf05646527849dcb3a6b66430ea0f4978dd18c2481a0d8793a05c768e6849b11b00f0deea888591ecc8d3f51323d266257f80f WHIRLPOOL 2df0bb9677b5189aee8e3f2e22ba7c84a96107c214e4bba1af8adfbddbcc5b7580b28fdff6a8015a45179b2ddad3ad2547f066c2c5a28b292fddf7ce6268dbbd
 DIST attica-5.38.0.tar.xz 60636 SHA256 26f124e686d4a1ff005798958d63ddccd0bc23a763ea0578c4d2337a1a6b558b SHA512 acd69c9e9955062ebd362ab6d2e247e3b37a12f9d470197426f90798b422c64f198a93754d408be72b0e442b97b161218349a71761f6156c87c1feae6f62b2f6 WHIRLPOOL be82a2d2fbdb870e5882711add1afe0bb4e42d362ab9e9c3694c3351d32bb0d57bc1eac13193c065adcaddfd6767d8095b24958e7fdaff6f72cc6f3a5d12185f
+DIST attica-5.39.0.tar.xz 60632 SHA256 4ec1527e54e029c88135b5ed4851874ebb19a566b3c690c62ce6118b42112795 SHA512 7614a684fc09e721f470b46f00a0f3ba5c9355efa6873d9bdeaabf6e44a087703434c47753f380fe7797ad95d4be984f0074ddbc48cce1e1e27aa733ae5b8be8 WHIRLPOOL 8b5749af27265d28c3b44fc8c7359ae0ab271d8a5eea1c265ebf74e294563b9746ffcd53581d7ee8b4e057ee33422f2d9fd706cfaa69278b0712799be74092ec
 EBUILD attica-5.37.0.ebuild 321 SHA256 03a1030fc71c516f1e3de1d73efaf9eb78db6b00186930e7fd014541b00638ea SHA512 d3cd744fbe3bc24974c8093c97e19067f8e95f4f1991b56a79593a7cc6d0e7eaf67a91cae6b156feb152c7b7b0acd06d95beac505f75f94629a9ab5636ded24b WHIRLPOOL 1c9edaa99f787588f2bc10831be8cf188bbe2e5bb5d5acf338c6dcbd235ceba1737f736d1e72b0ee3fa0865531cc7c580fd898c420ef7b5baf7de7ce6051488b
 EBUILD attica-5.38.0.ebuild 323 SHA256 724a3e9618b3ec6c260ba7759ba67fa092ef3041f12feb008baf493821f1dfb1 SHA512 fee4a77560f9d2042f10ceaa7b9f7e63c556fa574d0061b51a79ef0c21c63d95c71e777c23ba6d09d3c74a85b44ca959d57e6fc49e72ee8a3389332d7bb1d1af WHIRLPOOL 9fc023738f1a5db6399a660c972b27d2b479981ac7c8e41e34625bf79bc12c0ba076dfd9793bdc4d2dbccd40d632d5627b7e07ff8a3cc699ec6bf43641326f68
+EBUILD attica-5.39.0.ebuild 323 SHA256 724a3e9618b3ec6c260ba7759ba67fa092ef3041f12feb008baf493821f1dfb1 SHA512 fee4a77560f9d2042f10ceaa7b9f7e63c556fa574d0061b51a79ef0c21c63d95c71e777c23ba6d09d3c74a85b44ca959d57e6fc49e72ee8a3389332d7bb1d1af WHIRLPOOL 9fc023738f1a5db6399a660c972b27d2b479981ac7c8e41e34625bf79bc12c0ba076dfd9793bdc4d2dbccd40d632d5627b7e07ff8a3cc699ec6bf43641326f68
 MISC ChangeLog 9016 SHA256 4c59c8c3e1288b27516b9121bfa5472deab1961730622295a914326c3c7240be SHA512 b2927abedfe2b3189efe5cf1d3e53ecd07cd4aba45139edac4c65e8a3dc93ed2ef771351ea25df5537ef8246408d5ddf555e4c7b2a88024cdde170a544aa668d WHIRLPOOL b64781f0ec1f9269dccb3e7308876bcf26ddfa4cf10e6d6c671a2fc53ace8ce3b4792dc2606f67c08d071310454f9f6c7ce2ba8e02edb63d46dcf9190bde110c
 MISC ChangeLog-2015 2253 SHA256 57340d72f2f20a9f4b06833da58e33337553bbe039903e5f9c6095bf75b5042d SHA512 df38f253c17bb4f30ceefa89493636b17cddb6360e3f615ed48376d6c43f0fb78c8fa939e9ffc86a6a03c72e716eea04f2876dd1bb2b02a8e5ce179bdac27a30 WHIRLPOOL 1da84b216e829ba87e88ff9f53fd5c88f197da36d47eb879d3ef58aa98041b537d45f0f110d581d309eec3691062d22b24253de1a95d516aed4ef10f669606d9
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/attica/attica-5.39.0.ebuild b/kde-frameworks/attica/attica-5.39.0.ebuild
new file mode 100644
index 000000000000..053c76108032
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.39.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 139ef49a20ee..fdf5a90de9e1 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,6 +1,8 @@
 DIST baloo-5.37.0.tar.xz 197656 SHA256 e9706ed75af26a234108bda3b4dca308bcfabe3294a3e83620316709e90154a7 SHA512 5380042aa5ab09460d101b46d60ea89ba735251563fb88803b877af86d1dc86267470b833992e3cf3fa807a4d4ce8d183a68ce684e2e97f5a8563e85d0584b8b WHIRLPOOL a948648affb2307b13e8f6edf98fc749a453059591e8883a5f78bf1bffb1da33a5da8f5a97d8d7674bbda02007a38279feaac7ed529f0ada042364e0939737f2
 DIST baloo-5.38.0.tar.xz 197792 SHA256 31e954b94078c9a6a6ab134adc7c84299614552fe6d2e528a366bceea712a290 SHA512 39dd317c9a9b2b3ec038ad8785e9c70ef7d16ac43a36f34a12b55c7c2a505001e33db467ddad0ea2921c14a0dcc7d3bec4564b14c699101839a46624637487f4 WHIRLPOOL a6d32d330a4c1f4f2d085727526c937cc78f54a361f97c0fa18f7d98aa54c2543146b46b7ba7f7889c948abbdabdd13c6447b2d9ab991f4de7a9128fc8e9db21
+DIST baloo-5.39.0.tar.xz 197968 SHA256 ba7a9e4aa88330a7f8cfdd987187fa6622616a63f1834ec0f7faf8b4cfaec81b SHA512 ef9890ca10ea46f8e03b7ced8777502f23a7a02ac7ce05aa65745ecb06b529f9c6c7e463a507c17597341be6d7554e0203d4ff7e4fd5b92a622195dbd5bf5f04 WHIRLPOOL a1c96cf4fce95e7ac8695b725c021ea59bb313ef2afb3450c8b2c5c68413cef576c1f174ee613b000da0c3a70fbd52a651c7e2e9fdffac0dacb6e4ef03881b90
 EBUILD baloo-5.37.0.ebuild 799 SHA256 13b5c3a8c80e653fd79afc2f9fea80f740eb3d0233ba4f4dc350f59dc0426e0a SHA512 e78475cfb5527d2da5b2dc9e012dd3e9ae8df43def7d2e49b6136bdf6fae8f1b2e755c42310edbb3186c4537f38bf24785d1c0e4acfadfdcb52221a5a3cd4956 WHIRLPOOL acac6a17d917e511a625eb43dd80d084047edc94565b64470fd30c12d7faec45fb510c6b772ad414534e202b7ec304c96d6bc4928c8a435e298723f45e8cdc2c
 EBUILD baloo-5.38.0.ebuild 801 SHA256 721f1eec38646fe14c6a3739e6ed37cefcbae0fc984b6e747dc93873fb337eea SHA512 b3707a6a86354b483d0f11f4234b75041a44f25c1ffd9319ffcf5deb98f060b5a122322e24f1130743258edf732671ed7c3f4e331337f6aaad7e9a698ce86cc8 WHIRLPOOL 8533f7f4e823ca8022a326ca908188d28559b044e43cc6faaf12835c30bf74b05280d593f028866396f0625fa925671afbe9cac749d0b8abbdf4a03dfaafd596
+EBUILD baloo-5.39.0.ebuild 791 SHA256 4a16ad6cc3019d7e07742ebcb65a9c8000141cf3c65bc628180b189e3b1cafc8 SHA512 b9620dd3748d1f79685bb3ef11619c833b74532306e38fbce1e77f8d44b3177fbf6eb7051cf7d2419d9f67e46a9c254f1e6360fc469e13deefc099096b0d4fed WHIRLPOOL 0d33e0211b9ee993c77a879b15629bdf672ec31c90b65bdbc083ec8536ba86cff5a9e58567913ec8a98b360747c7ade2f0c64891529ea153be848bd61cdc6811
 MISC ChangeLog 8721 SHA256 f5b93f15944dd83dea139f2bfb53011633795fd2fc69a35adcc0ef377ec53f42 SHA512 72fcc0576e375d2935b3d1f768732d878270c860b2416f8f864a714c731f7b613ef28a368a3dae09cbe6392f2ac7439fc27806d354bd144ad0d6922002609bb7 WHIRLPOOL d74cf59119a7cab222556a384fde45bd16c9858df63ca0c87fc838251705f04fef3c28903d46f69024eb6db8d1506ff7c4416212c048a97be8d092694c2c7d06
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/baloo/baloo-5.39.0.ebuild b/kde-frameworks/baloo/baloo-5.39.0.ebuild
new file mode 100644
index 000000000000..bb4bfb428531
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.39.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-db/lmdb-0.9.17
+"
+RDEPEND="${DEPEND}
+	!kde-frameworks/baloo:4[-minimal(+)]
+"
+
+RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 716a3a62a30c..1acd14e00230 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,8 +1,10 @@
 AUX bluez-qt-5.37.0-tests.patch 848 SHA256 0ca57f37c4e7977747d4319c0e44bfd4e9119ed404ed9d8b3da2045b316612dd SHA512 661a46125eed2ab5f7b9e79be780dbbda0566120039ff68223007f36aed954bb9a1001b85a45cb54dbf6ae962d2fa49bf009d25b05f71d32d28b6dc9ef866449 WHIRLPOOL 2a925c8dab45ad8249904a4f3eb40c9dbf874603e4509e1fbc257c43959b55064bcefd654a31e2d4ba5c3d7895aefd0b94853d47dd3b6252ad7f3981b2ad3302
 DIST bluez-qt-5.37.0.tar.xz 75188 SHA256 1a6d75e8d56135eb82f658709478911f9fca9da18bcd3f594e5703abf791d6f4 SHA512 a808acd854ef1bffee0ef31abebc8bb63cc7fb09f74a09e56eaad4ef5a9b520c88ca95f06ae67c1f7419a9a0439861a1d979995e7c2e85905b2a6d7c75107b88 WHIRLPOOL d229e7cd7b8398eb42cc4c7da364a99c4d9de9cb6300696d3c57c001b3c48c7a518a9b34fc46b8b6392d8f98324ae35ebf0054d773da78ac9c5d50b818f24dd6
 DIST bluez-qt-5.38.0.tar.xz 75104 SHA256 9b532f16b8a226f48dc8e09f00ae1896aef14f4ab211db3fdbab6a729faf5641 SHA512 108b2153f30c6ded6c567631bff936f937f0ac901826ed0b7e7d86c1416c26bb456a07731a30f09bb55a602e6b2c9bc2d498483d40abb8733c2bec814d027445 WHIRLPOOL bd92019cc9f89d2a81b333d4f72b0936e01963647b69a70a20ec107c94eaa0e9f712f646728b498791d084bcc635a9b10be3424cb0d4f22af951cbd3ac09ca5c
+DIST bluez-qt-5.39.0.tar.xz 75108 SHA256 a1a992a7d4cc1808f98157664c8e8cedf28bc2c691e1b9e46d30b10fb0380048 SHA512 ddfeb9ec3cd6acf15291281b1a8dfa23d598a789d2436465450e6eb83ae6258bb50bfeef58d29f222e610ba0a20250ffb0322217f33473bf81d0e48ea02dbb90 WHIRLPOOL fa64b7e6d0fd233233a26a38f0d92927152f49394ac989607fd3291184b31523ce03f4c13078446d77103b1a622b724224d07b2b60748009300e90e4707ed31f
 EBUILD bluez-qt-5.37.0.ebuild 601 SHA256 96eeaef71acf75a5112d29f68511eae825541a1035b3b6eb2c5f04f088d2b4cb SHA512 3b0d33dfd1a6feb0b05cb3d51407ca743209db346c481b19468dbf7a64d6940eaecad2a3de909de81a7c52f4428d303df827c8734321c890d373f6f17b630828 WHIRLPOOL 636255576a11326dc6fe8ba30f386e5ac0cdde38ce6c476b4db0de345f3567b1cbaa74b660aba0ad6e6cb2e53fccc61170ae1297ecf187e53fb5ca8413234bfd
 EBUILD bluez-qt-5.38.0.ebuild 559 SHA256 543534076aa797507c6b7b60e9ba23858f873065d5ebdc10fd087063c225dccf SHA512 893396b816b1f2cedd5c68d6ad142e28ee53267ba28371f2eb8ad787aca7b0a46e4c8b9ea3365396c79535f2dda8153fb648e00766d9e1b4ce4da1563686a431 WHIRLPOOL 1bc28cfd93bdd9afb99652a00f71ba5dbc083dbfd96790a7b74e2f9199bfe3dd8db152d9d369106ead351a2ce54bc074e0fbaa82d034a49e26693618e66faa51
+EBUILD bluez-qt-5.39.0.ebuild 559 SHA256 543534076aa797507c6b7b60e9ba23858f873065d5ebdc10fd087063c225dccf SHA512 893396b816b1f2cedd5c68d6ad142e28ee53267ba28371f2eb8ad787aca7b0a46e4c8b9ea3365396c79535f2dda8153fb648e00766d9e1b4ce4da1563686a431 WHIRLPOOL 1bc28cfd93bdd9afb99652a00f71ba5dbc083dbfd96790a7b74e2f9199bfe3dd8db152d9d369106ead351a2ce54bc074e0fbaa82d034a49e26693618e66faa51
 MISC ChangeLog 9392 SHA256 3164a2d9cdd199e1f72a04859f0b4e18ccdeb678fe0dd54c1704912bf6d14db5 SHA512 2c85b20443a349c219407aa110f23013e0677f40c8a1af5e8f50f2b5542e68ab5dc38cc4184e34c753257c379b337b3bd319243f170f1954824ac55c028e2fbe WHIRLPOOL a606198e4189f50f54625e8a3458583ed8906a3eefa8642cdf77d1cbcfc779b8a15dc7e897e7cffde9c9427b9a8290b561e813bfada1fe8edb94794ea875f945
 MISC ChangeLog-2015 622 SHA256 75cfcafbd1bfc43237e3c95935def31fb8cb11a8bf291634d001fd9b7567d541 SHA512 c594e0c313dcd29ef4800c05bb1193da80e8ff55bbf9fe09940aa7a57232dbfb88d6171e85efaa8d33d1367c7235768a6011459fb643e34722d9cc6ae560328f WHIRLPOOL 1cc1fc258304f41479d10d3982b2305ac0d6bc39a9b52deb2d35c12f53b010b37c36bb8da8fd0012ed046f68851c0dc8d90e5760dbfb104e0acab922a6823fc8
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.39.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.39.0.ebuild
new file mode 100644
index 000000000000..25ac72373a6b
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.39.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 609248
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 159ea211fcea..819361b7da0c 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,6 +1,8 @@
 DIST breeze-icons-5.37.0.tar.xz 1498320 SHA256 bc2f466920bcd606f835e21733087b57cda8273881ee1713e9be5bd0e015d99e SHA512 f026bb2ae5626faf082d6f1220023551ca8b1e2665a29707cf26176d33449fd9be0954ee1b01248bc1618211541ea62e91b5423450dbc87eced847a7d8839861 WHIRLPOOL 1b3a0111f5af832170dc1129942d31d09c3af4701c05b49f553698cd0c22feb0fc8b3f0c7165a45c798ff8a4c1997d4be44ce6331524f0962764939ced09d1c7
 DIST breeze-icons-5.38.0.tar.xz 1498388 SHA256 89291dd396bd0f42e9b90eb92f46895fa461ebc2b420a58c663e0c4898894e25 SHA512 7cc7639defe51b1595e870c615acc0adedc57c6f68d656124b0bdbf32d37724f7090df043d8b42fe4369ef3572d53ee5996c60ce8052b7dfedca482dd102bb0e WHIRLPOOL d8bf8bc276b7379bd9bffcb4a4bb4354bf54468a8dd7d8d6c7835de867b29c507d2b619a09868cd8430ddd0196c860c2c21f01a418532bfce787e01c2fa87cc0
+DIST breeze-icons-5.39.0.tar.xz 1498888 SHA256 bd4077f88d106f7dcdefd8f260edbee597e72572e17f443ccd10d3a0eabb4b8c SHA512 6ea9fcc4a3aa435411064a036c3121ee596bdd76e3ffc4b88faf5206a6535ed1b0274245ef5eb405bdc0ba6e678c58a93d255555fb884e355bd66be12255e99c WHIRLPOOL 2b065c35724cd369a18fde3e10feda90cd90c5bfcd5d7e0367ef56e04521f29487852bf2a09e8a93c59f7f8599cb725858bc6c709d7c1cb5e1c53a06b3d640d0
 EBUILD breeze-icons-rcc-5.37.0.ebuild 550 SHA256 ad10406085b7beb404477bd20392ce98c232ff0079dc5a8cd2a6ae6977175968 SHA512 06298e9a368a8fff5f3ce8aba960e82ed745e6652a02a7d5760a47917fc4f3beb8d77147da99c1243622f5ea25ecf3623f7da0bad9d2d5a6618266cc8247131f WHIRLPOOL e8b5318d7a46542d16610df0873b3ffd754e6a9b36927dad87a1240729f6ec2270f2ff82f3fb7dd7cf720997284708e8ed7869f5a1752761864491a2b075e78b
 EBUILD breeze-icons-rcc-5.38.0.ebuild 552 SHA256 eb5120cea3082c74d32cc5f9395c058a0175db71be211a5cc961becbb30475e4 SHA512 5aa8d9a4eba25892db6163a8742e7679b41f38987b48d3bace9e5299815d71894e409b24236cb3c7f32e350177262063982c2478ab53c09a02f96d9a4fa7e9c8 WHIRLPOOL 7e7759e942a8eb8390cc1e467bd1f0cb878fe688083b8dd438e7a1c536496f8e3990adb48bec5489ace467be862c853b4789421c505575cd6702099215f8b423
+EBUILD breeze-icons-rcc-5.39.0.ebuild 571 SHA256 a0f86cd27d4ac06582383a01d1eaf56e55516fb11956123401e2dde8514b4945 SHA512 8a2afee307981d57d4ebab4e17b1278e26aa9b4f70f5ef57c663fa9c1cc278947406e26f0a0c3212a837d2f31a980b643db23ddfd9c34cb0810b94c131580208 WHIRLPOOL 4f631321bd420a230ae8ce9028fc154aee98b9447e7a419b4eddbd51bc0ffdffd1f7d841e587f03c31047952a780024c4b3b7acb8eebb1f705c553a0867a2cc5
 MISC ChangeLog 1091 SHA256 0103cac7c8c7799f9f1feea14c1430878d5ad089a0ae271f847215f460bae1ec SHA512 466578e60d334622819cc096d0074ca1e6ad45b42d1998fc45235a7c9986e00a2b424efcdf52d2d4e5bd42826d7dbede664a8fd59c229a674838f85e8d87524c WHIRLPOOL 5c77e4753b70fa4fd9da4b5089edcdd6f5d3e907023cec6715a00b27f431c91d3950b792ad41d82ffb7870288b5c49916a729a44be0ef84700d90a6b195425b4
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.39.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.39.0.ebuild
new file mode 100644
index 000000000000..3fe7f7bb5061
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.39.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KMNAME="breeze-icons"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=ON
+		-DSKIP_INSTALL_ICONS=ON
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index bfc5fc615d1f..9b2ad2435058 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,6 +1,8 @@
 DIST breeze-icons-5.37.0.tar.xz 1498320 SHA256 bc2f466920bcd606f835e21733087b57cda8273881ee1713e9be5bd0e015d99e SHA512 f026bb2ae5626faf082d6f1220023551ca8b1e2665a29707cf26176d33449fd9be0954ee1b01248bc1618211541ea62e91b5423450dbc87eced847a7d8839861 WHIRLPOOL 1b3a0111f5af832170dc1129942d31d09c3af4701c05b49f553698cd0c22feb0fc8b3f0c7165a45c798ff8a4c1997d4be44ce6331524f0962764939ced09d1c7
 DIST breeze-icons-5.38.0.tar.xz 1498388 SHA256 89291dd396bd0f42e9b90eb92f46895fa461ebc2b420a58c663e0c4898894e25 SHA512 7cc7639defe51b1595e870c615acc0adedc57c6f68d656124b0bdbf32d37724f7090df043d8b42fe4369ef3572d53ee5996c60ce8052b7dfedca482dd102bb0e WHIRLPOOL d8bf8bc276b7379bd9bffcb4a4bb4354bf54468a8dd7d8d6c7835de867b29c507d2b619a09868cd8430ddd0196c860c2c21f01a418532bfce787e01c2fa87cc0
+DIST breeze-icons-5.39.0.tar.xz 1498888 SHA256 bd4077f88d106f7dcdefd8f260edbee597e72572e17f443ccd10d3a0eabb4b8c SHA512 6ea9fcc4a3aa435411064a036c3121ee596bdd76e3ffc4b88faf5206a6535ed1b0274245ef5eb405bdc0ba6e678c58a93d255555fb884e355bd66be12255e99c WHIRLPOOL 2b065c35724cd369a18fde3e10feda90cd90c5bfcd5d7e0367ef56e04521f29487852bf2a09e8a93c59f7f8599cb725858bc6c709d7c1cb5e1c53a06b3d640d0
 EBUILD breeze-icons-5.37.0.ebuild 499 SHA256 086e821bb9b9e1dad8bfd3aea94f223b7ef988b68aef886c5818be33f9589202 SHA512 02bbf3bf7a7c34d7bfd96018266683151405f066ec3090becce2c1c4c2dcbf96176ba00aa4e0367f4459d4e3745ef11fffee4600f7d49e83da30729013920812 WHIRLPOOL 5640dcf7b598502e97de5174c2668f2f8bef795d244511c2d76002e5dbfef84e60aff0713272ea865e203ff90321aed7c07e4a32a79d86cec66452c6d71b816b
 EBUILD breeze-icons-5.38.0.ebuild 501 SHA256 f2c6f5a624ff3ffc96884ed2b854706b2a4b6defac750d8ddc97e8dfa931016d SHA512 79be417cf9f7eb310f3ddaa52a3da88c9a7d7fa6f9dd0ba9219d38f6c75707fe92af75408f441e24c435c35ecb16b48f5b439b06291279f849a8ca13f7e0d214 WHIRLPOOL 98b8fc826e6a777ce213bdcd7ce98f2ee09817e20fc34b2522e4bf58a56d1123a6af9ae053b034c2cd514b6047e0cc9a71c285083e28eacf997f2d54d2759ee5
+EBUILD breeze-icons-5.39.0.ebuild 520 SHA256 1fd31243ba9d72a56ae10e9b0894bbe8836679824741b473b71b5ea46cf732cd SHA512 0b6fe5e76f68cc4d60cd18f697f35bf85d1ea922e8e68f420fb0a8e6bf07bd02ef8661cf1d596e035ff6d42873357e56ea188cf7385e2790ad6f86c19d98d304 WHIRLPOOL d3b7493cd1798536ccfae4a5e044195ff08d57b72cbf42ef7bbf1b60c8841254cab055a31762cdd41c515f5c2dff6d8247cce4c8dbdb1a3a941b0da7e26152e9
 MISC ChangeLog 7023 SHA256 89992bdff2175ed593ad789d3b897e656e8ace837f0c814e917c70ff59a15fd6 SHA512 91ee0165a23b009961aaf303c5ccb29e750df3e58a7b1caabef4a09ff0e1fd88ec0a5eae4f4889d5c352e730e2b36e86d67098f98a694115b233bd55247a8e77 WHIRLPOOL 595a235be742b08c1a097d237951fc7fa9f40db8babfa04fa511acfa64b2a140cda9aa8301d51c62a394b5302cdf4d0b1e26980e9ef3d47a997a676ea30da9b6
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.39.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.39.0.ebuild
new file mode 100644
index 000000000000..4ecdb71a3516
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.39.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index b8bcea792e5d..c5ed5da2aa1a 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,7 +1,9 @@
 DIST extra-cmake-modules-5.37.0.tar.xz 311696 SHA256 26198cf05c084c158bb23f0585a9df5bba1aa16b746252c80bdf4f0261b527cb SHA512 eb064dcf03960913c41c61dcb02ed12fa1b83abe507f9b161770bae8fe32b74dee45a29b12af26e636e896b97b17221adf67ea8465fcc9ab319b4ee55ab4f8bf WHIRLPOOL 0085edc89a6ac6369b509cd16ee79447f3d6c924aa06ca8bf73471772ae03afd8d57223fad70c5d5e4e3256ffc12e1de0b9176dfdbb2526015b41230a16da12d
 DIST extra-cmake-modules-5.38.0.tar.xz 312532 SHA256 6188a8ac8d799439204f69a1eb229431fc9f196790b88d6fb72bb3d57edb2332 SHA512 c1fd65593732e57fb0822fd5bc2b06f9e35713a78f35269f387f6d9e4c87520b46f3cde039a42993139b478da5aebf1764d0111746af75bb0e5a33822684e501 WHIRLPOOL f4bf5e501f28d9e501b67772b8822eb72af934f37710d085dad6259544e1cf0e1081e18a7967e6439f126699891420014ea014f16b1080491079bd4d1dec61a6
+DIST extra-cmake-modules-5.39.0.tar.xz 312492 SHA256 b80536d7bed8c12fc492857d3d433b3859462402fe231e463efcd3bf44ffbcd1 SHA512 c41df32aa6641824b7e69b001997fa61ab4d4df9aa0b850d8eecb0e434836e35f7c928952771cb2c5258117ac318e199659991619f37ad3ff82744ab66071ece WHIRLPOOL dfbd4fb3a81260f52c3a732a44d564150ba9448dc4495ee4349bb723dab950374a806259952da63962280697480ac4692228661291167914ec9b49697f868a93
 EBUILD extra-cmake-modules-5.37.0-r1.ebuild 1282 SHA256 0ddf52eec1c845462f41ad34f4c46d4828f382e5bcc25608ff70c928a7fd049f SHA512 c52d5b2899eb2dfb2479c8df74af05fc19a64870dda36d42de03cae98cfc61a669600de8c9b22379652759774518a327172057558345108dd1095cdc3bc4ffa7 WHIRLPOOL cd256772eaea02b359e2ee124e91cfb7f5869ad8731ee873a2da37d48d9be7a01c6a7dde243ca8a38d11ab886096f691b3d17f9fdc0d49a23cd810248b9735d8
 EBUILD extra-cmake-modules-5.38.0.ebuild 1287 SHA256 814bae1fad1a11d8058e326e2bb935bb2ee5d4bd745c88008df08762aecdeefc SHA512 cc69a14305d7c85486a1f727d1244f36d3ae0342150de68541457b3080205b02bb148a1e5d4fe692dd5710be8aaaa059b680a9f7ede2fc6c54ec50f795db5af8 WHIRLPOOL b768f83b9b5323f2c57055a7d542aec1c5c8163b637fe8fe24acfd37123daabb054ce32656bfd1ed58b1e2e98c19d06104325337177f169c720ce2b8216770e4
+EBUILD extra-cmake-modules-5.39.0.ebuild 1287 SHA256 814bae1fad1a11d8058e326e2bb935bb2ee5d4bd745c88008df08762aecdeefc SHA512 cc69a14305d7c85486a1f727d1244f36d3ae0342150de68541457b3080205b02bb148a1e5d4fe692dd5710be8aaaa059b680a9f7ede2fc6c54ec50f795db5af8 WHIRLPOOL b768f83b9b5323f2c57055a7d542aec1c5c8163b637fe8fe24acfd37123daabb054ce32656bfd1ed58b1e2e98c19d06104325337177f169c720ce2b8216770e4
 MISC ChangeLog 12278 SHA256 bc89b02e2f47c64d2e4a5cfaab3f46e8766a6804cc70768924492f804a09e375 SHA512 d567ee71e39c2ef46ca6ccb39427e379102077f63bf06cff1e54e31b8698888071d8fc71f6efe2473757655e26bb8ed105b9de73fa05c55a3432a603bdfed970 WHIRLPOOL 88f3851bd40d1730325939fa329371f6a1b505b930389b51e041a9b4158011f96b5eeb7599fe90dd3376e0461cc79934d10efccd0d37d2c3f84b986889671899
 MISC ChangeLog-2015 3290 SHA256 7b649b66f01f3ac504845e120036aa3c54bc6618d6d1bba53fd101d55ed95529 SHA512 b5cb1ff703159694219268a40b35dc7e4d48dff5318beb27ca83efcf2dd2efb26e9d84ef14ed9c417fb65fdc9fa9a0ffd770135700df41123005cb52e98082b1 WHIRLPOOL 4007997ae8f633bb513413421896ae599720f72e98439de9bb50af40c4614cf0591581279ecf8f716e9c0c68a355e9a56dd00e4f81ec627207f420cec7bb13f8
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.39.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.39.0.ebuild
new file mode 100644
index 000000000000..6cb0dc2df747
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.39.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+	test? (
+		$(add_qt_dep qtcore)
+		$(add_qt_dep linguist-tools)
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HTML_DOCS="$(usex doc)"
+		-DBUILD_MAN_DOCS="$(usex doc)"
+		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	local myctestargs=(
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 9b2b60c38ed8..ebca4fef1203 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,7 +1,9 @@
 DIST frameworkintegration-5.37.0.tar.xz 1752004 SHA256 aa8ca045ba97899b739077e07a961b9e402520a0abfcee8be90baa85251c9e5d SHA512 ecff45b2d7138621b19b9b276c4a2d7940c156ee81d85789d598178179e524ed6fef014c9d6615b91d2ea9c4c9a058d5009f44899834c541c36301f9ca581dd7 WHIRLPOOL 19d6589c03fb9899b3e823304c159cd345a94735995d27e47463c12c428cfb7c75f243fb174d7f3639baef37723d7407edde3f534c361bab8314037d0698565e
 DIST frameworkintegration-5.38.0.tar.xz 1752696 SHA256 08cb88ef7c7ceb7cd43cbc7f3040daf7128d22bb75f8eb3956d55afd3e1b3670 SHA512 d7a992709c15c3fe6f4fb6ff83c75574748e2b46fd5f20e13b089fb2dbdb721d83e0d62b31230b72dcdf5f747a7a94870619b5b40868fea580c43f109f56ff07 WHIRLPOOL 0b40775a6f87a4061589ea1f9ea588978f90e5d7768c1fdce160521737c3231f95548c2b1955867283f9e754436a5609f1cdb785a247cdf243233ff754c3f15f
+DIST frameworkintegration-5.39.0.tar.xz 1752696 SHA256 50b427b53dfdf667d3e6d8de2b1662a7bea508cbf361163f0383a9e82143da8c SHA512 13959a74c08f77947d7d6a810a5bb9638a3e63437b293132143ae9668d070be81e40608bfa80cecd3d5dd59ae01b746d12e4c2db76fc99ff98216fe1eea6f89d WHIRLPOOL aa334e40c90e8f4a8458d005677f94861b5fb218c73c85edd08f0ba814350a62fd66072a47623744173e492a7854796f90a04c004e4ca40a618a7178ef415c76
 EBUILD frameworkintegration-5.37.0.ebuild 1121 SHA256 d4d61dd2cfc3467ca9a663d8c398e7fa2d96d123edd379c01a5f735930998bcb SHA512 e64c8c78af7e76916b188f18d790a1571e2e151113af5e0b41030b12f6311ba61f6ce21a0c1e52ef4c7efd392a2724b403d0edc1680edece267a61d99fc4828c WHIRLPOOL 29cac0d6511f2a0a90a4b94314cc9111559f029de118e915a16e465d109e91e9e449697300a4d300576077b6436a8a068f6baf5fd843dfebe851618c440de519
 EBUILD frameworkintegration-5.38.0.ebuild 1123 SHA256 dbbe11bfe5d32a6c72861166250d2670ae5894e3ac26070a578258d332a4dc7b SHA512 55a7815775351244ab63154ca239f662086647c4aea66160c1376ed3b5dfe5ab19deb2214bcb6b33ffe6287270573bd8779c6749b2abf5bc378507436e305e67 WHIRLPOOL 1ffa11ae93da76a13ab9f9b4752ff325f8fb0da615f87d888d3b69d205101843d0def449bb93b1e4a7df1557fdd71b484e019a10409c0af4f86e192889971422
+EBUILD frameworkintegration-5.39.0.ebuild 1142 SHA256 3f8bdfb301b2bf3fd01dc91bcfb9500200b77b2bd4a27500fd337c875b2291d0 SHA512 eca77073320a290099502c1ab2b5d5ece8a837f5cc7fda9840ca3a3cf81508955fa427154e92974974fa7e47ee9e7f58b805d71bce22bdf7b1fe48febd9bfc9b WHIRLPOOL f2e7dff244990e67b57156d37aa09b34b965da0669b3e50162d501e1c8f18e34e09c0b7c28ba2c2d4cddd6b0615fa0d1e3580e8d7cd771dc09833d4d8107f3bf
 MISC ChangeLog 10389 SHA256 32881e652a00258445987b29ce683862dcf6ee4c20444a3b140b62d246038f2f SHA512 ffd76b73c4cf58a00ac72a6197063face04b58395aa842f7a5c703be5b70dc8cba8572e75e8db7aac33312bc6d293a7681a9f66a48e8ff8570dd1c60ff72fed9 WHIRLPOOL ce04f2d31e42cfaa07442823d8a3ab20dd0581b34b414d9f7f539e21fdf9fa44a25401e9a90010868f80f286192b6e06a5b013d43e71f902f63656733cc27c88
 MISC ChangeLog-2015 3402 SHA256 fb3848404cd6473cc495040899c66a103b585e5476f22f7fbe31045e642003de SHA512 1e11e5abce6b5fe3d773aff2153b8a0f3637fba106f7b010d95ff2f9d4b9ced76a9cc9d554cd2568b7137d51d246f0f5406ff19a41cc86bf21e998ccf150e027 WHIRLPOOL 5908e491bea0e854b6819eb857b1f88c79cd579e45a3ba20ac83c4266899b6b077ded760d972a5c77576170caa17631345bfed15f45126f7c565b99b17066a9e
 MISC metadata.xml 339 SHA256 3ab215d81be8aa81ca2b6cff4724853c10b8fe356725e72ed1c507da1055c3bf SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1 WHIRLPOOL 7d697b5242b62338bb235a04a954782b0d0e31bae3607749220c2b14fcf57b803457a1913f4a751a95efad4024372efe1f04a9bf7052aca7c78a17f3a11413ee
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.39.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.39.0.ebuild
new file mode 100644
index 000000000000..9062d6d3800d
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.39.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	appstream? (
+		app-admin/packagekit-qt
+		dev-libs/appstream[qt5]
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_prepare() {
+	punt_bogus_dep Qt5 DBus
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package appstream packagekitqt5)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index fda5b32d0ab7..56f60bcdaafe 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,6 +1,8 @@
 DIST kactivities-stats-5.37.0.tar.xz 60600 SHA256 c29764a863e69f065c75827980c127357708a88dbf8d7e38af54dd73dc6ffa27 SHA512 ef60c9277adff8bec2c51051ef4e0decd62af1b0c6c90cc9a437da2c7b5cf08616adc884c66a2b421429a50b81c39df8d977b689f394944ec07a6a69782a0bdc WHIRLPOOL 16494a1fc0f4d07aba3b3467b55e3cbabde6883b698855250a53b5899aa6749db5381a50a8e08f87a999084e3016a5bbfa5a630ae7a193f7b64eba2bc2d2a6fc
 DIST kactivities-stats-5.38.0.tar.xz 60828 SHA256 a23955ce584ea0a1be8fe17b0b9cad819279b7518d3a9cf175a40e4bc08fa768 SHA512 cea77c24cb3fecc8e555075c124ad55f4fbd424e2b5e04f651c2011d21159398a41979d2381219095a78f1274de8abf61581680dc63a5acc28e92d33312ed639 WHIRLPOOL 881f22789fa022e437c630ab668daf771541789fe5e3c094c31f047d9d573fff1834d213088afc991da6b02b9767d22c6ce09bbd86e4bc2968a8cb1972430e88
+DIST kactivities-stats-5.39.0.tar.xz 60844 SHA256 9ee15060e4fc2cc6ca9d02a1a196b92c9cdedf437b4d1a56cd6838fe1e76f0a1 SHA512 20c643e3f55b977a9a6e33866dec099428ec7fb3d8e3598bd9c5ff2e446b28c90151deba3f04955617da484dffee20b937ae76dfef426ea2a06baf00f04ee205 WHIRLPOOL 33956cfe4e88ff0e981eb6b2be32fbca35ac28ecae62726e69bac5b4c6955d5ff82f1b60d1914a98d10bb7822e879a506c3a2e0d19c7d127a0357e75d4ea2d8d
 EBUILD kactivities-stats-5.37.0.ebuild 441 SHA256 e1dbc714953ddbf0e7debea512779480b91f1cb44566d202910a964f7433bb32 SHA512 7734197d1f2c6ecb9add6a805738b561ff8732136a27160b10fb72ea9bc574b7e27d72c769aa542b957efd559b0a6a95f2c83535b681741a28f9f5f09baa7619 WHIRLPOOL 75209c0877b998eec54a350c88d77eebe809b0a0ca07f81ab05b3f8f272556698eeda1db88fd7c39a3be6ad5afedeb05baab2f1ee694b8d8a6a5e6307976d7d7
 EBUILD kactivities-stats-5.38.0.ebuild 443 SHA256 252e1bf1fe01cd4598a519f179a86b7a17ebf8d303235ad57a7bec74f8440d3f SHA512 e50ddb7eceb3b6b560dfe63b7ae76e1d775d16f3980ed7552229180645b734be213a7eaaed3d4c14c287b08c35b0e0360542507f00cc860e505daca78c096b6c WHIRLPOOL 7d248995c8563fa7cd4e66c1c794c6940a84b697610dd3b18941f55485544ff028df6c13ebd4d86faeb2eb075c8fe888c9e67e562b89fc593ddfffdb2d06b79b
+EBUILD kactivities-stats-5.39.0.ebuild 443 SHA256 252e1bf1fe01cd4598a519f179a86b7a17ebf8d303235ad57a7bec74f8440d3f SHA512 e50ddb7eceb3b6b560dfe63b7ae76e1d775d16f3980ed7552229180645b734be213a7eaaed3d4c14c287b08c35b0e0360542507f00cc860e505daca78c096b6c WHIRLPOOL 7d248995c8563fa7cd4e66c1c794c6940a84b697610dd3b18941f55485544ff028df6c13ebd4d86faeb2eb075c8fe888c9e67e562b89fc593ddfffdb2d06b79b
 MISC ChangeLog 4124 SHA256 184a55c57627d2445d60860f07c34129ab2a6a7c07ad626cbee69ccbb45d9e10 SHA512 2fedb6531a5a482964909fba33ce0096f105b1bbaee801536d6ed3d2fb37b9d87e2e85d38c9f5d1cc51e5a327765d5cc4ade127a64b96bdcd515408ebd9c9bfc WHIRLPOOL 58b19ed5c060a1635d51fe05b47c0c01a82ce0622944c4606a1e34c4621d7b8ff07109a0d2561b90b655a8ceea349115b6209a3ff9f9941e63ed7752138ce94e
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.39.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.39.0.ebuild
new file mode 100644
index 000000000000..989cc6ce39a1
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.39.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtsql)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index d97c4d1fdfe5..712909560e0b 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,7 +1,9 @@
 DIST kactivities-5.37.0.tar.xz 61288 SHA256 db8857d062bb084f882731189ef66e59648b1f66f0192ea8667c4f10eedfbd00 SHA512 c226d2d0027253f3507a8f9aa5c4b5755ddfe2d20e512658fe64b263cee1120355af19207db1cc6afef8b65a6b41439672bae7867539961b783742425baa8e45 WHIRLPOOL b48c22d7d0eeb296c73e2b97118af902eb2435e0a9798a03b4e841e0c4e29971efe20c8cb7268d910d4dcfc1da0386989aea12f45d336d5e6b0baaabd5e0b5fb
 DIST kactivities-5.38.0.tar.xz 61264 SHA256 289d25367515e8d4668f460e3274b68ed6322a7f1c6228602c0f20462303353f SHA512 1de5eec964a0ffa9990162de07c9ce285a40c52a68b8c38d46966cc61e343fa2974dbd44a30731a19a40e3000ef817cd69249f0a7753e5c3d4308422a142f69e WHIRLPOOL f246fc24ccd09c6da4d28ce5bba8e8a27bd26e8b52da01ed4e3571cfafdf753a2ad460d3392b3d100c94c49207e88f26353f2fc61898bb8a0f7bda0ba2429b34
+DIST kactivities-5.39.0.tar.xz 61272 SHA256 986a0d40de1ae857639c8b2717a4cfc37288c0b7152bb3225b7e7b63cf0d6c5a SHA512 8f53eae719cf61ffe55a3d6ef5e08ce45ce0b0925f892fb2e5cff29ea5ada7f99932f46d3b29e9ab50ce782200c7a830ed590a5e67c1e9e8a35e8c09d28b70f1 WHIRLPOOL caab3798129c941ee2348e6e0ebf1777db9883b6f5b0f96088cf4ce443ead0df3af60cd813b9d15bf93032031c5cf700513994986f81c162872349202c003c35
 EBUILD kactivities-5.37.0.ebuild 561 SHA256 d45123e2c56687feb747683994b855a9d53301d227616e97e98630cc231e16c8 SHA512 2da42eb3ca20c8e217e1c1fce85d26a1ecdb121ed25eaad477e8c98551f1f9852dfa84b668fdb4492a118289a0fb5570659eab3cb0cab0734048e8eca46070bc WHIRLPOOL cae4967f71b70e150b1b40f85b4a12c9a1a169d14e598bf4480ffd5e6ad8bff0e9b6b3127ac6270aad1a2d6a492092987d0ef6aebdf464c98cf7e2c38a226072
 EBUILD kactivities-5.38.0.ebuild 563 SHA256 9ad7b0a83c5fee6c988effa327f0f8641b96020b7a92f5deacab337c2b77237e SHA512 f9b4a0b6dfced27a191f1020325681a76f0150a8c5acf46ea3bd12bd3144809ebfd44f77d120c64576d5aa5eefd04aa09887a7887a0968553e9fe92cc58089ef WHIRLPOOL b1e82f31d72db41074dd27310d002482fdc86349fbceb5131fad328d46bae7d6db27274f5b20e848d6d6f83646a2d1e27b3d9b3281fbe8099df4b398740e6996
+EBUILD kactivities-5.39.0.ebuild 563 SHA256 9ad7b0a83c5fee6c988effa327f0f8641b96020b7a92f5deacab337c2b77237e SHA512 f9b4a0b6dfced27a191f1020325681a76f0150a8c5acf46ea3bd12bd3144809ebfd44f77d120c64576d5aa5eefd04aa09887a7887a0968553e9fe92cc58089ef WHIRLPOOL b1e82f31d72db41074dd27310d002482fdc86349fbceb5131fad328d46bae7d6db27274f5b20e848d6d6f83646a2d1e27b3d9b3281fbe8099df4b398740e6996
 MISC ChangeLog 10591 SHA256 8e480f90ad6c29c04f24619c1fb6776281edbd69519ad081a6e4ef6c27151aaa SHA512 2cf01eecfb31feac98c9936136df5ab08f282127c2787153e4cec23524e36a55621841a65a1a2237a467a92c94c85ef29c2e918e27bb2cfe86de08f4966e1f88 WHIRLPOOL a3bd27341b5840a8635e4a2a6dbc02cf7bee2d6dd492b5db0115e914db978b1d0f2fa05cf7a7440ff93d48fb3da8f9a052ee1e608942333644f7cd5ee81862b2
 MISC ChangeLog-2015 2414 SHA256 17a6d44b891daedd6bc64b7e4e6bb08ee55e0f316768f798275316c59abe22e7 SHA512 cd7a93107eec8d1e1624a16da42e7c6b4e6e18ce0d8a86b07a1c19d630d970a647c8803bd9d688ef5295ad8375db90adb2b536f23025ae07f57cab289551b8de WHIRLPOOL e07be58eadbdce6e99697d74c5bc5c3f1ad39d839aee2d026c6b6b7daeddeec4384c2f24a7e80a241322a69b0b7aa510d11a58ce0ae07f60b1bd2f11b7a7b34d
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kactivities/kactivities-5.39.0.ebuild b/kde-frameworks/kactivities/kactivities-5.39.0.ebuild
new file mode 100644
index 000000000000..1e732d8b6460
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.39.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative widgets)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kactivitymanagerd)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 920792c2b593..7e976e243173 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,7 +1,9 @@
 DIST kapidox-5.37.0.tar.xz 395612 SHA256 bb3cac795319f1376b0dd7f6986a06e7a7e69aa59a6754c2864f7617ab5293f7 SHA512 0eb34eba15efca3575f66a7b2215a2da960fa9efa1b8d33bbc7cefc18e79598dc294350db14f0f168e66a1a530c0b874741fb22c7e63970dbeb2d6e68febf678 WHIRLPOOL 01698e644114a7faa62e02951e40b6fb4ed487b82e5b5ea6b0c36e7b3c09995627dabf53f3d0da7a36b5f375dff8e278e494d585964e982b6a082bd664f1bc64
 DIST kapidox-5.38.0.tar.xz 395812 SHA256 e6c8de70bd2d8fd55c8dd4f01dfb526fe3230c5094aeed5fedda360c693993c8 SHA512 41b333c6e553ad05ce0606c55554cc4247a8832cacb438cdd6428d396a3d8a9b557266bf2614369032a3091356df37086155494bbd6b75b694363eb946726470 WHIRLPOOL ce62abed760e8838e9164f22e6932125edceaadb8b60508612f82d70172e928456b9a3aa5192cfe1586f51c9a1adf8a7284cc4fd0ae8060c9cf72c179139c4d3
+DIST kapidox-5.39.0.tar.xz 395764 SHA256 d6701d35aa45b65dbf442d3325416c3100aa317a94fbeeb8f25595c782d2d58a SHA512 73550bfe148685f9aa1dea619778943bb221b589e86b094047f8b3cf0c58fd03e994fdeb914b1f6ff5dbe76271668bdf575a3adaf8e8e86d8266ca8e00980c85 WHIRLPOOL 0da0607470f37f3494c9d07bd95e0c5d8094d275a678d275b293908317dd740556c4e22fb1c92b8b9d1ea45c8de7561a15dc5495c49e153274c575896ee709df
 EBUILD kapidox-5.37.0.ebuild 612 SHA256 6a45e3bc291b6cfd2a4ff53156e3fa3f50999fbcb275cb9c9450861903d3c23b SHA512 c4d49dd0e0bd0e87e1d365db08580889f9c30006e3eec33660b3abc4d72481a2578449efec8ec6a3e4352ed79c24669f902ba899269cadb0310069434062d2cd WHIRLPOOL ca6d873a98f86d7c7c7fe4370a0eab9d3024a10d4a813457872a4ebcbdc04a6928e559b2a00925cc87221bb7ab414673dfacbd6641e2b806e3773e34852155cd
 EBUILD kapidox-5.38.0.ebuild 614 SHA256 10798c5af5319ef3b84471888f9fe8f2df4f50b6858114e1ce1f1d50a88dc827 SHA512 16614dfd8e429a658f46188e331858b0bfa93eb630ec2cc3440d385a292f98781795c79727993900e3a70cab91de8ae36f2e57513cc45d8eb719f5f7fce633e5 WHIRLPOOL 1ce059a5464650c034b4a163ee6634443d2df257c33b8ef6c3c30a0ba1d117bd61f1414858ff2cb6569dbbd3207666b9b3a66f2ca6ed9915788990e17cc1c351
+EBUILD kapidox-5.39.0.ebuild 614 SHA256 10798c5af5319ef3b84471888f9fe8f2df4f50b6858114e1ce1f1d50a88dc827 SHA512 16614dfd8e429a658f46188e331858b0bfa93eb630ec2cc3440d385a292f98781795c79727993900e3a70cab91de8ae36f2e57513cc45d8eb719f5f7fce633e5 WHIRLPOOL 1ce059a5464650c034b4a163ee6634443d2df257c33b8ef6c3c30a0ba1d117bd61f1414858ff2cb6569dbbd3207666b9b3a66f2ca6ed9915788990e17cc1c351
 MISC ChangeLog 9782 SHA256 e100e7f4819a3a27c2b0ab56ed7ceed9a3873a18fbccae92fa6b618aaeb9a535 SHA512 5187e84736760aecd3cef44c02fc167a9a84fc32db5365b9a7daf519ad6e3ec0d649bfe18158eec5f42f3e34bd722caace796bbe283de499cb3114a83e6a72b2 WHIRLPOOL 7bcce865344547f2f01b7f95d724567c4e65c21a1b2014f58e0c669e4b4fff14617f8b2f50416276c666ecf8207f83b8506cb5c147e27c974eafb1c891a5060b
 MISC ChangeLog-2015 2678 SHA256 f517c4590bae3eaca42e47f8be444b0b628d9d6ce590ad8f1ddef9febdb158ac SHA512 be9f54ce5853812add0bb071821230265759aa5d153d8e095db2a0e45fe0363194954cce42f37a9b1a90bbede296eb410e04a33ea5566759132de55f154ce4d5 WHIRLPOOL b69eb6e0c297f6c68bc1dae88ddf3a4114be8fdf7d3dc021ea6391ccbcffed5f8487b3519d907a6ddbe5995179318e494ad66cdd1c0634e53bddb9738f44d3fe
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kapidox/kapidox-5.39.0.ebuild b/kde-frameworks/kapidox/kapidox-5.39.0.ebuild
new file mode 100644
index 000000000000..76dbe6925037
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.39.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_TEST="false"
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index cc360b7cb6ca..caeefc510cfc 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,7 +1,9 @@
 DIST karchive-5.37.0.tar.xz 113580 SHA256 358648e9615f521e0d8e37f3a8b7c95ee593bf5adbad114601a7b30928a62995 SHA512 50f9298a785e3e46e4f34bcc489e59704ca464da4efbcad6c1a27e115ace7343936a1b126f0723f9acf55512ace05bba2cd37df02b2d1f54ae87b2a72c590a76 WHIRLPOOL 9a8ed7d06ee2941fd52df706ea099733c9803774c889e6da82c1ad406a15c755b0b92577d0484a8bc55bb9c6eeb2c3661f3441aeb8245fec00cc75a311b2a289
 DIST karchive-5.38.0.tar.xz 113572 SHA256 9354d45219342b888ac0eccbc3ce3a054858fcce9d4c93817352d2b447ebb658 SHA512 cfeab8d6f0be5fed2f678b8251d533b5ad359daafde1a17cdfcf7a614540e57f0b6aaf320456622bb48bdc0ee8443d60067c7613c077145a09b32fc2905ee05e WHIRLPOOL 7712784b3fa58241b815a6a663e3b24e7169118c938dec596ef6def2422d30d4b7cf9fcd9b9a419007dc8db79ae1729d4f98a87417946e0908fd15b45ce3b557
+DIST karchive-5.39.0.tar.xz 113600 SHA256 3cc31b2449bf690a3703d339875510f211dfb3d774737d80237da3474dde6865 SHA512 5151bfb0ce8b25593b0da34d376bf1c2bccdce80e8ad95ccad0c7d01aa42a8c12ffa3175192a07ae9b62f869c3b4d1df48e134d30d5506c40649fa4930775142 WHIRLPOOL 431cdad5a60b6ea298efd84539524250987a9807166c82ccd94013cbec002d74c05639fc4bd15b370af9b8eced6de5aff98cb6d491dedeaf1de118c2d07b6c22
 EBUILD karchive-5.37.0.ebuild 562 SHA256 a6b0b34be23aae14050730d2b64324334fbece0a060d22f2f23a168bd2adebee SHA512 5937a65170ef8ad79b489e746e181c4dd0457ee5904be7ec438c365385569c67bfe631b4a795b08995ea607edfd3db7f96fb321544016b709436ec9b0b10250d WHIRLPOOL 27149fb8a9207289c97a826be769fe58b6f8d0574686de7968259b70f695296d545b07af4c01c7191c66d0254fe2a3941deb80593d36c3d92db621633e8cb289
 EBUILD karchive-5.38.0.ebuild 564 SHA256 cb7b587396ac8b260fa9f47b9eee88a58860a79d710ea8747ff58a868120eef7 SHA512 6208c2d8dccaf07e31c9529ac2531fbff77ff20914a6732f290cbfb9bd4dd715db55d295a45ce5d5c702076de01115cf206bb3c423496c7e4f9e03d775a5268b WHIRLPOOL eefac053019f57a08d141a2e8b020f8a68da398c5cc6de015da8e19ca44e92d07f370c818da1827cf040e663017ba545428d624adec147d83614652b5b3c82a2
+EBUILD karchive-5.39.0.ebuild 564 SHA256 cb7b587396ac8b260fa9f47b9eee88a58860a79d710ea8747ff58a868120eef7 SHA512 6208c2d8dccaf07e31c9529ac2531fbff77ff20914a6732f290cbfb9bd4dd715db55d295a45ce5d5c702076de01115cf206bb3c423496c7e4f9e03d775a5268b WHIRLPOOL eefac053019f57a08d141a2e8b020f8a68da398c5cc6de015da8e19ca44e92d07f370c818da1827cf040e663017ba545428d624adec147d83614652b5b3c82a2
 MISC ChangeLog 10249 SHA256 5e352616c8dfae65fc3411f40f3473884926ddae3fca2e87622f48efb09686e2 SHA512 aac01dcd231067cf8c3f8883a4f1e2c8a88c6a756dd0e554f5237c16f118dccbb5ad81d43653af1097339764da202b276e307e43a4166405a06003659dcb91e3 WHIRLPOOL ac449b0edb3fd74ae4a9d0bb9119f8b0eeb08adf312070cdd3928504ceb4be6e08e717c98eff4a2b3d3b28940e5010894d96e952ff725b7bfd8e2ae2a8dcbfa2
 MISC ChangeLog-2015 2315 SHA256 2257fef2ec8dcf81eebaa22487d76bf3d6f3c8040a07095eb10d2a35430adc28 SHA512 c861f05a00628101c97b59ca5a787d6b4ed3abd147511debe567d95d8f68f255a1e6cede49999bc1ba1b7e692c895cc8ede3591019f86dd3b4ccba97370f42ce WHIRLPOOL 6c8120bdf302c44871153b4d37bc0b1ae0616182ccaf363a06c1bb33e8ecc9f6c9949267d49bdad117c21b4270a824647288b24194fce157a6b8c2072f3bd559
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/karchive/karchive-5.39.0.ebuild b/kde-frameworks/karchive/karchive-5.39.0.ebuild
new file mode 100644
index 000000000000..b3d6486e82e1
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.39.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 62d1f0fcbf63..54f3eea1e9f2 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,7 +1,9 @@
 DIST kauth-5.37.0.tar.xz 84568 SHA256 bc982bb8443d8a9791c4fffa20e29c9f852a7a18fa31f023d8b4efb517123f32 SHA512 b97956d8360035102c9ba489806720263a0abebc06dac0b9121377030bbc16deff96cbcdfacbd1d91a6d3bd4bc868dab068a5f833bd437669b929315450eb44a WHIRLPOOL 940b682ed172418ee1222cd30be50b8f49d2cae90262beb75678c33f74a572e7c6ac73255c4cd8752aff277eb5ac6a6929644296e8b71e4274603570cbb05c8f
 DIST kauth-5.38.0.tar.xz 84804 SHA256 279af9593b3bf8b2730730877ff865944839e08d21855ea25864934fe372de8a SHA512 00b7e1a5e9149ab0a462571f5fcc60594ef0880772ea9bcb3c5e11f4c976c3de0db8b01ce1cae0639e4176a34fde00b0ab9d5b9b25474b3cbc1945098a49220d WHIRLPOOL be38607a034098be06f44fe568d8c131ceb6087df923f46d5cb19014181d52cd5fc55e6bea6cb5b3c7f0388e034884013257cd090655c115184de1522f637370
+DIST kauth-5.39.0.tar.xz 84876 SHA256 b184b817d155b272cf42fa748c6d3c9f1713be423551d2a74e297821f6ee7221 SHA512 28ec07f9d799e4140e238c86c600a4e9705ab8099c657ca07220c13e06bb41b62552d71852ad03736dbe9c93fd44b71d6484a5bdcc0a8c47d86e505bda000dcb WHIRLPOOL 80d98079630f061c04c5f015efe09f507abc6ad64f9413ac5b0c6ceea63358c0db27cdd554e54d7d7f6a50ec5d1875aff8ae4c92217877797d42ff8e9aa5be8a
 EBUILD kauth-5.37.0.ebuild 705 SHA256 76c577a698ccd6a55f1faf8bfb87d5db10df30d9f715c625d5e3d87e332c93a4 SHA512 f679ef29e4e28f193f24a2cda2ef7894ef6f510f5f3cc1ff315badc1324090abef9c41d93875dc66af71e90cdb25f21426ec1217386daae31670881341ec202b WHIRLPOOL 459aa1132caf5e80907e1390920426d6ce114bbdcecca6ccaf807f4c28b6f220694043007a1c8855d34ed864a2eb05aadd27a3d66274deafd3e99cf01142d8cb
 EBUILD kauth-5.38.0.ebuild 707 SHA256 3812173439ac2008975400a70f72ca879b205d5c98a3e2df9d7c6d7df339e71a SHA512 0b2f7d9b553e19ba156fecc64369b5a6768ff4e9b7c94ec8c2cc808ff52ff33f78b04a39f031401bd05b51afbb0cfcb5ee051f79bddeb6300bf973053811863d WHIRLPOOL fc53cecbed8c9f3614583726a653c47f4a22c1e32ccdc34e9f46ba5337a227d19885dcc1613e1023ea4b87bde8b959fd29379629ed3345b5747dfc1860b9d72f
+EBUILD kauth-5.39.0.ebuild 707 SHA256 3812173439ac2008975400a70f72ca879b205d5c98a3e2df9d7c6d7df339e71a SHA512 0b2f7d9b553e19ba156fecc64369b5a6768ff4e9b7c94ec8c2cc808ff52ff33f78b04a39f031401bd05b51afbb0cfcb5ee051f79bddeb6300bf973053811863d WHIRLPOOL fc53cecbed8c9f3614583726a653c47f4a22c1e32ccdc34e9f46ba5337a227d19885dcc1613e1023ea4b87bde8b959fd29379629ed3345b5747dfc1860b9d72f
 MISC ChangeLog 9418 SHA256 26c07d193b8bcd06cc700500160ef7b435f62318cbebe61c9eefbe9560b7d0ac SHA512 7eef8840d6ec723575e3d7d96b0ffc58b18ca8cc9c83d017dd2ef49e9c8ed2d81023bfa1aaab6a509dc6173c63a8c35b9bcc9abeb8074fea1adb62a741d7c78f WHIRLPOOL f013cd6861a6b53937f48adcf9a95541ad18f9c8e8ecfd5b4eee31f580921e9b790306ab7e9018ec1018d563826aae865fdcefe997bb8a86099e683677abbd3f
 MISC ChangeLog-2015 2222 SHA256 a5da3737dbdcb090b24dede6a995cb1f43652bd3782e38b9f06f53d2d55d190a SHA512 01153b416e453745d49b209ca562163c8c8b66235a224d78c7b8a25c6da5fef748eb917cff885f0431287f5e449ccc8dc833d5bdfe3dd66db655b08ec93738ed WHIRLPOOL 07ecbaa7555c64a7382f1cbf6b78eb5a538af07a05857c4d4033d2fbb616e5eed31956436367f408d655427ffb059d6824bf177ede0d9ec2a150c2b3ed48d866
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kauth/kauth-5.39.0.ebuild b/kde-frameworks/kauth/kauth-5.39.0.ebuild
new file mode 100644
index 000000000000..4852c2fb783a
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.39.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls +policykit"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	policykit? ( sys-auth/polkit-qt[qt5(+)] )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package policykit PolkitQt5-1)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 92b55f8eb6c2..cae18eb51eff 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,7 +1,9 @@
 DIST kbookmarks-5.37.0.tar.xz 117256 SHA256 815843ae3c6e8f36e1ea31aa9750dfa1b18be86c415edfcce362c2b3809cd950 SHA512 cac12f6936c680f9018a162fa9b7bc2f7591fec6ae2c955473fe391941736ff21a60a24dd8d741681743dc864746081548c5311f4ba5f7a308154e573af28b67 WHIRLPOOL d8428140ebbd9223c71eb9b7bfcc39b8767467cd1f4ad1a9140a59870f895c20efc5945a88e4817bfae315a47a7040ed137509d12f9a105ad1ffa8e27341e934
 DIST kbookmarks-5.38.0.tar.xz 117280 SHA256 38af8bb592a323b05d05b72d22b9bd5d48932a01e86941fec5e0e5ca59054368 SHA512 fe39f7a006bdc5c377fa490dd351ce507ee7f75b0277ea210a2c62455403660b6e24c7610afd56f35c0999540a666b744d397b507e8acf1454332d37832d0799 WHIRLPOOL 2a610bccf1b6f67c73dcfd0c04aea077577f7ab311e62b0df44df008fed62f3d34e2735ed88426c2aa1be1a174450d2d32053002981f17cc457b4c15e7bc9d01
+DIST kbookmarks-5.39.0.tar.xz 117448 SHA256 e51b6e9551b649bbfadd95f40b0ae46e197a8bdaa051ccc10db17678985fcaf5 SHA512 901cc0a3a143492770c25dca9d8125d7c9ed4fbdaa2f80ca37fd0d6c811ab5af3ca1f41f38cd32f690024d3ac07faff0525290087c9e469d1518b96184ac2838 WHIRLPOOL 8638867f38bf8a2dbd54bcf3f30d1d2e806bb71b2cb901279aba86afbb2c7c008f50ddbcaff6f8d5955a970868b74c99aa848e3163dd210b4d64e98a9356e986
 EBUILD kbookmarks-5.37.0.ebuild 687 SHA256 7e647039c11902d6daa5977dfacbb50079fdcd795ab3a53b7c55c281337e4ed2 SHA512 c872d2b2c485aba45cf6abc982dc656eaec83d4685444060b3f99fee97dc8c7cd6055da2bfde5def38dea5e187c08e2fab1c6b16eb81b61ab28f3db95a41e14f WHIRLPOOL 7970f74828ae41efdaf413f8cbe93ce70e02c3ad362cfc0073a7c8388eea45854351956b704e4714da75b4165ac305094544de8ea848b0bce8597693dd624bd0
 EBUILD kbookmarks-5.38.0.ebuild 689 SHA256 7ed77eca776bc94661855605cb16f99f95031f0870b51473bab3a72672081f71 SHA512 7fa0476c58fae5d33950d464b2b2b4fad9fb410bfd4494f1c864ff6fde7a532a9192ce16ca9e13f59c666a55f9f0bbdfcc50bd77b0dd0415e25abd2525c48e48 WHIRLPOOL 40fa5d56bba99813e0c93373f9fa9e2f2d4fb92e45e038a5df6596b59df28fbd80f3485ff546b3eaeeabaf177c1848a819dd4424155edef13c6656df54c85f30
+EBUILD kbookmarks-5.39.0.ebuild 689 SHA256 7ed77eca776bc94661855605cb16f99f95031f0870b51473bab3a72672081f71 SHA512 7fa0476c58fae5d33950d464b2b2b4fad9fb410bfd4494f1c864ff6fde7a532a9192ce16ca9e13f59c666a55f9f0bbdfcc50bd77b0dd0415e25abd2525c48e48 WHIRLPOOL 40fa5d56bba99813e0c93373f9fa9e2f2d4fb92e45e038a5df6596b59df28fbd80f3485ff546b3eaeeabaf177c1848a819dd4424155edef13c6656df54c85f30
 MISC ChangeLog 9294 SHA256 1f54bdd68f5e9ed1497505c43849eacd23ac2cfd2e08446eab855588ee7427fb SHA512 3e512d00916dcd79a25c59b4a46cd0e42bf8d01fcac2313e88907d3c7d5526e9b37e98e1bac827a59ce190c6abe32f2c7a77027490e3a34ecb89188450c7e4af WHIRLPOOL 4d3e47fe7f1f249d16176be89bc02fc3a31e492cba5712ceadd4c3bf5e67b4f9e745884edd466fe6eba92d3dbe930e45c5c52e55a32b7d6a6644ce11d8f2a49c
 MISC ChangeLog-2015 2383 SHA256 51a6863adaed3ef69e332a856ec4e8780e13608e0156d9cc4f6ee423fa4c8b9c SHA512 2af5199ee23569952dc089694a5a686d4465df10f9adf618eaffccdaf68c77909d567f30a086941217d6abd7587b6ab34056f59be516d193c50ea84c092dc211 WHIRLPOOL ff8c1017247dcd76ade1a276ff4e470308049a0e7ab448f3ba6cdaf71ef0c9864a474595b6ed8485660d856e1c987bbae3e52bea6818e5a344b272b07f2cefa7
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.39.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.39.0.ebuild
new file mode 100644
index 000000000000..47d95581d0d2
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.39.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kconfigwidgets)
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index c0aee800e5e7..536caa468e8e 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,7 +1,9 @@
 DIST kcmutils-5.37.0.tar.xz 235156 SHA256 fdefa93d5e796d82165c7ff0592d63c18da123534d989d77d55c9be00a2861c6 SHA512 8f882a6863f0632ea6ee84ac0bf4197430a11f17a6dae267ebecac49f6424b405bd3fbcdcafdb84afcd04b3b9bb47b6693f8ad07e702221c3f0c720f5ef32077 WHIRLPOOL 6180fcc38680cd783bb511743b3a54c2a8e8846be0703206d8f1b70d8c3a096df739f04b9e5c90216c6fbf77558363cedc9bd290cd42529b23bbfa7d9c6a8be4
 DIST kcmutils-5.38.0.tar.xz 235252 SHA256 0b15971ece6003636d012e37760324b005b06050d4d076bbe30eed427717ce58 SHA512 a4cd34168ae7698d625e33e24e15876dfde07f24f7565f7921d16dcdb2421ff3bba17ca37d5f97b0e4f05f1161735b17ed0eb06dc8429ff12d17660ada059560 WHIRLPOOL 81cb09a10d22468f626a4aed2c4abd5f0b0bf0f20df6a0b9ceca4ab08a9a9a00d59450bfb774e87f922f9b301c8cbf64ab9a855eca8464ada675434632503d60
+DIST kcmutils-5.39.0.tar.xz 235352 SHA256 80375a266286ec20b2c035ad3a79fe7aa4fe0974156413e8d7a9c881a482e4b3 SHA512 9889ebcbdc043d5a5e00857cbf52736d88da8be5a8126254b5a65b280e3bc97476404a99e053114140fe0ea5afa8c13ecc909c0a46a2add20407d28a2e1af5fd WHIRLPOOL 7d5d199c1269a732a881d164ccb6f5cbe3f326bf2e5f0965f3aba7995efdd8bbc29b29502830363bf55df339892f3d0b599ab5c45f727be30a6d25f9b96ae2f4
 EBUILD kcmutils-5.37.0.ebuild 784 SHA256 9e700f1774b0e26bbedbebcc28795d6dcbf09ecf506b2a07ae7a6a18c2953588 SHA512 4f26d023f0a461e1b26b9fb0766aed16fe3f6f0c4007ff01d3868844d76704a756fddbe1161f234898803b488ff6e4ee6967541ad721456a91ce136a86a76f46 WHIRLPOOL 8b92b2d5fcf0c0094ae6bede4ea696de645a773ac8976f1de25611a938f3f2f8e76672e60a7aa4e7ccaa48a93f1441ed4ccb2593808bbb8a0b6e6e4ee0f05588
 EBUILD kcmutils-5.38.0.ebuild 786 SHA256 33d90f5d16e1b67e52fd24f2752bba85c7a2b67b51fd6a01dcbfeabf24db5af6 SHA512 021bd33e18128804c42c82b62846346d9db5e4257bbcbd43aba6ace93da8ef278fd97506f3dd7c745eefd8d3da1783ca61e208d5cc097cc6fd75d73037d31039 WHIRLPOOL fbb5d017d441e401f6b3dabb493c656bb4ceefacb45086c22ec922e6ed485cb59e6155dddfa45a76edb928ca107813f10f56d9fec298c533a5002fffb200b7d7
+EBUILD kcmutils-5.39.0.ebuild 786 SHA256 33d90f5d16e1b67e52fd24f2752bba85c7a2b67b51fd6a01dcbfeabf24db5af6 SHA512 021bd33e18128804c42c82b62846346d9db5e4257bbcbd43aba6ace93da8ef278fd97506f3dd7c745eefd8d3da1783ca61e208d5cc097cc6fd75d73037d31039 WHIRLPOOL fbb5d017d441e401f6b3dabb493c656bb4ceefacb45086c22ec922e6ed485cb59e6155dddfa45a76edb928ca107813f10f56d9fec298c533a5002fffb200b7d7
 MISC ChangeLog 9176 SHA256 7b534a56b52501881de09ee36d6349b57d3d7a07326b82de716a22104ca1080f SHA512 4133796582e4e153f9484aa051a74c06ea7fb5823f36502e53ee006fc5434cd3db39233062cca74349a68ac1b9854a8843ce4df284d1b6e36ed1a475988482bf WHIRLPOOL db7f78fb77076add3097c6ed3768bd021888e4730d44575d2a8a9b5f2d6a95bee94dff824083107431ab763d4dedf2efa9d87b4837cdd1e9846dc309ee1c8c35
 MISC ChangeLog-2015 2315 SHA256 dfc225eca472531d3455ce21f7e36d27db336db011271da3a5486288f64281c7 SHA512 2b7303e4e404926fbd9a26c890fcceb293bd6347cadf530d46ff1a7c242a8df75db752741df1497663918740e88f02f5977ce9eee1dbed2fea8045a8a7731c15 WHIRLPOOL 4c0b990bbd2687364d076cd9b1896aaacb22273efc3df15234af970a1b6cb47f87b5efa4f147ee52e3c8f26bbcac1d9efe09e86c7e14bcdf843ec406f6cd808c
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kcmutils/kcmutils-5.39.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.39.0.ebuild
new file mode 100644
index 000000000000..3bf55741864c
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.39.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORK_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 9a134c907a4b..881af65ba198 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,7 +1,9 @@
 DIST kcodecs-5.37.0.tar.xz 218388 SHA256 6a2fe7e8e5d82490373f973c50dcac484d75081daff22efb58deae5dd649b34e SHA512 eacf5414e903f8241b4dca7330defe041d4897ce55403b85e2792984bc314efa7f17ffbbdbabb9264ea17c8d7d69cde0037f9fdc72545c3cc40cd151684ddd40 WHIRLPOOL b103baeaafba3f34de84cf018df135561688c15dfec28ef654bc8bce283c0e05871ce4e227f74d2d8f4465bf79446225848f9df28feef35b0b5d5af0a7c0a7c5
 DIST kcodecs-5.38.0.tar.xz 218920 SHA256 31a22d37da33d86d492b4bf5e439566d8f6a0783f74382931cee4c59a482dd32 SHA512 545272128930ef9428732c164d68ed539cecb13f2c6b166d426f387686b25b46ca8b28d1f821413fa1cba43252a3ec260c92001154eae731344f8340935a4c3a WHIRLPOOL 6e75106cea13ebe0873658db905f52d0929972c5a32b3e064ce51d7c493aff530016f86429d987075f0e20c7b2a3d5e27354dec3f159d8eaddf1021eddd4e611
+DIST kcodecs-5.39.0.tar.xz 218876 SHA256 eef017d861392296dcc54ff78361f732d9448e66ab977a69f1edf5e52c4214e0 SHA512 66a2b4f73406d826df9e4332c68eb3b10aa1b47a6f3af2f28bfaeb919c9163db9454d517439fa7a8bdef41317e6c2932939b5130aef51a61cff1e8a3235d450f WHIRLPOOL 27dfe3f0acdd53038eb1e984023bb0453f2deb8a26bc0de997498542bd82bc3ec3576b4e5a330cfe696642ebf5c33160e06c9ea4f6396bd81b64447d35d60e41
 EBUILD kcodecs-5.37.0.ebuild 320 SHA256 7893f5a7b8fc46a8c73e4220d1373511fa5c9cd78b9bfaf37508b8022c0f52cc SHA512 12a6a85f861d51e6cf6174a2267eaca25067746441345aabb52adea5677b70e932d5d0400aed32587ce4f4732577c82d6508df819845274232e272f7f8e710bf WHIRLPOOL fc9c4d728c3e8774c08cced2b77a4087f4d5bdb76cbca1d2b80e3d4ab93555d88a6cffc9260db533e0ddc0ae3b7203da9d4e20105ce8e76689418ec39fc0492a
 EBUILD kcodecs-5.38.0.ebuild 322 SHA256 4c57b523cd77a600b8ec2394ef074f5f357c042679bef50fa0f264861b3b0d12 SHA512 8a137c09d6a0e303145e78bb178c55f042a1da00d8920f2d0c4ba523485eb6d2012fada88645ea6519639fc0360238c42602e0d6046899175af5234944e01976 WHIRLPOOL 04282784526e168deaf28b50627f896348fb2c78f0161fff69c81a379487b707b97f0110e54f7e80928981aba96aaedfd71c24813b9051861539000ff8641e63
+EBUILD kcodecs-5.39.0.ebuild 322 SHA256 4c57b523cd77a600b8ec2394ef074f5f357c042679bef50fa0f264861b3b0d12 SHA512 8a137c09d6a0e303145e78bb178c55f042a1da00d8920f2d0c4ba523485eb6d2012fada88645ea6519639fc0360238c42602e0d6046899175af5234944e01976 WHIRLPOOL 04282784526e168deaf28b50627f896348fb2c78f0161fff69c81a379487b707b97f0110e54f7e80928981aba96aaedfd71c24813b9051861539000ff8641e63
 MISC ChangeLog 9111 SHA256 23afcaabef1a41f719e844b71f3f814b48693c7aa751c819a939995415872856 SHA512 77397e82fbe657255a6b67efb936a0d4954a21ac0dd45686582545dea024a00161d10ecc635c3175b8febb0b218ed5b49bf4ed47723c6efca8fda90f8df0d9ce WHIRLPOOL 3b95f54bad0b80c2a1d216bea32b68cf0c34186294f2ede9863a4a313607762df57df44f0d4bbf32caa5296c528eb5296341e45d34b61f57c4e6d395af6eed27
 MISC ChangeLog-2015 2284 SHA256 705eafb44f8cfbfd5c2fee1bea90b062c6e12cb8c93b630270d07e6b711ded56 SHA512 a2461d7107e76937eec6c9ec08cdd363ac1e8625b7c195e7ee95e080001941e9313a8a397784e9fb6486ee0cb1c07ff981068520021a785cf5fa398d36bf408a WHIRLPOOL 3bc00364dac8ca4f7524f1f49b4b2d49518a21c1135509aceaf93f1454e7a13ea901e472235feec3dabac60845afb577d1596b985c3cd8a305ee4bce4d085033
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kcodecs/kcodecs-5.39.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.39.0.ebuild
new file mode 100644
index 000000000000..fc57f8bf6d61
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.39.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index a39c9f5c36a6..b4e082b372d9 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,7 +1,9 @@
 DIST kcompletion-5.37.0.tar.xz 118424 SHA256 5fd2b0a51fe87e3b2042b65069c7cfcd5d2eede3bde94f21285ecad02a9e1262 SHA512 99cf1346f4048134d5219d451250122ca848d49c6ec26ab9e36562d2e654c18f3415ddd1b11e7a2459ce6b473c22cddb01135de9c773e8f0ae2f1c8d2f4d5ea4 WHIRLPOOL cc86b97b4f6b2b120685f98718093c661e32091f8d92fbaddd66d355f6120aa81dbb3f2b92f170bd42e45f86a4c59a6ea2e22b0fc088f58b39abc8856ae14db4
 DIST kcompletion-5.38.0.tar.xz 118432 SHA256 5c943799729e7ed8d101eb2e11a09a2616d6c13c33d3575b2e61667e0c2f2539 SHA512 5c697626684837bbe155291b3270810d11ba40140929adefde18b1254ea736efeae2072b543bc9fa39948b153c3dbad8a70d6c8f18c3ffdbe333f4924af18da0 WHIRLPOOL 2bbb09c477086b7647390644c7fdcfd5f428669bed7761958a0dc2494eb2a47805ae30e6fe78238010c47f82476e1d61fe0da1ca8d3f65945aab42a4a165a275
+DIST kcompletion-5.39.0.tar.xz 118520 SHA256 ba1e6a72e827d2657d518111271cf12eeddb70ec68b0f8943d4bfa632f614d26 SHA512 f7add324fdee5d3679b71a5b36a3a6d6cd56580935eb74ca2d5bf7281334865bad19d3fa0058af0599d8009dacc55893928e9a09e63aabe143be2c79b15ec2ce WHIRLPOOL 22bb7fd9b6569d376d88401bdaf72c958cd206cff80b4139c7fb3166e3424d8e71c37a9c6579bb31c6e7fb711b8a636a56bae6b51f8b8ecbd780fda2ccf4940b
 EBUILD kcompletion-5.37.0.ebuild 474 SHA256 a0aaf9d8b7e5152384fb8c99437d208af619c33fbd2b9fbbd22884ccdbf1a5e0 SHA512 8f9d60ba0b9ee172547b6fb4607b4d9ac28b55630a0fae3837b6e8817ae1eeb97d6382163f6f5a7b0312fdc299364e9be0bfccacac29396fb4547b6427b93e90 WHIRLPOOL c1a65a826a36e2b1050832873ed1ea3ab17724c6df09acbd734e2340d63e7895cd82bc2c40dec72a34cde56997024b93bf9efeac7f01ad4d93ecc93e5086e6a8
 EBUILD kcompletion-5.38.0.ebuild 476 SHA256 f89e9612bb8ae115c0c341c68c1aac7e002ab1cf14597f35ff1a40deaf39074f SHA512 fefcb7f798fadb5e0757a549aeeac511d31575e90c4bc63460e534083a7f94f98128a24459867ea3fce10ebdf8cdd38f505e400438b840ae18d1f936e0d3b0aa WHIRLPOOL bd73e40806f0f31ee345422e1552519f6591ba3417dd2e432cce8f43170e407e7870d47dda0fda18c31e623c9067bc3211e73ea5f88b7f54cc79f6e581a83a33
+EBUILD kcompletion-5.39.0.ebuild 476 SHA256 f89e9612bb8ae115c0c341c68c1aac7e002ab1cf14597f35ff1a40deaf39074f SHA512 fefcb7f798fadb5e0757a549aeeac511d31575e90c4bc63460e534083a7f94f98128a24459867ea3fce10ebdf8cdd38f505e400438b840ae18d1f936e0d3b0aa WHIRLPOOL bd73e40806f0f31ee345422e1552519f6591ba3417dd2e432cce8f43170e407e7870d47dda0fda18c31e623c9067bc3211e73ea5f88b7f54cc79f6e581a83a33
 MISC ChangeLog 9353 SHA256 e7d9534763666064fa53235dd9515d2c2367e187a242665ab3c0049987d051d3 SHA512 dd6d8d34eba5f57b0857466f2773e95e43ecca3dcf6e4f2b89178d1cf8e66ad32ab8646efb41b52b7ace656580115e25c68c1daab5bceebed74149fc352203d4 WHIRLPOOL 5a351c2b6ddd22a754810f27fe9609b3dc77b15b07ad52aef79ccb2044d7258f68c7f3e7e6faf5461e6eaf833412540b97367ab5068ce0d9e482935813bde80f
 MISC ChangeLog-2015 2414 SHA256 2650e9942d038effd1c3905dbfd07da74df0da6842f647a7d1ae170cbff7e466 SHA512 6f876fde64a4712ec091cce8f5e062b87b78e12148937d6c0c82062404d7126d5d102f8d41b96e66c66537e8548294888213d7101da4e65a315edc09e5bee6b0 WHIRLPOOL a84c29daa50363fb95de99c3d34debd5fe9bf8adb0f8e5446e14e36450dfd05bcb77e4783650740a09c57e520822a96693ae3bbd35a36c5f6defc0cd041c7acb
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kcompletion/kcompletion-5.39.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.39.0.ebuild
new file mode 100644
index 000000000000..ccc50ad4d14a
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.39.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 4cfd4c43b3dc..381cda30370c 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,7 +1,9 @@
 DIST kconfig-5.37.0.tar.xz 233000 SHA256 ad646fbf27a671761414609f729a033f5014ee0f6f9f4cd909ab00cfeb131eb8 SHA512 8d6c120f14f2c5d2c44173b142a8d175cdfb9a48f3a94a5798bf222ca5954a7420e6bbe6a467565032468cf5f8485ac73a48e8c0c8c825ef3573e9641cf60fa1 WHIRLPOOL 8c23e9000078083d2eaf0f2782bd009bb18f08bc69a6aaba275f2d74ec5c560acc7cf7195d8d61d775b7a5be3c6097c25b4ca4da524cc7be810adcfe685fac31
 DIST kconfig-5.38.0.tar.xz 234272 SHA256 79744af26c90b78f01e065049daea0a6470f0d8b8e71334652179bac1b12243a SHA512 b8eaa832018843253e2710ee6b7d2cbf9d6b34727b2cde555db0ee2489e98356aadbec78a957d7cd761acf058f11a566f7156138ae08287e4f7d6694b742669c WHIRLPOOL 124add2f2f16a591dd24b6c93022cd4d9867b444464aa833e50036663cf1526c1d309164427bce9334d05e4cb0abc1adfd9d79137eb7793f7eaf7e97e6bddeb8
+DIST kconfig-5.39.0.tar.xz 234780 SHA256 3c504d69a38d7fa2e89dbe15b8c02d0803be20f3907c86f18be090031c223104 SHA512 d14ee524c7c06eec8f6bb953c203bb4077ccffaaa01b7f25496819bb19bdedce098342e90c357b70eb46815ea1f9a85bb6d00c575f31c9d0519921c33b02860e WHIRLPOOL b133d7353a60496b489c209f79cfe9b7244e9a67d1155e62c79dd0a0f0ef981f85088a31232cda72774602205e78f46ce459992841cb44659c58dd4ed52c023c
 EBUILD kconfig-5.37.0.ebuild 517 SHA256 f521c475af3c99183ea8d276e79b5a9172687ff4b004df891f6c3bf093c4d128 SHA512 4ca432b092994c6ee01c2de4991f0a76fc3db959b7f6fcea15c64e79cd50447dce0c27cc880a2d463b11ff602ea70a005829a574a1c8dc72aa5f3248d1147422 WHIRLPOOL 2bbe97464d765d6525dced4b103c9b8bd79414d1edc762df570c9039892d715906c3fc39257d8cf0dff34e53bb04ef81f723d8f3d5cb0611dfb456fd993949e0
 EBUILD kconfig-5.38.0.ebuild 519 SHA256 cfb276e1e2ab0fa590a24f1010be41530e6b2a0980d73c05125e17a840095f3c SHA512 82df839ab09d3dc5aec700bb1de929a184103d4a59e278d22c8f489250d5fb4e373c6e4147e50af6b8b3f7fa18c85669fbfae2f2b5659247f7cfaa48c72a2582 WHIRLPOOL f9020f1867fa75c1404418434a9c3cd07643eee43f835196e65af062a04e0932d877b06502ad42fc20e6f2ee362bf0150da9ff9c4562144309038f6946297e04
+EBUILD kconfig-5.39.0.ebuild 519 SHA256 cfb276e1e2ab0fa590a24f1010be41530e6b2a0980d73c05125e17a840095f3c SHA512 82df839ab09d3dc5aec700bb1de929a184103d4a59e278d22c8f489250d5fb4e373c6e4147e50af6b8b3f7fa18c85669fbfae2f2b5659247f7cfaa48c72a2582 WHIRLPOOL f9020f1867fa75c1404418434a9c3cd07643eee43f835196e65af062a04e0932d877b06502ad42fc20e6f2ee362bf0150da9ff9c4562144309038f6946297e04
 MISC ChangeLog 9290 SHA256 64abe101b3a1dfa9b571bf2ff45da1ba1c17491f969bfdb79c5120a7db51c4bd SHA512 5eef2b37e9d8a672e6321391cf515735d4f3e86dd2888c447b5422413969dbd096d546a40a8cda305267cdc41b88ad1382beae430ea98255da949aa7833e47bc WHIRLPOOL 7a228f87718699512bab472553cc76bd903aaec034687d394dc5ebae0e7afaa2594370b1e0ea7e926885fa8043bcf5eb71fcb45a1c8f859a1f80018a46e194e0
 MISC ChangeLog-2015 2284 SHA256 230aa60c8aac9f6f97708bf354922ade2ddca5abd2c51cac545f4aadcdbdad49 SHA512 d1fb7b4c180e4ee3193b738ebcf2b2965b48445c17a0ff826b6e4f3e7698be9cc3a95235d969e74ced44c5bdf77a65ca8c3bb4869867d1f56bc34af5201bed62 WHIRLPOOL c7620ce090996a534afba6aa50283ea934dd22b1a679333d4377df365c550f17c5592f4a64525fa22846767c5a59c34b3838cf2f82f64a7234c6fc6d9c974cb5
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kconfig/kconfig-5.39.0.ebuild b/kde-frameworks/kconfig/kconfig-5.39.0.ebuild
new file mode 100644
index 000000000000..e8447d66f025
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.39.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# bug 560086
+RESTRICT+=" test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 4a406875add9..8ecaf1bfd79e 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,7 +1,9 @@
 DIST kconfigwidgets-5.37.0.tar.xz 375492 SHA256 46af20c09871dd720f8bc46d3bf7ed5eaae2b7cd25549ec3a1b71b8ca40d2d00 SHA512 46c6fae07d42d5b7ef9882453b0224d9b0e30cc90d5fd8a9a23a50508b34485a7055d751cf6773f8e89897aa1e0a856a2aaa6f71a9a72194f8939c34ca6dabe5 WHIRLPOOL 42b474c147ec4efdbb16d243657d09c048f1d38ed80d8d58b576794ae230674569795529d9a8d352df70fe5ebbf2ecae1b60a3c2c4e1fdad1b9385a1f2d3e0d7
 DIST kconfigwidgets-5.38.0.tar.xz 375300 SHA256 1d70a761eefe60e6f7beb3517ed64edbb6266cfe85bbb65603c9764e524b6170 SHA512 1451988e802a1a0c9c4115481198ae1568e215c669b2fc3f728574cf619efb699ab847aceadc0f90d49ea076280b56e8f11fd2e2d4339bddc408761c367be79b WHIRLPOOL c6b654a0dd0b66d23c19712f259eb3ef881d773c8b529f9a70934e71ab7a27fb0252f37825542c5dafd439dfb6b33b9ee44999a5e1b8e9363ea4761b4615397e
+DIST kconfigwidgets-5.39.0.tar.xz 374976 SHA256 fc77a295823327aa602d246f2e7da8094f5a97d56c1d69916e3ad9aa71b4ccc4 SHA512 eac166a17331cfcfa5ddb74d80a4507cfc57e648b501ae5865a62b7d9d3ab2dd7d16f458657854fa24aeb803cd65ceef180af51b3a067184c54f74ab512eb79b WHIRLPOOL c958fd210c53eba1d711fa79d7d88a3737692a01bfe284c0056366eafcf5cf4f9b8971c944c772e7d1d3c2e51c2b1e010edf2c2050bff0cc54cd9bebd62e7cc2
 EBUILD kconfigwidgets-5.37.0.ebuild 786 SHA256 3f0a9d41f2e8652ba1f4176b30e069165ab6a5d3718bc356750a627e02fcc55f SHA512 50387a362e040aa927a8ba71bcc412be63bdab0e3436ccacd7e4d96210b8ff023b7be991519caec88263f0ceaeceb43e66d862691fdf404dffca31cb26ef8fc0 WHIRLPOOL 6c42e742de26789ba97b19983eac23cfcfc3d526802e89e69f06b1811900cd80f0acaf5a9860e5532a0186b3ae0a1eaaf94d47043cb6a61bc429fb69c203a46d
 EBUILD kconfigwidgets-5.38.0.ebuild 788 SHA256 fdc4ad3404cb8b16445abd9079e548955553b546c781f9e7c639839d839f34fb SHA512 41f9071de38185bff195fc2e7942c8d0e14e256d475b1e9e61dab77d288c5c249016eedde235c0759598187b860fc8c44eded09b1871f1ba735f14924795c12a WHIRLPOOL 399e66e7e16ac553c17c6e7cd7f6b691b661780aaec5230d3f3e0ec2b54c387225a8b3821314f2c3a5ba5d40a1a9a7c1076ea7e58b9946cd983dfacb07a750a8
+EBUILD kconfigwidgets-5.39.0.ebuild 788 SHA256 fdc4ad3404cb8b16445abd9079e548955553b546c781f9e7c639839d839f34fb SHA512 41f9071de38185bff195fc2e7942c8d0e14e256d475b1e9e61dab77d288c5c249016eedde235c0759598187b860fc8c44eded09b1871f1ba735f14924795c12a WHIRLPOOL 399e66e7e16ac553c17c6e7cd7f6b691b661780aaec5230d3f3e0ec2b54c387225a8b3821314f2c3a5ba5d40a1a9a7c1076ea7e58b9946cd983dfacb07a750a8
 MISC ChangeLog 9548 SHA256 c227a07fe58a85a60019e2768104882c9ef4c9ae915b0bde268c4736828c8f99 SHA512 5319eb9981f79c632950211255d6ee9e17b4f38479294886b84799779b42e877f24e2f78d5409df73d90f60f1dd821a9b24320078743b5b4993459d42e9c4d21 WHIRLPOOL 8b13bfebc0ff3acb119fba7d386ea1dc2c670e97506de635734a93f8b9441693ddb3838e99127113f9b90170133b1a8b95270694263a850b13f30927ba4b5eb7
 MISC ChangeLog-2015 2507 SHA256 e0202c9882992627e32b2f13ef7008bd48655741d984d0a3d2edfc5db011ae43 SHA512 24e2823f9c4f8f33685eb780a55e06a03c41d85bd23e234f08ebd6876fc0f76c4df77db69fadd3771f970a869f4aa00c98db7f60486137255fc551c8e6bf6cc5 WHIRLPOOL 16edfb594c94a0c7aabee00995f8bde59a72a01776379150b431642a18d4b762370b54111f529a89c6c5c475ce3973464716e0fcb3625346c4f176a0f08c9fc5
 MISC metadata.xml 318 SHA256 43cd48f250622a102d423a68b4f54b62554fa17977f6427efb2c499539d4e2bb SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337 WHIRLPOOL 2ab5f9c798a6585ac012670edb11964a0569b647b8bd218970a95796b1fed970e5c065dd39ce288ea8ce81be2fe0e9b484e9470b82305276b06cd06f55b0f919
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.39.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.39.0.ebuild
new file mode 100644
index 000000000000..a979d71e04be
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.39.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index d47666a3f779..d46bc1360701 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,7 +1,9 @@
 DIST kcoreaddons-5.37.0.tar.xz 348284 SHA256 7e3c433cb0e010ae751c1347475283cb9e31763de5a7bc346a629d16c2d78528 SHA512 533183a0302bba4ed78ab5ce5563007e45ab8788fa64b8e012d16bf072f4e5f9dce6172db927389111db56aea2c7b26e19a00628628178cffcf8c5ffd8b7271e WHIRLPOOL f77b30e19023d233130f9a7c529b5d4cc6027f92b3a45bdcbc21a6737a799f4f4a14156d951682fba2a9313c291dae37b0f323d87f35f11d526209fd6fbd89db
 DIST kcoreaddons-5.38.0.tar.xz 348756 SHA256 9be3dd86402e173da025c0d326fd9a38ffeecb34828a287f8b8c530a5db275d4 SHA512 1f8b339e858c422943836c2c977922b1fef77b562fcc6b8c13e199db1576d06b97fd11fc5286414015a386b2736af3e51fc49cfde346801e2c55aeb9021ce402 WHIRLPOOL 3b2be6b9318919480986c28802e74d232708d03ffad82110bdecb97abc4dbf200666351db14d3b0df81d12f536b3499baf0b124de0b3e7047a2c7d4488524640
+DIST kcoreaddons-5.39.0.tar.xz 351152 SHA256 9f6e76c2a15252d2974271e4e3734a64aec157a434251c23b27efaa809d95363 SHA512 6579087b2d34ae6bc8d8254c420ae2f6f68d55cec587b5a58429bb82b9a2de111221351d58e2514705fda52c9b433bf98add574e4aba6ee0408340dc442707dd WHIRLPOOL 659484794b6f406cce64e077a902fcfc99b27dcbdd9df85ad71f80f12253ba4feb0d7b86fcb214cd9b871daffda64695cf0639813b36d4c284cfae9f88696114
 EBUILD kcoreaddons-5.37.0.ebuild 654 SHA256 6061ee8bd6b3e0bf1dc653921dfcfdb650169d21422d8cfb86ee607710e881eb SHA512 7b5df2f5912922d9c903a336d8867e322f38753127d1ecb180293899c9f3ce98855297e5b9366fd4f7e3c5c6be5f13242e52eaa3bc8f50c40b0eea06afe40787 WHIRLPOOL ae36cef6ffe6e8fa7b04770d8bccdb22b78a6424518476e346d269fc04f680c721c0805fb86bfbe82cb6da33dcaf31dd3ad8f52003073346346907d6465beb27
 EBUILD kcoreaddons-5.38.0.ebuild 656 SHA256 47b7ccb64e3b0d12ccab050e7198967d92bebc1741893be6b0184412b3390cfd SHA512 146d4cc921e2e7efdb4bad39e3574cf6bd1071af38ae28846c705722b9c018f7b19c9665703af3d3d8ad7beb003672b4f65856335982558cf27c7b632afda7e2 WHIRLPOOL 7e01586892d49cf5c5a8d252fe30c2f0b5f3b48fa5f9ca8aa4a30dfa659b3e68ad53c5664733e1d7246bbcff9fe85f883e3b970e6379380074bb8e2ce88c78e6
+EBUILD kcoreaddons-5.39.0.ebuild 656 SHA256 47b7ccb64e3b0d12ccab050e7198967d92bebc1741893be6b0184412b3390cfd SHA512 146d4cc921e2e7efdb4bad39e3574cf6bd1071af38ae28846c705722b9c018f7b19c9665703af3d3d8ad7beb003672b4f65856335982558cf27c7b632afda7e2 WHIRLPOOL 7e01586892d49cf5c5a8d252fe30c2f0b5f3b48fa5f9ca8aa4a30dfa659b3e68ad53c5664733e1d7246bbcff9fe85f883e3b970e6379380074bb8e2ce88c78e6
 MISC ChangeLog 12137 SHA256 c241a56c878f39632868bd892cfeecf1dc7fac88d07c5393e362be75c35d7b9b SHA512 efb79c4e3341a934d8fa2bdd7e7efb13371b798e3f0528b180fead429f0afba8a74f4769020d7394ec490c47196d8140088cbc89e87677f0860a3e0b174dcbbd WHIRLPOOL 719bf8e4a87ce8cfe1afedbfe917616bdd8dc590034d275de7ebcaa68acaf3c10985682f2a7060618f2a5c7fac3eebaab1fe68f24f254b758b8e4e561ef68d6e
 MISC ChangeLog-2015 2414 SHA256 66e757aa0a1ee81e8ca8ac85632eccdf1c91036dc0fe372d346a38d90ad90963 SHA512 a9a0c9599bed5070a4868952aeb06fb8e3c13e6ad6d46a61094654a60aee44e901fc6372c86f57c7d931c94befbcb9746e0c8d1ffde8b605e6b97ed546c65fcb WHIRLPOOL ba92f3200af999e2a62b8b6bd80edfdef7cb3891c6ee1dbafba66104e347f99cbc3255e842a7d938bde9e0020932fddf9c35428b6f852ba7cf6ee610aaab2d18
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.39.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.39.0.ebuild
new file mode 100644
index 000000000000..08d8f6b52cee
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.39.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="fam nls"
+
+RDEPEND="
+	$(add_qt_dep qtcore 'icu')
+	fam? ( virtual/fam )
+"
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		$(cmake-utils_use_find_package fam FAM)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 619656
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 5a3c61bdc1af..5b7e896f86ec 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,7 +1,9 @@
 DIST kcrash-5.37.0.tar.xz 21700 SHA256 c097aaca2c6ca8a177d697a8cccd4bd8bec2d09c07efd4bc7a4d0d3d1cbf629a SHA512 d7a312c820c3d4353bbf30313623d9931c8151206446bc3d59856bdf5824c5a82655a649ddaa94ff3a868151cd792fd03a274c8d87fbf052efff547c49963cbf WHIRLPOOL 14f3163a11ee7ef288fda17bd30c17599aced8e67e829b97dd0fc6924e028168890a089d3c9ff3c5a7a4d155c3f7e32acc61ad0fbced3b367bb6be8ce76dff4b
 DIST kcrash-5.38.0.tar.xz 21704 SHA256 215c90bf6501cb90db01f2a04155bcd8a8e66fcfb4a94649e72204c5a1df10a9 SHA512 60c13b2e883d3e55b9f431eb1dd7c7332c7e196fe903d0c7fe7f70029ba77600802cc8911be65fb84e1526fb5d9f548d85f6c881e209dee1922aee961279d1b9 WHIRLPOOL 06c55e9af6cd11cbc102af79cefafd706c4597729b0d1c2311902951be0fbfa23f1a8542ed7a6b6213c38e6aba53f36e8a1a4d735b1c49e862abe5abc3d884c4
+DIST kcrash-5.39.0.tar.xz 21704 SHA256 9a0727734745b3050f864f2de1dbdb91e9ac99a49ede9874613427080a1563bb SHA512 d3444e39cb32abef01441c92af2fa020777bc6e629d3db568aed7e9a4f313fd6fb76a04142119170f2a38d51e65f1791f032c827bd1650e888ff7681883d688f WHIRLPOOL be7ae17ebf6811002cee1e20021ff6b217e798f05fba919e96a11b388aa13f1a635eb355cd3cb1114dc7ed6e3a5f84d405d269bdcab571d7b25ec43acfe7ff82
 EBUILD kcrash-5.37.0.ebuild 608 SHA256 294de95286e00a6263a903dd5782fec001a22b87bf017129326ca3e8b1e5f47f SHA512 2c9e40ddc9a54eb720bbb61ef0d580d100d4e34d810316f7427947925892fb792632550445867c0f8efcdb100a8d2770db490675663d4aa4ee2927b7778571fb WHIRLPOOL ef34949bfc914d226af734d4d1f0f8396ec1e0a796eb5a8ceaf48811dbdf40160ac95742206331a8ad84b10cabbb693f1daa6ff1c66dc5a8d239ca6b1eb88c84
 EBUILD kcrash-5.38.0.ebuild 610 SHA256 a9f0eb2da186a95d083a427a20f4ec2ed6d11196d0e5964fdb0e2fe4a12968b9 SHA512 c599035879d1bcd3069e6f5528c782da942e95be8bfe0a5fdd5fcaddb3d676c4aad0b921ee4167c23bb3808523ae54dbdbecdc3568f6e36c61f90db63058c5a7 WHIRLPOOL 3a5b73edd071e4efbe3bff7da18fd4c12a89c28c11fbd094bb9724ada7188668e71ad54c9641b3ea002dccacd279c20be926ea5fcf63ab00e3561c079cf8294a
+EBUILD kcrash-5.39.0.ebuild 610 SHA256 a9f0eb2da186a95d083a427a20f4ec2ed6d11196d0e5964fdb0e2fe4a12968b9 SHA512 c599035879d1bcd3069e6f5528c782da942e95be8bfe0a5fdd5fcaddb3d676c4aad0b921ee4167c23bb3808523ae54dbdbecdc3568f6e36c61f90db63058c5a7 WHIRLPOOL 3a5b73edd071e4efbe3bff7da18fd4c12a89c28c11fbd094bb9724ada7188668e71ad54c9641b3ea002dccacd279c20be926ea5fcf63ab00e3561c079cf8294a
 MISC ChangeLog 9016 SHA256 7878feb850fadb39f61935741812523f4a52c730053f7f5feac8e45908e84b1e SHA512 7855b05f5ebdb346d4e549c5045f89989f0b59a962a00df39344593fa56394f64e1d31ca757a30c52378b15f8d384266f77642fff081764de7a013609896aef0 WHIRLPOOL 98214536191f4b120c4b28457853d0bca0c8c60f49460f83243dad4cd556e84a0e8901f94c17bd3b4db57eac60e31abd5f8f63200a53161478195093ecdc1e59
 MISC ChangeLog-2015 2253 SHA256 5c7bbbe7717959e324263088b4b59862bcec963136556655101b1a80c7c97d24 SHA512 4a3d642329ab7e381b958c2be0e530628b25b7a250bd364fc7729fc2268991a714a41db255b79283734e91d7acaa5882b15d8a54ec3c5a9c5f44324583067230 WHIRLPOOL 15bfaee6537d37dcc918f467b3ff6e71f41a1f5fec2126ee06b4800541ce3d08681eae7dadbd97a385e3af62427507789c3e69e674950aed48c415d6bb856445
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kcrash/kcrash-5.39.0.ebuild b/kde-frameworks/kcrash/kcrash-5.39.0.ebuild
new file mode 100644
index 000000000000..6fa9f34fe4c2
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.39.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtwidgets) )
+"
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 80047d30b6fb..eae436b090f2 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,7 +1,9 @@
 DIST kdbusaddons-5.37.0.tar.xz 35668 SHA256 9140b649e140eb134d7290e3f268658900a61c3d50002ca1e7d772726756851c SHA512 a581366eae4e8ceaa9bc544adf951d734a3feddc19287bf2cb5818cff71f46ed59976bc9fc1487b3578c896bd1ac3fdff57d08510951007596b3907116025f39 WHIRLPOOL ee4c51e4ffce6ac1ff00485a391ccb3c68f700ee5af72e3c0c8e37541d4d3e2104760ff9bd55283fa61e0d7b0733d78ea2bd32019fc7237fcedc213cc8a950eb
 DIST kdbusaddons-5.38.0.tar.xz 35992 SHA256 1c1f8955570cd7e0480ec619084c5ea56cbffaca5307d9053d52092f10d589d7 SHA512 503d3ff5cb0ab738f55aae7fb076dddd36aa2387f0339d83766aacc9a2ea6ef7373e063d3d47701cecab36ae09ac4d735bb09250e0b93d35717dd6732ea8c59d WHIRLPOOL a102bcfe85b82e40ef9fa1d6139a488f7c527e81ff8bc88465f6a4082b7421342a4ed09b8d128edbefe892c977c2bcd8e4006f4faf48d4442c6b09ee336039fb
+DIST kdbusaddons-5.39.0.tar.xz 36108 SHA256 23477be1a3271d599be896477253fbcd9895ca8688ecb6771b290c5b522ae842 SHA512 0ad0f6221b379ab0f6aa9eb9806a1d4f71110611796f5a0ca0bd729275ccf00065770f74b8bb28e4214b35dd98aa950cbde5c6c09fdbd3a2927e879b5f0b3766 WHIRLPOOL cc5cb98952cee3e4f74ef8ff53a06398b2ada4eca48f07583fd0fe5f3d69f1ca565130908c3c33f38a259af2f3e1e04c2604a3f5a3a96dbd65e744650f66e446
 EBUILD kdbusaddons-5.37.0.ebuild 554 SHA256 f557a54c5f2954be717856708d48d96da4d013e5506b75dfc5bb4cdc34b982c3 SHA512 ba286a42f176904f7c4610e9d5fbd949a65e5371eb9197fb77e05f8b58df62473eb9e88bb56bb19002c1b29ec1e5132cceab3bb631bdce0e008658872ad38082 WHIRLPOOL 3a70744c815a1ccbf21839f705b64a0217fa94715fefc05c6b429e3bfa9ec56d87bbc41cabbafa6d6e5123975de7d1dfb1a950da69c94fdb4da7e2db4caf8290
 EBUILD kdbusaddons-5.38.0.ebuild 556 SHA256 b1760f7893449101910d299723b97e262b35a102155a39c8a9181f9cac6b2a79 SHA512 b0bc4ece2097e65ae84ab5920362223584534f051c84fc363c9c1dae1ef0b6257962f5b4680fa49ee1408f7983bab22aeee6ec3cff93d13678615fe980cfbd6b WHIRLPOOL 38abf360d4ffca0e93e6e6182f63000c10fff9293d63c8ca8acab6bd697123740df1db5d478d051af7556b5043b2378256bd0518fabc1f3729ede58bb5775c67
+EBUILD kdbusaddons-5.39.0.ebuild 556 SHA256 b1760f7893449101910d299723b97e262b35a102155a39c8a9181f9cac6b2a79 SHA512 b0bc4ece2097e65ae84ab5920362223584534f051c84fc363c9c1dae1ef0b6257962f5b4680fa49ee1408f7983bab22aeee6ec3cff93d13678615fe980cfbd6b WHIRLPOOL 38abf360d4ffca0e93e6e6182f63000c10fff9293d63c8ca8acab6bd697123740df1db5d478d051af7556b5043b2378256bd0518fabc1f3729ede58bb5775c67
 MISC ChangeLog 9353 SHA256 e637fe37b29aa176501c6a0d80ad15e34851f61bbe2a8759347b4e4c7c5c8702 SHA512 645d2a27246c20ebefc47001f3cc18a45fa3fd4fede2de14d33978b83a1593304788f6e19f85f83ccd358d891cab8f08d2b12b855f37dab418b95aa2006ec1e2 WHIRLPOOL 0b86763ebe3dc31bc12a83c9032a47762df0372b8aea7f12ce772192b6f9aeebb08d7622fbcbfd7b617255f02c3cbbb87e8da9d3e9a5a647cd254b6f67e60da6
 MISC ChangeLog-2015 2414 SHA256 13d60e0df82d71aa906ea4fcb01019cec447a6e65d0d9ab7fa8495282495af8f SHA512 3c3c2f92fb25eb8af1cd98801db9144a5d932bbbc03575ac1413a0b1a49051598e7b10dab3db349b26e2a5aea27264c7c78f98eb769cb450c6afbd6438bc3f6d WHIRLPOOL cd063c0062446e1d34486704f7ee1a141837a8e1eb8b091a745d1ef9e0d35d2aa9bfbd18a2172de796df6e5574eadeb0a75c62deb1b78fb369b3f7e269a68386
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.39.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.39.0.ebuild
new file mode 100644
index 000000000000..c817cca4406f
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.39.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 8fa137aaff55..52f0f829045c 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,7 +1,9 @@
 DIST kdeclarative-5.37.0.tar.xz 169808 SHA256 f2bdd7e1c6d0f39b4e1573b11078317e9ec72803c63ce4acc4d7de26aa2150c7 SHA512 903df965d34ae3bcd0e4c84d1821843bb20ba7e90c276b4b10b47f3455fbace1b5dba31597124757fd93990baf95a5cf8fd7453eae9711545475ad1997dda06e WHIRLPOOL 6bb6de7490e9b2697a49d65f526e662f21639f80bbe1f8f363571174c82795756386a904d428404b0d021b6438e37bc3389181c463fc1e14541abb78d085b6a2
 DIST kdeclarative-5.38.0.tar.xz 169840 SHA256 8b38aba552f06596a47d52d364f7a21784e741cfb0c7f23815f1cf067fd7c6a4 SHA512 72ea8b2f17792e3075800de93882c0a0b03732121eef43ab38285c0d1988e148e079f40dd6d4fc8afef75bda47f2e02a3ac84b9546c6a6991b10aade1dbcb978 WHIRLPOOL ebc3d86fa47b8b95239c05262f2d10f2b18a505b4147cb33cb74d929acc0b1b1d4dd7cfeff6d4b6e5083ffe6d1d49377bd70e82f596973e6a94ec1937fb1a875
+DIST kdeclarative-5.39.0.tar.xz 167920 SHA256 f734913d40d94eafabf7d5a090c50a5e8d1caa597aabdf2eab5862f39db71cd1 SHA512 442f18403788d7cf137438b8991037369d65b0a1cfe14a6067fabb39dcaaebef91cd0cb59992b7d381fe7f54f00a72d7b3de6d84d02a157e5b3e7f0392bd583a WHIRLPOOL 1f2df0ed5223e7807906cc29546d03a83bc9468483b7c025e3eebd8ba0a896f885e38b3bb8d8d2c0dac58d59707dde7d01ef6157eb298d1f5fb100fb3126e71a
 EBUILD kdeclarative-5.37.0.ebuild 838 SHA256 384f4ab9170fea1f16bdce26f44f1d6a0d69f1174f5c6cc66026a4c5d669b619 SHA512 adc429ba03e96a2431dc01b76f20370945fd2867b10ebcc4a4755f1831081bfa5eec53e30ea095568ff0f20f112aa06dced6629184b6efb2a211ef3b3fb57ff0 WHIRLPOOL 8a0a83f499588bc212ef0bc9e7e964f456817f1d9b6d7d3ad68b085333158dfd65fb7de2f7956f3ae74fad85eb07ec379ce7453f0c07a46babc1a3ed7abb1c6e
 EBUILD kdeclarative-5.38.0.ebuild 840 SHA256 a3734a3957ffadf3c20d34b8b989ebfea199a0d55799fc1c9a8772334ef8a3d2 SHA512 4bb6980290a2000aa7a39c983495bb85c9e5149826ac47e74a46d1b7db9f61aac5453e39b1bb750b7ed3233a99a7545057c80a5cdf5604d7418ca5d68b290e3d WHIRLPOOL d753cfb2761126db23cbeca321ed37c766f6f2af10b9850bdbdc45ac244c60fb751f0090e6cc6bd74d196c66afaae88f763a72830edc4e983dcaa4f61f9c0913
+EBUILD kdeclarative-5.39.0.ebuild 840 SHA256 a3734a3957ffadf3c20d34b8b989ebfea199a0d55799fc1c9a8772334ef8a3d2 SHA512 4bb6980290a2000aa7a39c983495bb85c9e5149826ac47e74a46d1b7db9f61aac5453e39b1bb750b7ed3233a99a7545057c80a5cdf5604d7418ca5d68b290e3d WHIRLPOOL d753cfb2761126db23cbeca321ed37c766f6f2af10b9850bdbdc45ac244c60fb751f0090e6cc6bd74d196c66afaae88f763a72830edc4e983dcaa4f61f9c0913
 MISC ChangeLog 9412 SHA256 0062b39681a0980437f768541a8a4020dc3363ab3314b2c3ea00f91a771a0af5 SHA512 e6390b22c20752e94e699d9b74e8c579c4af8512a3d12deaaf2c9c2af87f937419407435275ef0d682a0029d63ec7955bd9f659d82caaf51b8c6b1ae0f9bbac3 WHIRLPOOL dd38a4dd9ecd9e93667bacf2e4d45e6159bbb74a00027d043826e214ed01c5161e8257b3370304739f07cdd2882a85dbbcf8c263cafb2878fc014dbcc2799f4c
 MISC ChangeLog-2015 2619 SHA256 3581f26cb435434d94df41e7cd46334807f9a92b2a8a418cfe8aaae8652b09f3 SHA512 fecb43f4c60599f7b7927a6858bc4b9d16995c6098a5d04df299e35b45c2c29528045aa34f5e3ce59d862784f73ee5156ff0d23458b73661fbe8a33765ce8322 WHIRLPOOL 27599c22484cc9d3fcfd0ec936f3771ce1573f50492ed1e60d041754e5653ddccd888bb7d40e1bbf2d962eb5ebfc0f8f3b8cd66c6379d949b0794ef4ff3ba009
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.39.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.39.0.ebuild
new file mode 100644
index 000000000000..0414dbb62394
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.39.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdeclarative '' '' '5=')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 8be114c153b9..88c94eacf28c 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,7 +1,9 @@
 DIST kded-5.37.0.tar.xz 38020 SHA256 fea1c5e9fb1444be0988455c1e51fb2a8cc846db522297108a0b2c2c3a2e5a98 SHA512 2a420cf97f55858ec6cac4a74bdf97f367b32fc07529714b494576f7828261ae52650972b9f8b80e5e12cd854f66e7bc4d2d2cd339d7ce8a71ab29ebd41e76fa WHIRLPOOL f5c6da6d02ec099072b6ded7ac207c3d6f6f7b674a99531216b2f03408ac16f530bea916f207604c0b76a9de56561ab2234c9b7b4e2413792e5e1fe521c8773e
 DIST kded-5.38.0.tar.xz 38112 SHA256 8b96b50313783b5edcf5bb8a0bc4873a844cb1ca662feb0ace9a932e8bfc5277 SHA512 3eed31465e0d0d961a4904a1a46255c67640309efb50374822fb72262f321cb7e6b67004460b7d2fe434a7c4263558cfe50dfae9f2492be08ae365995aab15db WHIRLPOOL 308476f557a4c2970480f352cefb597679d153c6431a6ecab42e76f3f393f837f0a2b8389adbd42ca0c6f843bc729f14bf2ed2bc58bca813051ee429808946f2
+DIST kded-5.39.0.tar.xz 38108 SHA256 453d349874b71a500afbb4a7c576be77bf38d3e87bd818269ccdfd27287c644b SHA512 272f24356de9f34f27d61929d475d7e76fd783b827686549db7a07961c7a5ab2b936bf9969808b85274f67cc2d5d37eec4c0562ba471f18efd522bb6cf4ec8c7 WHIRLPOOL d413f862a5dc3b704aee61cf51360e608427cc9d1f1f91b4b622002cfb49659dc412156fbe28f874de6c6e75cc489142b8e0ac6800a894b6a762f0a3e1c08085
 EBUILD kded-5.37.0.ebuild 709 SHA256 36c422b6a834cda8f029d91e0fc04ab901366870341be0c3ee24926d2483f337 SHA512 e0c719796f4614e4306aa8b5b49e9f832b81c3d4f9ab5b22a40376920dc996be940a1c444c030b1103c0ae307a057266c9df5b71333c67249a0fd3b3b82041f4 WHIRLPOOL f8c8ac8ca35bdc26968d68a6ccc9177a22c0b7b54d6c44838d2b4680fd21eb558b4aa8bcf39042dd12496eb2eaa92b8f8381f6e6ce089325e769954e2971827a
 EBUILD kded-5.38.0.ebuild 711 SHA256 28bf778b130201a34f90bfbc20b91504509eb9756ae8a36df1c4d273e55d6acc SHA512 50b7fe68704be1e119d6fa6a224c89600dcf2a46c8d8670487580f60d034d52f7f3c339a99ecfe16ae69433c9a0451c950d93a1daa3636c6b850b45646cc1b6f WHIRLPOOL dfded491c94426fdeacfc1dcb960c13b68e4191cb02afc9171824cfe260dc9961cbc1bb4d659ee3860cd6a09d3161e02caf32e299d6f02d11cce322e41f770af
+EBUILD kded-5.39.0.ebuild 730 SHA256 fcba918e866c1505e362de11c3464498fb5affc5c190ffb4b5910dc077505716 SHA512 d27b0c628c386ee6671b85b8fc075ae40aab27a064dcf86329bb83237254bceedaa9ff372c6139bb9f53f8a80d86e76ea708582253062d3e2b686b888504f2a8 WHIRLPOOL fe4f023c8b6410a715aea6515baeab7de2034074897d0594febd7b581e293b320ae15648f2f1b959d4304c3954c37897c46150649ee6fab546ba550839cf92fd
 MISC ChangeLog 8914 SHA256 9cc421eccb5e51c03cae931a2a83badd7e2937ff962f4316f0f27205d5381ad4 SHA512 d570b1e28f052bd6f7b9ddab3a7e3ab5b5d1948d4f0c4e7c0c91bd4949ce95a90c8d5629997e752037501920fce81868ae6e1310ddcd4ca3c7708ad46f590419 WHIRLPOOL 0b148c7627b322e1ab99f30bb5bc57b3e3e68b7b4e5a7d2bf8bff6251c7833b5e81cc3fee824c7efb5b46f67884e96aa84a10a2cb350b1193ece578c996879a3
 MISC ChangeLog-2015 2191 SHA256 e321ad0348f3c73d16239431046822a4fa136750313384fa9cf26d15da76b5f9 SHA512 02684693e1d0d10e2683250bfd25e35b6f50bdcf62e4346408780726f838e8e3142b6d344dc077f5ac860e0e683b5d63527df066fcf8e99d71faa4c0faa66298 WHIRLPOOL 0ab02e520e89ad30d26acf84bca2d912d532bc9489d31ac6425cd23f8fa7f2f3a2b281c5340c5a8fb5e3af61b2fd9d22cf9dce96cfc045c4e9d8b2f48a47412a
 MISC metadata.xml 318 SHA256 43cd48f250622a102d423a68b4f54b62554fa17977f6427efb2c499539d4e2bb SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337 WHIRLPOOL 2ab5f9c798a6585ac012670edb11964a0569b647b8bd218970a95796b1fed970e5c065dd39ce288ea8ce81be2fe0e9b484e9470b82305276b06cd06f55b0f919
diff --git a/kde-frameworks/kded/kded-5.39.0.ebuild b/kde-frameworks/kded/kded-5.39.0.ebuild
new file mode 100644
index 000000000000..7eb1ce3f4ee3
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.39.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest
index 72f210078308..123bddd5becd 100644
--- a/kde-frameworks/kdelibs/Manifest
+++ b/kde-frameworks/kdelibs/Manifest
@@ -6,7 +6,6 @@ AUX kdelibs-4.14.22-webkit.patch 2646 SHA256 2ea90e0507ac8e73bbf9fb34415b10e775b
 AUX kdelibs-4.14.34-cmake-3.9.patch 1297 SHA256 3c4032c088b1f49cc29d94038ab8caff1a7745e7db5ecb4732ee13e714a6b409 SHA512 61c393b257a27d4a003d94cd241c4ea6260fb15dcbdd6ff1ffff8ad031d8cbd4164545ed0642b5a3e867784cdc850d7c6ceeec0b26c2d04c37835fb4595cdafe WHIRLPOOL 5459a214586b827c1d0bf894cb5d81b9b671908f45ee4898a6cfaae03ac8a68b8231e50235eb435e9e47e9d1cf89e81ca08787617652b07ea25fd19f77bca763
 AUX kdelibs-4.14.34-svg.patch 1102 SHA256 11f57a8442e33b99328bee5b6c03caf817e8e6dff3d6c28c22e9f9205845969f SHA512 c4045ff6c7cfa82714dbd65981c9197087750f31fd7b0ff184f6106a9b1e7a68b814d69b3904d66cf51b71f950d77b04544fbb759a45ef777c6ba6a2e58f5304 WHIRLPOOL 5f7f89a24af28577dbaeacab1c86a6494798140320f96a2818aee347a787630c3168d5639f36ca09cb279b88849e415abcc690c4b9313c2ffe05501334a25991
 AUX kdelibs-4.14.35-3dnow.patch 682 SHA256 635259e9a40dccbd00e4fd8187c983bfeaf6338967d8dae3529af562845437d7 SHA512 b57635859925fe948d36a1115b321ca227083962353590ab9d46d245128a4a5a8fabb360a412ad239d2706fe18652f722249865cfa0abc1d3b84ed95e38804e9 WHIRLPOOL 42aae98b187909976782a43431a16cfbe5660faa7e18fec587dee13e72040c78293890ad217b57bed6ed30a0c4fee2e55232e21d93edc521eb520708b09247e7
-AUX kdelibs-4.14.35-enchant2.patch 1029 SHA256 e67a9534003145a915c0535a51492322f2564adc7ad591e5aba06e00e1c9549b SHA512 bc57e8d476d52d7c0ce997901cb3017c8e4d0ae25df843a884672635fea899dcc5d97e83790c95ba6ffff1570b867bfb1a13beed6020cd22f690a3d0926a7827 WHIRLPOOL 9e81bffb2860e693a7c038f66e342a555e20dbeb796ce5e928c6828910e9cda88f30e47ccfe4f643377709ead151de778c1e445945bbd6e6c697a62fdc137701
 AUX kdelibs-4.14.35-kde3support.patch 3153 SHA256 11f22c506b13465a3a32fd0d02ec0dc7be317da9f656e4e634f858a0efb24413 SHA512 e50137d57743b89010a9487d0e99617f5d1097d80e81278713c74eaf40cde78e42358f404eefccb47f7b29e1e6e357afdbc0cab28f7c4db855a00220d925e105 WHIRLPOOL b56eac90b4d64fd987ce70bfb9bd3d9f99ff059c5321490e8572b6a1fb06df971ba831e956c366fd2f40b5d5a6045148ab8b8d342ff17f66f51d0fa92ebe450b
 AUX kdelibs-4.14.35-plasma4.patch 1926 SHA256 3c82a364ef7a7539fcd34b759c519d173048be9603a9ff2d69bdb2f31d3df732 SHA512 3150a6a9821c52c5b131ffdf84d32754c60e83762a6df938f8d6d8afd3182303d0919e91651f6cf0b15c996f2762c02c0124e7bd086582a9874fbf7e69fadfcc WHIRLPOOL cc71ef23b79f77b53976c94d6a3f272357eb6a9710d75aff408268ab21aca1b8f93bc5974189c7030ee0d9f9673cb234680dc6f09bab5d3ccb5c1cd0a7c5973e
 AUX kdelibs-4.14.5-fatalwarnings.patch 1070 SHA256 43bfb09dd2717e9eff48c7dfcf1be82ef07305b35a04d39c682b7bc03751f78e SHA512 69767a980db082bf51ae42948d9703efe22b28f6a0e20a84c4d297a34c018669194e120fa5494dfedf34cc075931bbebc528818b58b1ce45525733768e5d1ec9 WHIRLPOOL 6984bb8043bf639dfe416a697f302cd43f351beb0f3628617237ec96282dec36a32fb1487c90eb33d5440baf336db7d553e962ab8903b3efeae72cfe5ce9f665
@@ -17,9 +16,7 @@ AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 SHA256 2d0ab01c1e495e77f911a07331061
 AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb8c33fa93b0398c99bb862a8cead SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 WHIRLPOOL 9861fe4b4b61c6d659c31c102938f9b0377bfff90744a852f8d0251c6c66e1df29dacb4059610d9ec78e706ad36f66b3cb6179550de47270d759acb4004c46e8
 AUX kdelibs-4.9.3-werror.patch 1525 SHA256 a4af430a72079fa481a3e0b00efece509820eeca6b71518286ccd564920c0b8b SHA512 d2df35a0330bc98745cedb0dba1733969198cb3024de8b1b70bc552b4abd0bcf42c8f17a40519189b29f4ab2d054ba7ee28436e274c8ed674c9b12620b07814f WHIRLPOOL 28313c1bdf513f17d237a584b62287e82b37be6f5ac86e709b2e45ba1f0faf69957b65e90552372ad6b17e83529d30f6f30ded1273aab2ad447ff2173971042a
 DIST kdelibs-4.14.34.tar.xz 11644736 SHA256 777d3433555b3257fe67167723020bb7f0da7b16daeace9910751e4b9bf9bcfb SHA512 57ba1591e6996af79f03e8a3d4d0c278c027ad65c717fcbdb857df68a3df47ddec6b7c34dfd682d590bfa9ed6800974b53ff29aa7ab73522caebc9897cbd81c0 WHIRLPOOL 7c1f318edadb6625acef33891e8fb751dd0c783a05f0e4bb2b77376791c43fbfee20bf8b72aab719bcfd8d271294263f2fc57912fd09edb38589a37d8a01c968
-DIST kdelibs-4.14.36.tar.xz 11644668 SHA256 e129d228afdcd72b68eec0e440899f284e1e48bf54f798ec5369c5b75676a523 SHA512 8578160d204c358c96623f6c233623ea8589aa3ae623b1c6b9f7bd8e687e1e7cdff390602d871195c92bfbe11862cc4a88f2d058450b60b647cd339575349c64 WHIRLPOOL cad8e9c68c3a27d118a38e8c0b63ba5c73e7f4ec5e0b68d0d4be27552cc3fd34078049a1402f02c5880ffe185944c9c092671c9720ec3a60263168444819cc4a
 DIST kdelibs-4.14.37.tar.xz 11642272 SHA256 4e9e4a1bf32f28427899b01bf19db01acee974e2e008ca659102a01cc0f3e430 SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1 WHIRLPOOL 4c0d6cb48d61eac89ad410b0555741809bcbb5adf2f1ecd53763fae04e79dc478104ad05db8dd4fcd43052a63d6b62db0f33e0d845a8d2c9d09f85c92e9233e1
-EBUILD kdelibs-4.14.34.ebuild 6519 SHA256 7df4bf4794dcf64d6b2e8847de4c24e41686b48adbc4fb17fa6790d1adc69402 SHA512 0e3dba5b6fa12aebfa06b54dcc35c20143c4a14220473d3cc47e21522d86c7f980eda4e4e4bfc7ebe930633bf1ee94343f9398e6d16732b79f5da40b19da7a2d WHIRLPOOL 127c3a0b0d2bd19b040a317d69dba012c44a4ef7ed9fc5301475b4fd0e441283e20db9c998dcd807bc6631db556c2a38e47eefcf063a614799ef7b9894f8540e
-EBUILD kdelibs-4.14.36.ebuild 6834 SHA256 c391975cef332800126c2ebbb4079d6e8d61c6b3d0c99e207a3c0f1a94d652bd SHA512 bb3faee8b54675368710d3bd312b17cd016161d769a7cf19a72ecffcf5a8477aadfea20bb1a7a59af019bc1b5e92a7d46c0e780d6453c34f1dee2f9072f3839c WHIRLPOOL e8e5974b22325fd340cbe02481df670ef73fcbd2f40c159859e723700c2258ffd2dda6edf4ec39329f42c08c307f079426ee915fd14657ea9a327967f70322a5
-EBUILD kdelibs-4.14.37.ebuild 6744 SHA256 245c2ec74c026fa8b271419536b7e71d253a25b7e8a5a8967e65114f7eae0403 SHA512 a1af0c6ccf80bb9ce9bf772abafd966049397e660f090abde6fdbecc535bee78d912e39bfe3d5f88c999e18200156710b4e6a6f8efec1e03f8ee49e32f8a0e88 WHIRLPOOL be7ca3184bcf087e4de477d6f2b03997b7884173d383defbbf7b12278b02a3ca89b8c2916f5edaae62067f8a27a3584553b2d834206b9de875082ea5e5b1f506
+EBUILD kdelibs-4.14.34.ebuild 6481 SHA256 67f32757ece4c8b65a9517446398cc498292cf0aca9502d00ad29bc0e15a2764 SHA512 ba37459f47ea6ff709dcc92595f10c01d39b0bbd3a487cce18ef5b3188681385190fd12299db19aa4d9b23fad66613904bd44b7b44b1ed4f8c71c21afc2759ee WHIRLPOOL 781a62b5a70edbbe0e7a0b8c9eb515d558e1bbeb261f6bc54d23e2977d3a78238d099c3d28b9512d8e3dddfa6ff1aa3512ca1e514343c9753b5f82666c4a8ee6
+EBUILD kdelibs-4.14.37.ebuild 6706 SHA256 bcb383787f99e55fb171a5baefe3636d5ff44ab7b7cad6823f24a1f5ef02102b SHA512 dccdd0408d14ec0ac0cfe44d559dba64bee1fe02f185ab58d3fd50593fac14aa4fc63878741e31111dd76d03e7b5d918328b3eb2ef7c5d7b5dafe37b41c5c5df WHIRLPOOL b543132a161e00f0875be4f02785074517275f7eb7093ce6f11dc90a92b99f338a1c56b51923cf9d6ae94fe7f74eff778ba9ad38f18cc179a0cecc557c8c56ca
 MISC metadata.xml 426 SHA256 7250bebf1ca3aeca7542d2a6f6652b248cd62ddbcb7604bc6ea3b30358e6e309 SHA512 ea96586720b37b26dd5f95225ec84a53cc2ef8732343ae882e1ea5ca20a077a2ca3b7d9f94a7a075f3a1f01858b70f7a4a933036f826c0c2d681bc63abfda2ee WHIRLPOOL 5fd82160dfff17a6e6c914f0724800c129e3b1d9b036e19506a73fd1708669a6e460a7fda10385d7c627e2a09f0e0237a961450e4369dcb08460dc4d0a20b821
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch
deleted file mode 100644
index 85be2d1ad2b2..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 668ef94b2b861f7ec4aa20941bcb6493bc4367be Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
-Date: Sat, 9 Sep 2017 19:39:14 +0200
-Subject: Fix build with >=enchant-2
-
-Summary: Forwarding a user-contributed patch.
-
-Reviewers: aacid
-
-Reviewed By: aacid
-
-Differential Revision: https://phabricator.kde.org/D7748
----
- sonnet/plugins/enchant/enchantdict.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/sonnet/plugins/enchant/enchantdict.cpp b/sonnet/plugins/enchant/enchantdict.cpp
-index 52f7fad..80e40fc 100644
---- a/sonnet/plugins/enchant/enchantdict.cpp
-+++ b/sonnet/plugins/enchant/enchantdict.cpp
-@@ -82,8 +82,7 @@ bool QSpellEnchantDict::storeReplacement(const QString &bad,
- 
- bool QSpellEnchantDict::addToPersonal(const QString &word)
- {
--    enchant_dict_add_to_pwl(m_dict, word.toUtf8(),
--                            word.toUtf8().length());
-+    enchant_dict_add(m_dict, word.toUtf8(), word.toUtf8().length());
-     return true;
- }
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
index cf9f89776e1d..1618705e295b 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
@@ -9,7 +9,6 @@ KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"
 QT3SUPPORT_REQUIRED="true"
 SQL_REQUIRED="always"
-WEBKIT_REQUIRED="optional"
 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
 
 APPS_VERSION="17.04.3" # Don't forget to bump this
@@ -166,7 +165,7 @@ src_configure() {
 		-DWITH_OpenSSL=$(usex ssl)
 		-DWITH_UDev=$(usex udev)
 		-DWITH_SOLID_UDISKS2=$(usex udisks)
-		-DWITH_KDEWEBKIT=$(usex webkit)
+		-DWITH_KDEWEBKIT=OFF
 		-DWITH_Avahi=$(usex zeroconf)
 	)
 
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.36.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.36.ebuild
deleted file mode 100644
index bae657f99bd7..000000000000
--- a/kde-frameworks/kdelibs/kdelibs-4.14.36.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit kde4-base toolchain-funcs flag-o-matic xdg-utils
-
-APPS_VERSION="17.08.1" # Don't forget to bump this
-
-DESCRIPTION="Libraries needed for programs by KDE"
-[[ ${KDE_BUILD_TYPE} != live ]] && \
-SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos
-libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support
-spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
-	opengl? ( plasma )
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
-	dev-libs/libdbusmenu-qt[qt4]
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	media-libs/phonon[qt4]
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-misc/shared-mime-info
-	!kernel_SunOS? ( || (
-		sys-libs/libutempter
-		>=sys-freebsd/freebsd-lib-9.0
-	) )
-	acl? ( virtual/acl )
-	bzip2? ( app-arch/bzip2 )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper:= )
-	kerberos? ( virtual/krb5 )
-	openexr? (
-		media-libs/openexr:=
-		media-libs/ilmbase:=
-	)
-	plasma? (
-		app-crypt/qca:2[qt4]
-		>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support?]
-	)
-	policykit? ( sys-auth/polkit-qt[qt4] )
-	spell? ( app-text/enchant:= )
-	ssl? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	udev? ( virtual/udev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-qt/qtphonon
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	kde-frameworks/kdelibs-env:4
-	sys-apps/dbus[X]
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-misc/xdg-utils
-	plasma? ( !sci-libs/plasma )
-	udev? ( app-misc/media-player-info )
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-"
-PDEPEND="
-	x11-misc/xdg-utils
-	handbook? ( kde-apps/khelpcenter:* )
-	policykit? ( kde-plasma/polkit-kde-agent )
-"
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
-	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
-	"${FILESDIR}/${PN}-4.9.3-werror.patch"
-	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
-	"${FILESDIR}/${PN}-4.14.20-FindQt4.patch"
-	"${FILESDIR}/${PN}-4.14.22-webkit.patch"
-	"${FILESDIR}/${PN}-4.14.35-3dnow.patch"
-	"${FILESDIR}/${PN}-4.14.35-kde3support.patch"
-	"${FILESDIR}/${PN}-4.14.35-plasma4.patch"
-	# upstream:
-	"${FILESDIR}/${PN}-4.14.35-enchant2.patch"
-)
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if ! use opengl; then
-		sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
-			plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
-			|| die "failed to sed out QT_QTOPENGL_FOUND"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DWITH_Soprano=OFF
-		-DWITH_SharedDesktopOntologies=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
-		-DBUILD_doc=$(usex handbook)
-		-DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DHAVE_PPC_ALTIVEC=$(usex altivec)
-		-DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx)
-		-DHAVE_X86_SSE=$(usex cpu_flags_x86_sse)
-		-DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2)
-		-DWITH_ACL=$(usex acl)
-		-DWITH_BZip2=$(usex bzip2)
-		-DWITH_FAM=$(usex fam)
-		-DWITH_Jasper=$(usex jpeg2k)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_LibLZMA=$(usex lzma)
-		-DWITH_Libintl=$(usex nls)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_PLASMA4SUPPORT=$(usex plasma)
-		-DWITH_QCA2=$(usex plasma)
-		-DWITH_PolkitQt-1=$(usex policykit)
-		-DWITH_KDE3SUPPORT=$(usex qt3support)
-		-DWITH_ENCHANT=$(usex spell)
-		-DWITH_OpenSSL=$(usex ssl)
-		-DWITH_UDev=$(usex udev)
-		-DWITH_SOLID_UDISKS2=$(usex udisks)
-		-DWITH_KDEWEBKIT=$(usex webkit)
-		-DWITH_Avahi=$(usex zeroconf)
-	)
-
-	use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF )
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym ../../../../etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	# We don't package it, so don't install headers
-	rm -r "${ED}"/usr/include/KDE/Nepomuk || die
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-
-	if use zeroconf; then
-		elog
-		elog "To make zeroconf support available in applications make sure that the avahi daemon"
-		elog "is running."
-		elog
-		elog "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		elog "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		elog "to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		elog
-	fi
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-
-	kde4-base_pkg_postrm
-}
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index 931ff1e0e4cf..80d84e09116f 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -7,7 +7,6 @@ CPPUNIT_REQUIRED="optional"
 DECLARATIVE_REQUIRED="always"
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
 inherit kde4-base toolchain-funcs flag-o-matic xdg-utils
 
 APPS_VERSION="17.08.2" # Don't forget to bump this
@@ -173,7 +172,7 @@ src_configure() {
 		-DWITH_OpenSSL=$(usex ssl)
 		-DWITH_UDev=$(usex udev)
 		-DWITH_SOLID_UDISKS2=$(usex udisks)
-		-DWITH_KDEWEBKIT=$(usex webkit)
+		-DWITH_KDEWEBKIT=OFF
 		-DWITH_Avahi=$(usex zeroconf)
 	)
 
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 898e00c8c49f..e3584db67c5b 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,7 +1,9 @@
 DIST kdelibs4support-5.37.0.tar.xz 3339044 SHA256 09d2a7817dbfd0aec82886fb2c5a83321d8b535a438013ed78d5611d2a00e1ff SHA512 c56d821d8f6cea31df7a1138ff050818fd38764fc7bd63de1c125921b86f00144eac7d569c40b2fe0dcd8fc4f006a0ba8af93fba2feab2d4a3fca1a8a1fa3ca7 WHIRLPOOL 0a29ea6febcf441441d3c46e324dd71b5f7926b19fdcb175d360cd477e25cedbfb9e4c668d500f9d74950e4c3248d8d8476366c890f6eff62e3ccfb19e04f57d
 DIST kdelibs4support-5.38.0.tar.xz 3340048 SHA256 f72aac163070bd116a112b7918a71d9dc79f945b19e5f449e55704e1e37f741b SHA512 5a5136d530e7b937fa6b50b184651a44eaed8ab61d762c826dbbc24c53bb89580fa948755c28a26cb1dae5a96fdf54b71dd917735682c7832951a75fabbe5d20 WHIRLPOOL 4eb39e0a88d128751827d3bf96704449d78896abc05e384f7bb03da046ea90182d032764590ba9735674bb040809945cc3146ac71dbaa05aa103995a3a9ef713
+DIST kdelibs4support-5.39.0.tar.xz 3340204 SHA256 d735000260d8565e812b96c81d510acef14f7b66e9fcbbd2d42711bd1bfcb20f SHA512 6278c6e3315a367824a7c158ced522a8e79a90f023723620467d0a87fc8908d07c341efd06faab2bf5590e5768722c9bd191b4ad29c4dbc77682e304b0b149e5 WHIRLPOOL 45145c74bdba7c97c82e1b579a5640e77ff924eaafbc5bd14b1d15b567f89aaeafcc087b02f20a515e02c1c4e9a36065c38dce8f2eae733c30ccc769d0045a5b
 EBUILD kdelibs4support-5.37.0.ebuild 2102 SHA256 c39993bad2bcd58243d2773692b3e4381b2042cec97bad1c8b739675a0718d29 SHA512 a7615623e24a9751fb0b42cc668201745f43bece4ba677b4ec3738a1063b9d8bce1fa26cb12e90a283a899d2cba39399929a81e90e6507dbcb690286d2450172 WHIRLPOOL 4303fb0c8ad9b2ad4b86e87a972d6c26fa6fc8c8472bd86f58d9694f085f6d7f661a186dc2737f4b44cdbb0780bf804b46cd6f1327eb589386c0cb5afa6fee7a
 EBUILD kdelibs4support-5.38.0.ebuild 2104 SHA256 42f0e76db12155d9dc08822c3fd2b2b4413ac8dfb2c28123ed6778fcb36413f9 SHA512 ea08baf627fe2efe10a8a33e4c4c9c19b36ca5f7b55f248e42f8ca40f8e787df5ea12f04e8965ab3aeb552b7d58a605b229cdec8d9b5402700d9177fe492c36c WHIRLPOOL d37bcee6aa2cb82652034ab1cad8d4a7648c75ee17f70ef400e641cac716156fa552d13a09a69c79fccb7a4b5b49e7b0d3dba2d6450609664f13576b0edf2871
+EBUILD kdelibs4support-5.39.0.ebuild 2104 SHA256 42f0e76db12155d9dc08822c3fd2b2b4413ac8dfb2c28123ed6778fcb36413f9 SHA512 ea08baf627fe2efe10a8a33e4c4c9c19b36ca5f7b55f248e42f8ca40f8e787df5ea12f04e8965ab3aeb552b7d58a605b229cdec8d9b5402700d9177fe492c36c WHIRLPOOL d37bcee6aa2cb82652034ab1cad8d4a7648c75ee17f70ef400e641cac716156fa552d13a09a69c79fccb7a4b5b49e7b0d3dba2d6450609664f13576b0edf2871
 MISC ChangeLog 11146 SHA256 96d0763448dc06489bd767182f9b8f29afb2131387f74e3df02a70c0b4842362 SHA512 c1ed0f007b2c9acc918a2b477434e37ba8a129d983145bb18222e95c442b7d95bbfb6cfdd9b55bd568638930f79777bed388ad1f22ea6775b9c84823f7aadfeb WHIRLPOOL 41301326e369bc07fe41e7ed0fa28b4354436e97a018e0fe23d7280dc9a8cc98ed7ab2ef733447fac26b699c5acca5830bfb6d234d92cff2e26d09deb36d1861
 MISC ChangeLog-2015 2822 SHA256 6eb88fe7e0fda0acbe451d73eb689f37ab82b02c0f699680d19139ca838893b7 SHA512 daf555d74144338fa9c2b9f62f88824c52cee66b116fb001de18e0cd19ceba21b871edef0f6053a3431edea59cbc582b5a348c9fc2801c1a6ee4287bff9dd707 WHIRLPOOL 26461636674b5ee8a126673c5a464d454032e468b715452d6dfaef84eaa8809e272969f1994c137860ebf1c6f79b227815dd61662e048401d466bf952fabba71
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.39.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.39.0.ebuild
new file mode 100644
index 000000000000..705c2f4ded1b
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.39.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesignerplugin)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	app-text/docbook-xml-dtd:4.2
+	virtual/libintl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+	dev-lang/perl
+	dev-perl/URI
+	test? ( $(add_qt_dep qtconcurrent) )
+	X? ( x11-proto/xproto )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kitemmodels)
+	$(add_qt_dep qtxml)
+	!<kde-apps/kde4-l10n-16.04.3
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index 9966be15212d..104eb6d57546 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,7 +1,9 @@
 DIST kdesignerplugin-5.37.0.tar.xz 90656 SHA256 bc691bf91e4ea15323be728bf47c3eb02905adc85a2967acd7b731bc06002785 SHA512 e68ec94d9e7b52c90e4b7a8ba70e8b3dcdf95365f5237285e681c7b6ea2e763876a25be787fa3e154cf535f0dff8f28246376206b11f6cfa7670383800bd67cb WHIRLPOOL 8ec92ed9d48d3257fbee4e97a7c3b702f4616092b4cc24edf3acba292db46958b8565edefedf68830930a356cc45ab9cbf6792ecd90376a11fe6ddc7149b4fa3
 DIST kdesignerplugin-5.38.0.tar.xz 90704 SHA256 c6038ac44f05083e6d1e7e2d8b950b31d493f1bf587f4b89984fefae5f973b66 SHA512 076b2ec4f673e655f7fb7c5c7c3d397527c2c04c7dba86fc86c3aded71180bba125997321b98053aab8fc93a4bb4113f899415a9353b17889d6a8d03cadd349b WHIRLPOOL 02176a6de1106267750f8a448fcc08b7f581af26ecf8aef28267d70cd4fd6c1234efb7b388fa510d41195e9a89ca44f96524e398ef3a20daf829e65b858e778c
+DIST kdesignerplugin-5.39.0.tar.xz 90772 SHA256 ee9c33c583caa1209b112119b2ba6c1f3c14f015b6bafd6e54c97acd8db1f9ac SHA512 3324989254386d3a5060172d396e312551ab00d1f524e43fa2d97aaad3dd88d007f635fc61682b4fe2d28f358f491bc9c4eb82842ce31666e49c7b4824929406 WHIRLPOOL 9e0bce48565087c6c11cbe466034078576836d813b9c80e4b1c4d26aee6397da983a690cb0c0213591981d328df8263fa4b5c77fb1a26c63e38ebb9503211564
 EBUILD kdesignerplugin-5.37.0.ebuild 1421 SHA256 7739eccc2458d2b78979c70354683ff590cb49046934cad7fb0346ab734d69e9 SHA512 7752a10a06dd018814ee739585cb25140708d494f53b57d959def1218fe67bd52cf394d1f3b39c1fe0abfa600454d8408a0ddf5c414a58dd4b3a381af86f294e WHIRLPOOL b5f0c689ab7087acd82ec0b3c852a01bfcb08ff2742f46b46ae7c4ab4f4e323579471842cc47675e86465ad6a54fa5793574ac9ef7bc9ee2bf7ef64e72fab6b0
 EBUILD kdesignerplugin-5.38.0.ebuild 1423 SHA256 27a7cbc589c540889008d9ca23ca73b1329d80ee3d246ae3346ec8579c9dd2f0 SHA512 db23c0840b38a75d2898d0c952d350f86b4aec21ee7c7dc65d410ba9f7395b3aa6adc10b5cf3e183cf2494329359c6aed413aafcbba4ff4289b7ee44384c7f7e WHIRLPOOL 67ea2f53e0149d60b66506bd849afe79387137a8bbfb57533085fcf5ecb467dd692cbbce9175ac3ba2840da9102bf16002e9758ffc016d7c8ece2b511c597b7c
+EBUILD kdesignerplugin-5.39.0.ebuild 1442 SHA256 daac483a30e2f7024a462aa4612488f6512c63db41545a4be924e080ba28e6fb SHA512 46f7f080ba291ae597a916a986f1484ea8b89869ad9f0c223af87922b9bb18f6ad419cce221025e3ceddda7f9825b787eceec7616ce9d6248bfea54297f8fd3c WHIRLPOOL 6bc1d7ca66f7137299f868e8d6eee1a5ac32c907d9ae8f1f4351a3f9f8aee66f43937a94f305e436c836060985de98308fc19d8369cafb64750e4af5438da361
 MISC ChangeLog 9619 SHA256 1758c47352cf5e1a6c33d0aaefe13ee522a947b0ff21192476e7ee2e21760730 SHA512 0df84a18bf397fd8c766cb71367911270dc5cece17fd7ea35120aaf5368da36d03a3563fec30d14fbb1c1221a8530d97dac90d7ec27cac655803435fe44ab105 WHIRLPOOL f464c3f5db1fcc49d1d55fb04f68c603e2f6508250c390db8d3cf0b19b62b3d5c87112a166bf08e0615026af649ca8ed1a56538b6a1584c25bed48c7844555e4
 MISC ChangeLog-2015 2538 SHA256 41eb14e51654907510e378edd2190d18f4859152797aee955c6b6a248e27d53a SHA512 289969666660896730507d99b3010a34eebb9ef4d54951ff7f902e5308723c644b53355aa00c9c00549c4be0da2fc567760c4aa41c5743139fb40ebea278c9df WHIRLPOOL 53a35eb189b5c7a8b0ed0c29c3a4c9314b56d3be5730c98a1480010de6fb45eaa0764840a39d805d7689497d3ab6211ba737af8dc7217d8e49a675c2843c4ae7
 MISC metadata.xml 402 SHA256 762dab245d5c1fdc4ad1e1251bb94401850c27696952ffa38e293f000519b3b8 SHA512 c53b159358adf3556c50482484c631542f17a968d9b9481b6efb6552ab1244753f86fb3b992bc47119a1f6df3c4dab0f003887ea9c45207cbb1d19878dace05b WHIRLPOOL 5f352bda288d14ddc00b9260abb9bfdd4425330ed50b630e1461556d98902982c2cf78d1e1d17c663efde148845588fe4b3103b02aeeb75604516541899ca992
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.39.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.39.0.ebuild
new file mode 100644
index 000000000000..74c0ebb52435
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.39.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	designer? (
+		$(add_qt_dep designer)
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kplotting)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+		$(add_frameworks_dep sonnet)
+	)
+	webkit? (
+		$(add_qt_dep designer)
+		$(add_qt_dep qtgui)
+		$(add_frameworks_dep kdewebkit)
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer KF5IconThemes)
+		$(cmake-utils_use_find_package designer KF5ItemViews)
+		$(cmake-utils_use_find_package designer KF5KIO)
+		$(cmake-utils_use_find_package designer KF5Plotting)
+		$(cmake-utils_use_find_package designer KF5TextWidgets)
+		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
+		$(cmake-utils_use_find_package webkit KF5WebKit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 2d850260a668..da6c5064e534 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,7 +1,9 @@
 DIST kdesu-5.37.0.tar.xz 44660 SHA256 ea37e8517ab376f86c9d7df726f0f8f143fac198c6a3a6a26f2e276ae69fd0e1 SHA512 6b3b6c51637220a5f80115e81f82a551a596465916fefe707b7dad23b423d1198a760c5da8392f8da482ae59e05fb9d2bca360859bde7c20d4928c49eccb896d WHIRLPOOL 3ed216a6dc1aac6b0c8a47dd9599d891b072555b1677676c10347491304a20d1cb6303116ce9021162c2a3a0e9f22d3c9440783047374411bb5245769e7e2f65
 DIST kdesu-5.38.0.tar.xz 44928 SHA256 25b35914fa9cab6f70d09970324385d7ea14f3edb6ff1908bc12e403e31732b1 SHA512 6cba51f47172e28a1466b4efbcbd98fec06fad894c789fe21a28b0382162df414350c43a71151177576a1eb76298a9f0fdddb3042fccdcbdaa08ea63a655000f WHIRLPOOL bcc1c0ad87eac9f858c6f90a23b209a796690fd22864b1a6419ea90af5f288b913c1b9516f1e7f1f9d61909a608cec489a75ec85261bbc98667b41818304a15c
+DIST kdesu-5.39.0.tar.xz 45096 SHA256 9d9b1d202ad09993dd6c0bfe3bf4738e1867dc563bcd49b664e3026534fc5b0d SHA512 28de20d1910d8fde6ba7514e3d9890deb93e04476376461b113af3b504c71cd59236f5d00a0fc0455a38ac131aa93fc84eb9cdafd93bdb8fc05fa9b23e9d3026 WHIRLPOOL 1131cca0e214d0cbacfa5ad9cb65dfa63d5ba994f0ce0d828938266616b874b6db373476230582e5eb06c5a00fd7f00db9f1b875449ba201a0514136f0bac175
 EBUILD kdesu-5.37.0.ebuild 603 SHA256 cca46a0517ffcea862b52afa88d824ea322266fb1a940efb59c96b036b5d5eff SHA512 75720b6ab8f88d7b73cd43225c5f8bf164f1ee890ec8fb8899dece6ee152f69c6313c524bd6cfa99f729998554ce54691e9000157df0625ba0cbbeb61b1cb22e WHIRLPOOL 63cdd0d42b80d8c2fa347a106ba240b0087d761a9977e31e1ac39f5f784d281e31c31fc2810079c81ec9662a1b37954218f0573c66062d91d14a20fe942f36ae
 EBUILD kdesu-5.38.0.ebuild 605 SHA256 1abd3b99f01482f04adc4b900a32d0d063a264eed8ef4bc622b354cba035cfbf SHA512 1b9c9d25ec5263ae0f83db73e6c2410bb1e90768a69df3f05ca8d499930591c4ca346b705dcb821012f8d9a0110ad4b248671d38b4b7b4cce513fe6ec51b4f18 WHIRLPOOL d010f8b7c27a312a091e2d4884d3e1d5acb9cd4d6d3d051cfa07b63604b680a6fb49c064ce701f65b3abdaa2193d0d15d972760379bb497f0eda3cb3ac45b48e
+EBUILD kdesu-5.39.0.ebuild 605 SHA256 1abd3b99f01482f04adc4b900a32d0d063a264eed8ef4bc622b354cba035cfbf SHA512 1b9c9d25ec5263ae0f83db73e6c2410bb1e90768a69df3f05ca8d499930591c4ca346b705dcb821012f8d9a0110ad4b248671d38b4b7b4cce513fe6ec51b4f18 WHIRLPOOL d010f8b7c27a312a091e2d4884d3e1d5acb9cd4d6d3d051cfa07b63604b680a6fb49c064ce701f65b3abdaa2193d0d15d972760379bb497f0eda3cb3ac45b48e
 MISC ChangeLog 8957 SHA256 6a383c009cedfc219c9c03b1f599b72efb0b9fcc760b32c87f308f9553cbae36 SHA512 707491940c514351848e33af2690142c42a901e83a632a896869f5a8a27c07bade2ea7ea3e997595c7c7351d91ca69b70ca9d3c75540202cc56198e3d6c2f2f2 WHIRLPOOL 01263bb5c25a238a48590a032847f30d076b0dcd1f9faaa6a2b102eb70a04e81b92a8a1d956c463b57aba11bda979fd3a358e9a6c5ece54baa1f243409a286c7
 MISC ChangeLog-2015 2222 SHA256 c7aecd35c00550c709881cfa5bb3cbf54704ead0dddea3b679f52f91dcdff2d8 SHA512 072838c46e879e5774a320dd1e49e29cd36b2270744ae6e086d5ad4ba5cbe6c2d94190605b1d11e1c9f33b8bf71ff0cde6e9add649bc20da2bc04e023d6e2029 WHIRLPOOL c183aa6748fe86b7a69746f0acf49d0ab459a9ba416702fbbe3aa54bff45b918057929fa762dd5e48e28b6a22f90242ed8a455953ebf03eb6d0a5dcf44ce11d1
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kdesu/kdesu-5.39.0.ebuild b/kde-frameworks/kdesu/kdesu-5.39.0.ebuild
new file mode 100644
index 000000000000..bcf4e8b0b47e
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.39.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index f87a2e8dcb46..7ce8d3fd6b88 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,7 +1,9 @@
 DIST kdewebkit-5.37.0.tar.xz 29328 SHA256 e1c1a1f6514126a07e4ef7fbd4258c4a9ca068774b26b6748582f4c8415103de SHA512 3685f5f4eae1699b697972a78782270bb12d9ab4671e62eb71ec6d91dd97f6932d97357e904e622c7729576974ff43a9644eaad9dad87c85022fed3ad09559cf WHIRLPOOL a5510dd5d1b7ccd69b3f7af316ceb01a9b4906cd26b5bedbea0f8f6103c3df7a5a33d8830e6895d78110ac0aeacaec62f35f76458e6b39e3afc162a7da801e9d
 DIST kdewebkit-5.38.0.tar.xz 29336 SHA256 ee8375464179fbdc167209608595792bf188618258fe383adf36affca65cccb2 SHA512 63cdfdca77cd1a16f263fff55bc8bd97d791d044035578cc776609f16a02d5f556be158c5f5d39e069c73a144369414ea976459975bb316bbf048d52ebd6b09c WHIRLPOOL e5f068c6fc0fec2e16b4360f593ecf042a04a44b41200792b3a910690fbc99e26df195c2c9c2a35248940f23d1929a8efff66ecf6f29e2b6af4a2843cf2e83a6
+DIST kdewebkit-5.39.0.tar.xz 29336 SHA256 dd38c6d50681967cecb5debcbd1acc5135d465f15c46ceb7f2db32c4ffa0c015 SHA512 4df9c41ce3e40d4a046fb03a317b0a546a18613a8adb6012309c4e18aab387183e65ea84d895b8e65a4488be9ce23ba153da445ea0e98241cdfaa1483603df78 WHIRLPOOL d861aa716d99b3f8caa8ac89ce13e62c9fefcde07e55ce76ec46db3fc29d0ccc3726b17fa290430a70d8c692550a9f1fdc9705785932e5457d0d7edae2dc3713
 EBUILD kdewebkit-5.37.0.ebuild 643 SHA256 ab41a892f9eb7bbf7da02f490f1b68e01b9cc7514b31e7dbdfd753904d483a66 SHA512 59683455cd01e39603e5aaa3eef91c3344da8b34c0f8051245f0db9cce9b5365ca721f7c25136cd545361f900108753fe703b39c06d6aac6ee928400da602d60 WHIRLPOOL 281d5ea3e816efdc5572abec68aa5520c77f003fd7f2d65b8bb7f3854d3dc2fc205ec587c1c66606311dec0e94e812a75d4e2d00930f4e2605c0f28902911260
 EBUILD kdewebkit-5.38.0.ebuild 645 SHA256 9b5ea5f5206fa187b36731a6f1ca191d74ec09d18ba01d1319deec32dd54f961 SHA512 c1837b776abe1cdce229312f2dbb0aca8fce92da7ca9a8111921462e8c91b910ca0963afb90e21886e226bce042d6cdf61655bdff1f9e9bec31dd4d08169ac6e WHIRLPOOL c7ce13d639a9df97661ef561ef6c63ee3e52a9f76882352b04a315c1cf95af5068d4de0bf33d0ef7c496191d9c9856ac888405b9dac7cbde723e050bca5b77f1
+EBUILD kdewebkit-5.39.0.ebuild 664 SHA256 537fd5850cfcc719213e982ae26beb18b6a0076474d6b15456a7c55c424a4df9 SHA512 e9d3631f00623dba257d1d4e4a1b602c9eed47f3773371f59a152911289c03a0f2f8dc6bfd6c5772e21ab8b94669f7aac38dca709b1a8f5f9569c4ad0d6e8e33 WHIRLPOOL baaa1e417503aca788a2371b332c4bbaa64611a8ad0155bffc0de12180929917b2089f523747eaed87a44cab14ff877872a3b838ea90a92b1933e401f6eb6b55
 MISC ChangeLog 9235 SHA256 97a56af8fefad9cde6e68108022397e0d37cf056f801011f3c7bc3abde78adef SHA512 0ad88687bbb6acfd1f458e31c4aa66828c24c6e104f471caa13c31677937e3dc5b2a34d3ee0905b9eff0bebcaa7d026b4a34396a3d7be60e7b21d57bd7e5701a WHIRLPOOL c8317df6d7f6eb47d072286f3e6c2be08426360e0942be50150feaff462b90d06e00058c3c3e83c9a457f425c5e2a31201536fc4812aec4bf5a1665585b5390f
 MISC ChangeLog-2015 2348 SHA256 155e45e8f61eb2f46015bba0d2ccb85150a7dab4c9dda9c5de179ca72ab3d224 SHA512 51621c59c0eaf0f52ee9ac0d2840e8518295e690d09f1d04533e135fe61dbe92fe70f642d5c6ff4c0ec614d81dfe9d16048ca1f7d4aae384da07a17079291db4 WHIRLPOOL 283ed2fe216645edb48ef54b1b4525aee37f337a33acb3776c80119546824931ecd9616d57703965561dd7d79e2388561271fbe143d128da4a6ed143b1e78a31
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.39.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.39.0.ebuild
new file mode 100644
index 000000000000..329737ec2043
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.39.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtnetwork)
+"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 129f5f7f738a..9585105355d5 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,7 +1,9 @@
 DIST kdnssd-5.37.0.tar.xz 56560 SHA256 bf30e680be8e1a00fde32a97517c368045cfa91e60ad51896d966361ed372d0f SHA512 92a4401c21a9dffd1662b79b92c4cac33bc4f6ed9664573f3704bf28361420b8104cd99facf0d36b97161d9d669943337b132fe0dda94c008fe323644db4d0af WHIRLPOOL f78cb2ee5b95cfaefc622e9e01b863b89c55b21a2a0e395ba76e839f26a0f1c24f49ff7368bf1760c246630f49086ce6dae28dc847be6a8df8496994c2eee2c7
 DIST kdnssd-5.38.0.tar.xz 56544 SHA256 1d70cc194e45fe12e09005948fb794a3deb1e2d58d0269bef3a30a9cfbf32f80 SHA512 342426377f8d108a9aa340a1bc32183b71689cd841dd0665f03014862da9c6e749183f003ca759c89295269efce269953b8d808d2a58a68bdf4a09112c92dd35 WHIRLPOOL c85b2d42a4881c7e1b49ab254e8e85279e2b05d182596e4fc5a9a756cd8fbda2b29ec2c1554dadf545861a29e500ccae42f73522f70386ac3b2fa6112593c633
+DIST kdnssd-5.39.0.tar.xz 56632 SHA256 e550cf9af93f9b22b49a812610cd31f286caf17cf44c82ed9b6d4290390f0db1 SHA512 24d68c55a2db721ef8764a64055efc23b529a5288f6931f21b5c66c5628402788553a54a40ba9d0111d63f10ee39060f979ffddd1495096a3d9c0fcf096be072 WHIRLPOOL af6c4dfd6913cf4199ae5d90cc7485dce61ae046534bcc136c19940d62d10870d96ac9e4defc7a903f0f6b11b57b2ceaf299155beef109fc5c4f346b4ce882a8
 EBUILD kdnssd-5.37.0.ebuild 600 SHA256 c5a0e69c0a5569500e46b97b3b546a247670daef9fb8c8420b11d1842bda2cb2 SHA512 a77faa85612c6b5d96956452dee7eb7fbeff5fb5d78955dbc968a555636532dd3a752b2f75cd02a1a17a585cf22ee6399af9c27d25de52168eb39bb7b3a60c54 WHIRLPOOL 4ec737dedb55ca4656a5e1abc48fad82b72aedbfc9358e9521a4ec13377e8461c78cca3f5bde5e3cd6e23662faa7eba746b33ee4e128df808135308f0d943586
 EBUILD kdnssd-5.38.0.ebuild 602 SHA256 9797c7b617a30a543570d42457c59274ca2e337178431e508e32831bbc34872a SHA512 1ec85ad6a20e1ba7b12e8cd179eece52fc8bec76f0bf318679665981c7225a56416fa6f3464ed23ee8fa07a077b2d2942a842043d5ad9f7ffa28b6381254b04b WHIRLPOOL 97b216b5811fc862d25fcf8b1d7b80f644c47c93621c289239cca51f9e517cff94e9f4a370bdf8de057bbe95c44e9318b1fec19bedd9ec7de244c60733155dff
+EBUILD kdnssd-5.39.0.ebuild 602 SHA256 9797c7b617a30a543570d42457c59274ca2e337178431e508e32831bbc34872a SHA512 1ec85ad6a20e1ba7b12e8cd179eece52fc8bec76f0bf318679665981c7225a56416fa6f3464ed23ee8fa07a077b2d2942a842043d5ad9f7ffa28b6381254b04b WHIRLPOOL 97b216b5811fc862d25fcf8b1d7b80f644c47c93621c289239cca51f9e517cff94e9f4a370bdf8de057bbe95c44e9318b1fec19bedd9ec7de244c60733155dff
 MISC ChangeLog 9016 SHA256 f038438a672455db1c790f4c859447326e8d57e3cac5b110318e19ff2a8fb3f6 SHA512 655b56dc8f29d059afae96346b9cd95017827bd95e0d9f942fce4700eaaba34135483a9efb08127f013caec6c4ffd627b97e5c601607545e8191e766f8d2c171 WHIRLPOOL 501bb30862a629e3241ecf4a2eae397fc8911e9548634e1450d19d8dae198824816877f0303446dad44a16e389da1d123e5f328a1e2e5a715708bbd4c34b394f
 MISC ChangeLog-2015 2253 SHA256 34ff3746f7f11cfd9025aa9b0704e7ee342af211928e1405a181f9abb8e107ac SHA512 07465ad7b5703a566d7520cb53b0f49dc414ec07e668bbe8e62e33252294d4a893c313fd9391ad297f8390c2676e51be93a37a2b64e5432ddaa3dfe353840e0e WHIRLPOOL af1106856dd6a72050791b9d0d1b243fb879b17f0e8b5433027d5b94f9d52025348247e27f273bdee439907688a126a0998c54d2a0d510d88b2acbd60428b20f
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kdnssd/kdnssd-5.39.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.39.0.ebuild
new file mode 100644
index 000000000000..9b4e417669ea
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.39.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls zeroconf"
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+	zeroconf? (
+		$(add_qt_dep qtdbus)
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake-utils_use_find_package zeroconf Avahi)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index c7e55cd7a642..fe6276a79ef9 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,7 +1,9 @@
 DIST kdoctools-5.37.0.tar.xz 416840 SHA256 f4031fccb1e7c6017456840daee1589d2e6b7d36ee263a371446981a312e6c3d SHA512 2f3deb54e186eb1efe94b89886d9bd48b035a41754625309ba886b41c467ece6fdf5f3aaf7549df3bc36dae3f3aa1e1982c69342c019410ffa8a5aead0b277a0 WHIRLPOOL 9032e9642e7b16dbca7dff18700a6c2e5a93580a4c1edb06cd8feca7b43f71b0c2632299f31dc6294c2aaaee9e5b2a536f7893810ee63b0839b9d89287225a45
 DIST kdoctools-5.38.0.tar.xz 421276 SHA256 c95f7e604bd16c3ef97b3fc0320a5656ef1ea3b3c75b7d4d22348391423c7b39 SHA512 5627b489e94321cdcc3633a8ba4fca4fa5d02812f68a1506e866f9d9b9d7614478555ac10f151f9c387dde1ad39bf4c66d104025576071c8aa50a312b91ebde1 WHIRLPOOL 1737e00679a3c32a5c9c693623c69b046ecf07bc69bdf43b281ece5d6df227a53ae5fca26f904f32849aef609df80e8e117bba38820ec38997a78a5b0b7e5d0e
+DIST kdoctools-5.39.0.tar.xz 421364 SHA256 57a12705b87754d8bbc76e3400691d02072d61bd0e2e4b62845dca558f9be49d SHA512 a9ef804175ed465753bcac7bee2d92a7a17f24b0c778d86c9a05aa09e643f949ee388e5133249bc27e13fbea7944fa10906a75e894806094700eb25b6971b95c WHIRLPOOL 2ae9dab4393e41155d681239e73bbb4e084d19f66f6cff21d4a5c85d56636b25c48c66ed6e374da4d3613f26241c7b72379a64ef5e82d29cf1d0daccfb06685c
 EBUILD kdoctools-5.37.0.ebuild 488 SHA256 444229d8ccf8670e87dddc411f047215e8ad42d5c75e35e8d0f59b2aa868d52c SHA512 ec9076ff113cfe1e5beb3af9c24a4b2c9486fecc09249ca6f994761d0ecc12495d63fcdf6997a479f00ddc42ed4a4c9c17bb47adc5fef9331d6161dd252585cf WHIRLPOOL e7f5da3ed829b8b7700ee39cd74d0688e6f2823c6e0564ac2bc36af8995a74eb4851112641f4c16bd1ebe0586d5e1915640f5146041e145c199c7d1a06306c21
 EBUILD kdoctools-5.38.0.ebuild 490 SHA256 968b8b0f10c8f790b84db92cd009769b6bca6606c2150c9dcb20adb582821e5e SHA512 accd5c686a5ce39e0eacf9cea96ad41bdeb956ce0feff745d41d1e5a9686fd47cffdf52044257145571f238f0ea85be7237bc7685b0d3f9aa807072b02fbdbfb WHIRLPOOL fd8c1e6eed78823c180bdbe521efe36d339a4232a0cbd08d9b57fb64ff13050d62cc7185fb9d4dcd62aff9d90ccc11beceb2ff614c3692c2a3b648644851dd23
+EBUILD kdoctools-5.39.0.ebuild 509 SHA256 fd1aee4b09965146d128c54162031c28fa1b35ae1d79639a59bc56c197737b79 SHA512 e42f6bdc0e094eba514d182b8f8791bea04bc8bddac3209af94437ef70957aa058e3665ff2d222c5feb721d7a82f1288798cb45df059fed41978d55198007174 WHIRLPOOL 2873a56ba63487815f8339897da047bd25fdf5bda34ce88f3f3ebdc34c1ffaf2c32b17ccf87efd5148aaa0ec860cff9e0fa1b5d7a092d45ced9c9730c01d928c
 MISC ChangeLog 9411 SHA256 3cc2460c12a65331cbc96be6b07004ae827775b53af7267fd22783a5970acedb SHA512 fc9443805b8053e7843e78d3c3f97bb505ab5e57af9756b5d9702da5dc85648811606c396c5e9a9e3e208197e4b5ab305c14bc4a6d5f53514a8f9ba9365aa47e WHIRLPOOL 20989ea699394f2f343fdfeddf42b708e523ff1aa5558040c9794788774729c5a831570462fc72156693d11595bc7ad17309bfbbdd79ac99770e326025cb47a5
 MISC ChangeLog-2015 2348 SHA256 a68596a723e9c1719730718b9f0bfa93eaf4e59cd47ee890f000952ee6cf6983 SHA512 fc41673f4fc50dd69f6d23b3bb4ba98b49ac26e5a45eedc97c9cf0ffaeb6d0cdc02eb025d444d501e56795bfe6271367ee5cfc45a025a7abf5b0d83e49a30f4c WHIRLPOOL d2793010038f08e7fbb293587a14fa21295a2b9d6fb7645e4db4cc665e53ed21e6c25934a8a5a880a36afa79da85b87aafd8a540a0e5eddfe3dc6cf3d9494209
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kdoctools/kdoctools-5.39.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.39.0.ebuild
new file mode 100644
index 000000000000..9cb56de3d013
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.39.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/URI
+"
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 36a5588c8cb5..8dfff3df8711 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,7 +1,9 @@
 DIST kemoticons-5.37.0.tar.xz 1695528 SHA256 d8c6bd991b04b85a6a7ab891132e6e3f46427467b67a45a00c7bd416343aa9b3 SHA512 1a506ef73bc6893f92f9c274403e8415818dfa2a8c9a4ea3c72b7cf95142a759fc86b49c7e25daf94689a5c214bd6ac15839ef88ebb54902e3df5756e7369756 WHIRLPOOL f2d77353f0d5df91ff8c3738639728b2c47257c7eb04e2bbc1978ebd22570d5b7b6826a5aba9b348666fec385a550658c7dbd801f004b35316d0f2ae8111dae9
 DIST kemoticons-5.38.0.tar.xz 1695676 SHA256 a5b54d48822055e409f04fe4a85bb057798c0b0c815a5f7c6ca24bd47c4809b0 SHA512 d0d0f013aea0830e09bab10139c65ab0c4206d96340bf2d8a754232a71ab86f02f31261660116750c146d24c79560f6c090873b5e91dfc9c044e94c7a93abc81 WHIRLPOOL 0949271abeeaa25f7c6c832cc0172987bd79927997d7615efb76ac16d9b641142f8715b18e1ae07b0280e532b0734b17cc86a30e520847577b73d7f711a9e6ed
+DIST kemoticons-5.39.0.tar.xz 1695696 SHA256 f05d4812ae8472fc455be7bb6b8e5f45ffef17b415b7154f08ba0eb293d14f8c SHA512 8a390baf3a4924254a3ea0e80c3c3b12a19fa18b19384fd5a197dcf1837335a727de4328d6a74c4ea0444d0cfb8e0cf30f44f0b166e3f9a11b849da7553fe636 WHIRLPOOL 9a2f3e44b6ebae7d822975ca6c68366b98e609fa047804b0bec2b2439f87bb2091ac180d03e1c9ca0f702e693d867019360785ffe0e52fe6a924385b87dad323
 EBUILD kemoticons-5.37.0.ebuild 580 SHA256 071b976b882950f2b86997f67291926aedc32693f27c797c93ca647131dd905f SHA512 e673b08ae402da0f5f7eef32a0d652ca897556c3d1c4cefa412e7276152ed25bfaf3748e20780eb7054599f23a14de865b0a7fd5538d015d7b44d29017dd3d6e WHIRLPOOL e9e7810aa0d8411d7c421349152d5b943b6406ee07dbf3ea6217b78ac3cf8a97d109ea5459138347d5e7af460d40866f65b4174a8875210aceb0478e00c0b4e5
 EBUILD kemoticons-5.38.0.ebuild 582 SHA256 744074cb811a958f5c3aedc85ab008c1cc837542fd053be8c6d7551683093488 SHA512 47d11a591135652a3cc4986864c23457ffd0d8f9595c7e03c771d1aebae977b9d04b5346ea943264415561d4380f1ce88b8d78548d9ab4f1614a6939690a22b1 WHIRLPOOL 3027325e5450a7765cf0bdf5b39e9d6e0b9f53c7dc20a88fe89262382c167145f00d024a2aacb6f5bb1db540228b930cf08e2d4815daec3d916cd4993100c6ef
+EBUILD kemoticons-5.39.0.ebuild 582 SHA256 744074cb811a958f5c3aedc85ab008c1cc837542fd053be8c6d7551683093488 SHA512 47d11a591135652a3cc4986864c23457ffd0d8f9595c7e03c771d1aebae977b9d04b5346ea943264415561d4380f1ce88b8d78548d9ab4f1614a6939690a22b1 WHIRLPOOL 3027325e5450a7765cf0bdf5b39e9d6e0b9f53c7dc20a88fe89262382c167145f00d024a2aacb6f5bb1db540228b930cf08e2d4815daec3d916cd4993100c6ef
 MISC ChangeLog 9294 SHA256 4dd4a6c3752a620a3d0a3528e17261cc56e86adbf51f32810ddf2a84c851014e SHA512 29214a131b0a26cddc9aff94cbf2289fe7dd86cd5c121b3516e393ec4a6029923d98e0fbaa8bf79d6e4ad762018a37de5d42ae4ba9c387cf96126e772afe0b89 WHIRLPOOL 45bb0cc64ddac5eb89fd9a1def4e303c93dd340e5e6ddf7d838d06506f27b7b85745f23cbab06974763f77df95e0628753b6639de5478bfbe59e97248ef2cc10
 MISC ChangeLog-2015 2383 SHA256 b845eb8bcdcce4e7a907bf1ed842ef2a924d0374f45bdf49bb1abc9bfdac63af SHA512 de82c0fb296327380689b067a72741a1c898939870e251f3f4167bcaa37e31483749cf767bfef0dfaa85c4d50b47a48feee30d1511972fde0a64f6614ea78524 WHIRLPOOL 74c2115adf80099f959c0c11e38a8bc2331e45b4cb7d2a830a01a61423b5b05fe2c9bae334042ce0399cf568caf639e057867e692163722c8cff9b1a3a4a8f65
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kemoticons/kemoticons-5.39.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.39.0.ebuild
new file mode 100644
index 000000000000..ae4e91d1e6e4
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.39.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 8c8aaf4a927b..aeb073000fb5 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,6 +1,8 @@
 DIST kfilemetadata-5.37.0.tar.xz 218252 SHA256 17e12d5e8d033e638ec727639ed3ebb0af3cfc71fd632167304c99d8aea9ab9e SHA512 78143c82b858f53e63e35e11e144ccb474574885bd772ff27131c0568d5033618f8ff75844b02e3e3acbffd5d8901300f26f5b4e9d5556f2400f3666183b2899 WHIRLPOOL 8ec5c54cac68c2309aa998c5f8a1bcc027c374dd63c6877074c00c339d9ed14019635dac06c0972285dae9f89af5350ca460b36bf487525be139e997a6ad4927
 DIST kfilemetadata-5.38.0.tar.xz 219736 SHA256 95ce8b047895d4b1efd34e841035147e282f03996e1d33d79f09a6d469ca25a0 SHA512 d008e39f58b9c4d4209372722bb5463c6140c49deee280a28841060676f5785294ee7b2bbe1c657dd283bbd1f3edf94a2fa08f46fcd7a91a98f2e8733b1349df WHIRLPOOL f33bcae3bd57f04d6b5b352ab5eefcfaa9014eb083eb646b442a3d361aed15b2259f54fccc4b08acf90b0b0441d0528107e3e0a5ad4f2a86e69097da69505d91
+DIST kfilemetadata-5.39.0.tar.xz 219784 SHA256 0feadb5850557be4d372dcf792c83176276616fc839965c23ed87b7525bc9dd5 SHA512 df3e17fd19e64af2e413ff0e0405654e52e245185762a1d7bed8dec63b2a567e23c1f4340d946de8a076264d62fddae8184d70dfb001147e52e003bb4a416391 WHIRLPOOL d89fb1b169c6a119591d9f089cc9ca8d530385ac3820cb1f7a82662540a796483b378be8ad3f5df984503cec40bf4b96bc617237d80b638ce24275e0df7efc5e
 EBUILD kfilemetadata-5.37.0.ebuild 1717 SHA256 ddc805b0c53eb064bd2326ad98ffe32a745ed38e9e46ace3ed5f6984755db6a8 SHA512 9f8b48424d328e793aabe125d045402c3ce0a87b409a15079c92b2514516d65d7507a7a925a74ed5cca121ca305f9c86e11300cfb749728cb1e8a3f08d1446b2 WHIRLPOOL 3e9144169c2e3804d0896bca8a8aff675edd09f9e54c17ef1d844213bd7bef0028b2e9b5ee8e71708a64fbcf10bbec51877a2419d3f1796a930e56c7c7b4842b
 EBUILD kfilemetadata-5.38.0.ebuild 1615 SHA256 6dae69f2ed20c818724d9935d62a55d68985a7743af41a9f6ddec0aa3259d4ac SHA512 a7f2badb1410ca5a9d9d9f2ca7bc99193531b8757fb524136bf396a52e6e8401e793ef6993d5a405add52085d1ed3ed9dee63c24956b8c760e91b3256f58a289 WHIRLPOOL 6820878fbef7c8ac19806109613704b0e39d58d099fa093ce71de1d9d531377cc44db447181386ab0b9d70927ea6350e91f93772b2254f568b9ef995bea32e46
+EBUILD kfilemetadata-5.39.0.ebuild 1615 SHA256 6dae69f2ed20c818724d9935d62a55d68985a7743af41a9f6ddec0aa3259d4ac SHA512 a7f2badb1410ca5a9d9d9f2ca7bc99193531b8757fb524136bf396a52e6e8401e793ef6993d5a405add52085d1ed3ed9dee63c24956b8c760e91b3256f58a289 WHIRLPOOL 6820878fbef7c8ac19806109613704b0e39d58d099fa093ce71de1d9d531377cc44db447181386ab0b9d70927ea6350e91f93772b2254f568b9ef995bea32e46
 MISC ChangeLog 8222 SHA256 c0a794a7f1d6394ab9a6457bd39e34e08ebe6847808fef6343b764ad64365380 SHA512 062a24c331586171a2a4f8182b4c936fc497b5fdd41d03feaace1b5cc6368487c66fb95e474c25994c4fb5dfda52e5772109a066921e3600605a9c9c3b9337b7 WHIRLPOOL 0f2c504c449581482deafd86ad09980bc63febcdefa5333b55d8c6b06118cd6b521e6f20ef813783885f9780b02c6e5948eb548cf0ec911256fa43280563f9c6
 MISC metadata.xml 417 SHA256 decf74e90618bdf5c4a5991b560099f1c883269d0ab5560d66cdc4b8159a9927 SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1 WHIRLPOOL e7fd44a744070317de50c8444083b275d96f506816c2bb25e77838f24cdf5cb9021ee7c63bb29aa534097788176323ce143664af4ece7ecc0191f0913feceeee
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.39.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.39.0.ebuild
new file mode 100644
index 000000000000..b2924d5f880b
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.39.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit eutils kde5 python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="epub exif ffmpeg libav office pdf taglib"
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtxml)
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	office? ( $(add_frameworks_dep karchive) )
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+	!taglib? ( $(add_qt_dep qtmultimedia) )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+	test? ( ${PYTHON_DEPS} )
+"
+
+REQUIRED_USE="test? ( taglib )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_find_package office KF5Archive)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake-utils_use_find_package !taglib Qt5Multimedia)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
+		elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
+		optfeature "indexing of Microsoft Excel files" dev-libs/libxls
+	fi
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index b9d505eb279b..c46b8e6eb544 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,7 +1,9 @@
 DIST kglobalaccel-5.37.0.tar.xz 83840 SHA256 4b373660976ba8c5e0fed74ddfc61dd8629757a849a5ea29a3c2166cf2c004b5 SHA512 115fb5359d7eccc12b9772d79c189bb8e46bf47b0aed46dda019b29a16f5db73ed9b1bc490648f44fa404385411b8471406c0288c275d18ce3ca8ed0156820dc WHIRLPOOL aacb5cdbc0ae02a140dae1405d89a96d4f291beb331e7ac6358de32fef188c521797f2c8a13641e4ead2de190ef8c897c2340fb433fccc569ba8d3651e683834
 DIST kglobalaccel-5.38.1.tar.xz 83484 SHA256 36ceeb585598c088c80fdde30b3ea9b12e6d250dcae46c24024072a37a5f236a SHA512 69c248b7ca0ad6104ce62ffaf453490f5eda2af07add7605f3d6c260c26aad8024a1e8506ce7e4ef058f34aa1f71ee57c24f9eff02c998548add6f015751d1c9 WHIRLPOOL c3cfd02cf3329954e8b84ae56a4a5b0c23d5cf65f4a0967385a601a7d959b8fa75a7c0ac97fbe61492aeb090ec80b0e7d40672f8a69ed953a961b3d8c443dc48
+DIST kglobalaccel-5.39.0.tar.xz 83916 SHA256 21ab590c0288193d914ebbbb1be1f8efd5f3a6f8ac0a9592439da1141db78b71 SHA512 82e08df92c39ae5545bbe0e1586797a097b6cfd00e8f18d16ccd1aa6de07c0ddc922e62257f9bcef5ac24dc61a511ee17bd2f25945019a9b304857f72638f18f WHIRLPOOL 249954ab459376149423ad7fb783402ee5ef5a14e4a737c77e9328dd15d6a32624550cd322c95e03927b2ee54eda688e302262429d5e6f98edf5a4454ab1454a
 EBUILD kglobalaccel-5.37.0.ebuild 650 SHA256 0997200062fa52c89201c5927918453150696d96a9f223b5af73c1f5bd3d32e0 SHA512 cb0481f8e14891849d4f654fd06f8e9de71136b5b8e593a1cb1f67a132a2f7091b1dcac02539079a6612f6146ea993af3fae75ce5f1e97aa214d6acd97f041ab WHIRLPOOL 66b6d96497bbd5036abaa09a5e3653d6be4601f3b2e224c5ded80e080327519ea632f48c10726feb991d1e2c27247eeded2fb9ef8c08533c3425f14b26b1dfcd
 EBUILD kglobalaccel-5.38.1.ebuild 652 SHA256 626735f6c41da64b9f2b8f1d3723784d5a1e4c3e4f3ce1f7d4706d4163d2231a SHA512 00f0dde034596bba227e841bd127646994a342bd4f7e27540811101b40990f387edcd2a28c532fcf7df478250bfd95f7f0418cf8754b2232ec1989633a0f2367 WHIRLPOOL 25d4a1b06db68553a2d1a66b2485f84ede0f5e16aabb74611249f00c36e91b82513283d58933fbed2d6624495b70f299f6d3bec26dc24b4075514a18570f036b
+EBUILD kglobalaccel-5.39.0.ebuild 652 SHA256 626735f6c41da64b9f2b8f1d3723784d5a1e4c3e4f3ce1f7d4706d4163d2231a SHA512 00f0dde034596bba227e841bd127646994a342bd4f7e27540811101b40990f387edcd2a28c532fcf7df478250bfd95f7f0418cf8754b2232ec1989633a0f2367 WHIRLPOOL 25d4a1b06db68553a2d1a66b2485f84ede0f5e16aabb74611249f00c36e91b82513283d58933fbed2d6624495b70f299f6d3bec26dc24b4075514a18570f036b
 MISC ChangeLog 9978 SHA256 5589d1a95c4f0e8c3fa5d6a55fd8af28a57b9aee913adeec2ce2517bb138386f SHA512 53f64554f12aa8994edd2ce4e735c4eaa0659b710d3c4c53ec1bdb058cd08e9effc110bfab995ed29c94dddb6b6e649906d9cff44cea61de729ba1e44117b727 WHIRLPOOL 4cfb393438a0f5ae96ecfe5ffb9b826d6428b66c7d36fa9652385b0ead7bc1f5a0549b067cb5378df3d2d4c96bcc2b2af7f5498b01ded485f5e71884eb2da08d
 MISC ChangeLog-2015 2700 SHA256 606ad9705b3bbc33ac45f63961c43817fb925950046a79d1670f3c60899c0b7f SHA512 3ff2f640b5d54711b8adeec119145543e5677193ad47b1a96b2b4c87e28f8ae25735dbb0c5425c858b16922428c12e6d5e5d2e0ec758378271e4a574f37693a2 WHIRLPOOL 5d4a052c37d068825bda12634afe5522d26c316ac8774545fa0f3e5a39d2f063ad35ca4339f38b7ba58750ad9c38014e6304cb1ff7f362c93189837ec1978919
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.39.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.39.0.ebuild
new file mode 100644
index 000000000000..dd7ac3199c16
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.39.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index d9134dfbc7f2..c1535a1940fd 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,7 +1,9 @@
 DIST kguiaddons-5.37.0.tar.xz 40148 SHA256 c56ef3b231b088ba6903e8319fc936ad438e3c6411b9f14d2c234c8738b5e68d SHA512 fd727372130de4fc14bff946586da2f71e6f475a10edce438f5bb6fc9d9e2d93b4440920234a33365617bd85e61a74429038bf0d7e79150c3cbe419c4c1b9320 WHIRLPOOL d5f40a7386bd9469ee6fff2a432633e0b86753359b524b8f6c8fde6237dc93b4372bd97cb04fd44783492661a1dcfbf16c03911c35ff39230ddf7430f68018c1
 DIST kguiaddons-5.38.0.tar.xz 40140 SHA256 01a6350be86f86fb11625393fdc2cb1fe70b7289d06140afa7b0186339047aca SHA512 7e3d56a6dbadf4ebfed5ea43dd474a77dc8c402e84936372064e03d63fe3579f289309bc12ea0d6efe3e9e5d54e9a5adbe28a4d521eb1ee1f8d0bcab2aa952e6 WHIRLPOOL d62e5358e91e3c29f68dd7d663952cf731e11e92ff8646a91c0f7e2dc9e651d6439d83dc30fc97f9167b93cf8b5d11758db01af3c77623ad05faf314887df2d5
+DIST kguiaddons-5.39.0.tar.xz 40140 SHA256 6ee0f5a2b1d66d5266cd2045ff06329efeb394441261a9ce9ea7f5f35689e9ab SHA512 a72c516a963d219bf8b2e1cd226e4ab8fae927f3d5d7f01a468e9c3c84f4cd430c494eac8e1b20668f8c48fdbf8161d3b4dae7b8a05152420aece56c41bc0b6e WHIRLPOOL f55c4cd81f84ea0d9869a7021c7211b7feb334f3048e3b980770119b44372076e3c253fe301d246151040f72a2a9f647101fb526eb7050c118150f8338ae6e31
 EBUILD kguiaddons-5.37.0.ebuild 428 SHA256 5f1d2d13a970c5dfe797b8b56123a107bd5e3923c5a319755bab7a9961bcd87b SHA512 66a0bddc26607413242606d340e7b4ab80a28e64f103d450fdd9fcea18c665d119c75e4fb896da4863ac1fdef1305a380365b33dd98ea1b9cfcca6f9967ba288 WHIRLPOOL 970e51a915e8a2c88ccef5a649753d2834f74bd76a829004d9bcdff61c2dad6dc204d8a036b50979f9bee9309d97ade7171805cbd286b302bb4a951ddef6c3f7
 EBUILD kguiaddons-5.38.0.ebuild 430 SHA256 30c419b998e2d10a608ea221f770104a517508afaa96e235c06275456d8f3a95 SHA512 ae383469dc2ae7af279c2c67c456c6cbd256c485c8e7867a71bedbf3ee257158c7cdcb49e8aa45696afa95803249d129534a5a39b5edb37c2e6b4df98effccc2 WHIRLPOOL f856375550c9b5466dda4cdcfd1910693fe37f6cca0e807010b24c3c40fb08da0824cabdcaaa9b7718660041bb3941c0f6c532566cf659618f5d67e69d5f47ad
+EBUILD kguiaddons-5.39.0.ebuild 430 SHA256 30c419b998e2d10a608ea221f770104a517508afaa96e235c06275456d8f3a95 SHA512 ae383469dc2ae7af279c2c67c456c6cbd256c485c8e7867a71bedbf3ee257158c7cdcb49e8aa45696afa95803249d129534a5a39b5edb37c2e6b4df98effccc2 WHIRLPOOL f856375550c9b5466dda4cdcfd1910693fe37f6cca0e807010b24c3c40fb08da0824cabdcaaa9b7718660041bb3941c0f6c532566cf659618f5d67e69d5f47ad
 MISC ChangeLog 9145 SHA256 0fe56dba8ee253b0c60c192420b9810ef0095bf7fca8727d127c55dd2296bd87 SHA512 91686ddaa33090cc0a53d1ddae178f80fbede0b195e6832c931c263dcb56a74739c6ab38ff3bb91c5a1ffa3df09e0a7ab5846e6a2500b4132e62d7deaf592410 WHIRLPOOL fc679d3107cb07b6798c5e19dab97cacf403edec9cab1fbdd8e9b157070c57ccf1e2d6a82154f7c4c29d68198339b8961deb8423e1e6d16a4a56c26dbcd67c56
 MISC ChangeLog-2015 2552 SHA256 f1e3a1268e0956cb5ad3424fd614ac22a0150f84f9c60e95ff31cc6f4dcc5f74 SHA512 23b4c69712a5d1a67ed24eed039ded04069023c0b2b281dff7fb66c01f13794a333818070fe1e32d79aa3c69755a2e7ac1196570319118b1a696f2c0a40a05eb WHIRLPOOL 4a2a3a9c3d92aec622e3328bb44f3e2d937d941265d90adbeedb5298532ac7454db1acba6fe645c4fd854717ad958c28a282309a4d23d4274252b694660184a3
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.39.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.39.0.ebuild
new file mode 100644
index 000000000000..26fe9e0524ad
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.39.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-libs/libxcb
+	x11-proto/xproto
+"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index f40bff9d87f8..9c41aad73597 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,7 +1,9 @@
 DIST khtml-5.37.0.tar.xz 2081460 SHA256 02aa4260f078f97b9299fdf1acef85ed28158c9de3a3023774aed8e4bbe815d8 SHA512 275b014d7e1ec3c5f2727c32c237ee9d2f0be313fd5e8676b81be1a1791478e04c786129340f331ea35e4f363e0e696b7d7e67c2699dfeb48bfa8cbb6ed6522d WHIRLPOOL 143d5c28d93e522b0d4b9d70d5e1ad95281e05e976c095cbbfa6ab3a9806ffaec2c7f7a535af84e0c5ec8cdb3d3b2194f22ca127d9ead788e353308e0fbd078a
 DIST khtml-5.38.0.tar.xz 2081760 SHA256 fe35153e0d89ca984fe6609ce2365a94eb21849e9d69e201a195af36d40e4639 SHA512 0b0c6e4737212ec7fef14a063fe13d6a715c27f56ea3e432b258ac2cce9c5de83f1ce82949a385eb4e904a4ee61d5d6222f476e053addac52cb5a9800cfd162b WHIRLPOOL 6f0e6f6cbcdb8bc50a5867dc216abf5b2ef07a8ffa178bf29ad16dca09f314c8df7d5352c223ca60693b7115d2391222a5131a006669962e3be54a86d1935967
+DIST khtml-5.39.0.tar.xz 2081600 SHA256 a284c7c60bf0df22c4b92e9c341ca080cd49730c5218f572ed88a885365ff624 SHA512 796e7d97d0889cccbd6093c20967a37e5ca1af1596b3f6dc71a8857f3175e5f12d027566b5e8497ec82c88622cab546e429194090948f1785e2f28f91867891e WHIRLPOOL df68b96bd02ce6b382d121955a1f472cb4ef51d56d9853dd6d2531ab1e2f6b8c540156d3806cdea8127244b0294d868542d825ff4ddc0f5e50c48030039741e2
 EBUILD khtml-5.37.0.ebuild 1584 SHA256 845b3cbb3efafcb44c55627c8f1f1647ec483658584d18a5cef75fb34003e5cf SHA512 7fbf2ffae2b11249c27280f098bf7523adf4c338aba36389313bbe26ab9dd608b05a427130f8c8b6a87305b8325cf188dc9af869f94466af89659dfc3bd15a35 WHIRLPOOL e5793e4d96bbec53654a9f8b0d9b50e424d3c1c2a86c991fb3420ecf89c7e25008106a7f2007d507dfb27d47db417216e1536f794a0dc8bd9a454435eb5a9660
 EBUILD khtml-5.38.0.ebuild 1586 SHA256 0d151825a9358a513159820879d20ba52ad475e56d1b5b08e58a447a0bea145f SHA512 cab92babf2597ddfe51392527a4af3f1f3e2de2b7dde18b4b08807b3ab82e98684fe3630d239f30b24dee39fd10d3b1bb98315ffe400e87f4cd60bf95edc9af2 WHIRLPOOL 8cd058c2086838daf7418ad611ac04b413f9603d7ca2036c5a293d91f710ec21353dbdd58687db25df9c56a30668474e50bb45aa3db547d68f8d23d0c73d461f
+EBUILD khtml-5.39.0.ebuild 1586 SHA256 0d151825a9358a513159820879d20ba52ad475e56d1b5b08e58a447a0bea145f SHA512 cab92babf2597ddfe51392527a4af3f1f3e2de2b7dde18b4b08807b3ab82e98684fe3630d239f30b24dee39fd10d3b1bb98315ffe400e87f4cd60bf95edc9af2 WHIRLPOOL 8cd058c2086838daf7418ad611ac04b413f9603d7ca2036c5a293d91f710ec21353dbdd58687db25df9c56a30668474e50bb45aa3db547d68f8d23d0c73d461f
 MISC ChangeLog 9142 SHA256 08d6bfc76c0f8f0f9cc2af00c1ad7c896defcbbb27d359d68ce692c94fc1755d SHA512 6277dc44947ecbdf584265c742e2bc80507572e14cb1bd27306384c728c00e7c654b41b745fe3c5657837950e039431ce06675917eada2df6b67e5ad72f9694e WHIRLPOOL dcb717b88de869c741c340f926e2146e64feddf6f8b50a3ff3acb0c47a36dc36b31942cbec2791b3844882c5749120a568afa9d5d93fbba3176b8107d7b87fb4
 MISC ChangeLog-2015 2222 SHA256 04c416ec2563be8eaac3cf35175b6e0fb0414fe895b6116ace29fad31988e16f SHA512 6ebaf9de04999c92b1767834413c4584b12ded35c680bf7f92886aa6e33b0fcbf9e885d040d8c98c2ebc4f6e445cef9e44aa0607e82eca862281782e9d19b45c WHIRLPOOL 37c5636d57212c1d600d39c4d335b45551dd73287a2d7466baccfdf9c9faab16620c13784b705288d364fceb99bfed3664031f87cccc418b86b254b8f79a66f4
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/khtml/khtml-5.39.0.ebuild b/kde-frameworks/khtml/khtml-5.39.0.ebuild
new file mode 100644
index 000000000000..cc2820c61d18
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.39.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	virtual/jpeg:0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/gperf
+	test? ( $(add_qt_dep qtx11extras) )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 4d277e6f4871..8840236f4b2c 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,7 +1,9 @@
 DIST ki18n-5.37.0.tar.xz 586720 SHA256 4d94f4f676161507149886c6f9c4a16a17556bcb4b9c24b4549a53b82ef13ab0 SHA512 b4e25b9e20cab9406087c859cd4a899ff29187820f507f8cc6b061af3bc51b958e915c9273241b9e0ac3e4344db73b67b3ace0d9ad127e119fe051e45700cb19 WHIRLPOOL 87c56572fa046104a01bd349a2d585668a3f50dedfebcc3afc72fa77e696992cd1c0cedcf45c09404bd82f69ddbfcc194ce4c9305eda2a2fc22fa3d4c5f3ef6f
 DIST ki18n-5.38.0.tar.xz 586828 SHA256 240ccf22a65cf85da900c88afceac8bedc40b71a4d19bad526c03aa285cc2a7d SHA512 ae8e237de2c3acd5697f00177aae80d03c6f65788b3ae9f0edcfd6f01984a8cdc7fb3423317ce5bbd36f85411bff2f9714c3546fd01ede43572557510d0082a6 WHIRLPOOL a2e4b6f06070d6670100501e54ad0c1019521a56599c4a67f467cfc83cab0298d350c7569477275034e41f1d0bc9000ed6881481d786cd5283b56346a5b839f9
+DIST ki18n-5.39.0.tar.xz 586912 SHA256 5e31cac2735db66de620d28a5d561f15aaafd6181c1ff7ca3a03b20ce3c305a5 SHA512 0baefd0404a37666fd6d5e66328e94d05e1540e3be098a59aeb28589b3111ff1769fe880b5f8db1379dad229ed5a2bfe7b3535938c753a00fb7bee12c6b5953c WHIRLPOOL c1dcbf673e18616b88c93ab3bc62eb33969ecdaad22f1561ea321a65e1406ac922e295565c7bc7d5426715f829b3d4178c5593138da960af849ef1e56bbcb4bb
 EBUILD ki18n-5.37.0.ebuild 727 SHA256 91a6392c977cfe1cb935ea03ee6f3af84adf6f4ec1f008c0c8d10f944d497679 SHA512 b3e4de4e74d1466f2661f3d288661a6cd5765a4412af91d696b8f9dc98fd592781c582d99d457b6342969306e7e643a0b2fc0d1907a91f6dd1a4b3cfb1dd1c78 WHIRLPOOL 1b6a6a00bbb59fbaef8a882bd7a1c6dda28ab407741ef00a2cede7eed6bcf7e222650e33ac6df66251e0ccdc02e5768d0ea4f5b63cb27072a9a6a3d090acc0f1
 EBUILD ki18n-5.38.0.ebuild 729 SHA256 00f3d323d3dab681ca8282ae4ee6928ee1bb10c5a0b1a7eedd8edf1c6329fd8b SHA512 b3c363ef2ffe3b05617ff924f3cc8bcffadef928ab028e6647ddd8ead013fb49fcdd879fd2d10460a6dfbe453f90d95640393bd1a6d61ec00c73e1ea9537657a WHIRLPOOL 409f02389e6578894505346b29516a2f7248a1987bdeba62fd192dd5b3f381529f8e8dae40183f5b9772023acbb0c6805a3c5ee9ebd90505c07646678df9607d
+EBUILD ki18n-5.39.0.ebuild 729 SHA256 00f3d323d3dab681ca8282ae4ee6928ee1bb10c5a0b1a7eedd8edf1c6329fd8b SHA512 b3c363ef2ffe3b05617ff924f3cc8bcffadef928ab028e6647ddd8ead013fb49fcdd879fd2d10460a6dfbe453f90d95640393bd1a6d61ec00c73e1ea9537657a WHIRLPOOL 409f02389e6578894505346b29516a2f7248a1987bdeba62fd192dd5b3f381529f8e8dae40183f5b9772023acbb0c6805a3c5ee9ebd90505c07646678df9607d
 MISC ChangeLog 9800 SHA256 759c556cc4cebeb26eb7b75e42b5ea97ecbb3ca0418b4c0d9d6ed0d8d2b6dd53 SHA512 89a950ed88667ff9329f7cf58b17eb600db8ab2b0e021d88c1a5c18694d576c9d07284cc28151e8902847f98194dc108f621982fe1655b15404f59a0e10f007a WHIRLPOOL b72aab8856db9d2ac5db90d549778aed4f0319b832b9e424cf3e31da5699da3e495a472c180d7cde268ab9ff27135a27ce062b1cf56a430c0aa9c6477dd4c208
 MISC ChangeLog-2015 2222 SHA256 64648ae47f11cb711bcf4fbac233c3f69e1e192bd55e1cb251f8eef11a4cbf8e SHA512 366bbe1239ad2bf7952a0073714cb3ecd53dae96b80c8ec67b43dc5696e3ded816906df7d2630b6810af1b005a99d784e746551783925c984d7dda2bc8e72abb WHIRLPOOL d06f3db17d71d1c4b009fcd69bd8a8078a577422a28882e2ded42a00c986c5a0b730cc919e33e41dd4c667cfd483b36b9281d58a4b1a9fed0cb887fe5005304a
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/ki18n/ki18n-5.39.0.ebuild b/kde-frameworks/ki18n/ki18n-5.39.0.ebuild
new file mode 100644
index 000000000000..100efc693c26
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.39.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(add_qt_dep qtscript)
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(add_qt_dep qtconcurrent)
+		$(add_qt_dep qtdeclarative)
+	)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	kde5_src_install
+	python_fix_shebang "${ED}/usr/$(get_libdir)/cmake/KF5I18n/ts-pmap-compile.py"
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 2926d986a3f7..8e9f0bf0cd4b 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,7 +1,9 @@
 DIST kiconthemes-5.37.0.tar.xz 204832 SHA256 b83bc856947134d4c7a97a6bf8f61045269fb614d6f7d482b344a8beb57bf5c8 SHA512 a5c19393d40055eafb5c7ed67c7a2b6563786a3191c3192c02d328004d14b33c7e9db936745e45a853b75264864d062d7697b1dc44b7c0056a2a350acae91204 WHIRLPOOL 5af1b9cd809b65183b92e48a817be7f0818bf44714c1dfa58df339f43cefe306f9e45f5fc0915e6bbc12f1585b9841c3793e23080e0c282a8dc5086d7ecafd69
 DIST kiconthemes-5.38.0.tar.xz 204904 SHA256 2a7dc525c1e9eea8c8952ca4eeccc22c28bb37ea83895fd7166174263218aa07 SHA512 886bb36ba6fd0cad40286797d8d433bda3c6a2757c78713389118e1710ac8b57552bf2a04bf108311d504676590c7fdfd87d006f05a4d34e0c17d5400b998a85 WHIRLPOOL db0a818bfb374054c438f8e5854dbb9e1fa4c0999521e9f6f6e6c3a606a66ee650f7d9561dc2dd31fd9a228a9d57af54319b77aa02b27a9945ed33c7fe8166b9
+DIST kiconthemes-5.39.0.tar.xz 205472 SHA256 2edd03b3424fcc02d203ac8e3238c17436ccc951892bfcda498494ff871199cc SHA512 1e30b24c1689ef4e7f59cc67fd4dc09e3dfcbfef0cf2b475ac09b43aa6d25ebb4edd8780398eee906f84ee1f5e53b2c0dc839014e185fb47e994c57fff74d7ca WHIRLPOOL e92af00c9ab63d5379685a57fdab6fa6945c1cd017c3e13fd1f013766add48718e56142b88c09cdbb889f6941e767337ece9d2726a3fa6549fbceaa6f1320e70
 EBUILD kiconthemes-5.37.0.ebuild 664 SHA256 a6b76f5237c2bb5b04082aaa298ac2fb3fde0cd8b35cf3b46cc391df0b6a9ab7 SHA512 4180c9c0ec2d88c892e8bcdca9fd0be1de4448d694d486c956f62a7518551739942ed09002dcbed5e027cf1b41f81478b93e663512c13dc982733ee327ff4cbf WHIRLPOOL 48202534c5d6acd6aee36c009543456c2ebdb41e39d6fedf2a1bd1f659346b98524750ed60b7dc8f87193041103a4b4f8df89b1efc9c3c2cad386247f08e1d0c
 EBUILD kiconthemes-5.38.0.ebuild 666 SHA256 6cbcacdef7f4eff3da1dda4ffe07e8ef81cf86eee0e35dc97849230f39f0c772 SHA512 db6b58aeb0e509335ecedaf786b979afb2f23604cc4cdc56bf1bf0f3a197a55436bb63078f53b2a6b2d691ea84d2743d8cb87f69952e223a5262ab2c6f488cea WHIRLPOOL cacc5c9485aeeee7b2b77c5a7b9c5f63bb48ec3ec40af01aced32cbe5fd80f1141e1105638d169c1e5943395db31a2530529d1a311b722bf13d8e7f2b19eeaf7
+EBUILD kiconthemes-5.39.0.ebuild 666 SHA256 6cbcacdef7f4eff3da1dda4ffe07e8ef81cf86eee0e35dc97849230f39f0c772 SHA512 db6b58aeb0e509335ecedaf786b979afb2f23604cc4cdc56bf1bf0f3a197a55436bb63078f53b2a6b2d691ea84d2743d8cb87f69952e223a5262ab2c6f488cea WHIRLPOOL cacc5c9485aeeee7b2b77c5a7b9c5f63bb48ec3ec40af01aced32cbe5fd80f1141e1105638d169c1e5943395db31a2530529d1a311b722bf13d8e7f2b19eeaf7
 MISC ChangeLog 9353 SHA256 722186c39f853f77767f5a770064ae32a66880d7cb05aaf3c464291a06c7b35a SHA512 bb3b68599bfa6bf34829ea7aebb0c3241ce4ad4b89bd936846477a0cf18807a8d4fc692fc4f87c2dac697f22bc52f7f409eec59c497ea00351a12149ba5f1d2c WHIRLPOOL 817a50f8b2390648609dc30fee64909993de7590eafc8a0d471c0aff9d2a7789db016ed030955643a4e7bbb5143444d318596f587ecf12d8057e7f9831e9bf0d
 MISC ChangeLog-2015 2414 SHA256 2645b31819e3a10627d7322e8146fe8909f5bc10af22a0f7fa212ad9d17e0acc SHA512 ce78df0e806be92c1b6cf341faba381c028af7e0b888638d035d7b7a6b07071eec0033b1b9bbc0c01a84523a1ed5424743758dd6a52a0ea2e60d2856672a2256 WHIRLPOOL 4d4537c39bfce33896d8468b0c073111bc5374e9c5a798bf224f9f0dcf049f100c4380d4ff77dfe9c9ba0e9d8186a0ddcffb10086bd38005a0804dfb017b83f6
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.39.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.39.0.ebuild
new file mode 100644
index 000000000000..308b6a45474e
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.39.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 8a3a158c9e41..a2a9ce43bb10 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,8 +1,10 @@
 AUX kidletime-5.37.0-qtdbus.patch 1195 SHA256 4c471c74ef8ceb0c7af2f5d179a6964c8a24103d5d574e0d47bfb0af874c37f2 SHA512 eb6d69f1b96fbd11e4487d869851d51247eafb63985c0b5e0b0849215c8f6257cb929e5fcafe515bb57621297022bc0cb91ccb1392f60844d4e0035101ebf38d WHIRLPOOL 7dfc199fc704f5c9c729972f367af82e138d0f33dd121a1ec9011f8d38d3759f746b098f7150f1a4561bc9bbf26f51afaa6c27b10577c7093042991be5c441e3
 DIST kidletime-5.37.0.tar.xz 26608 SHA256 3a472778722f38e5175ac55ff71a5e464ec98ecfd2ec759b7003612fe8c0a406 SHA512 444cfc25d162c4390ec0aa49b035bda1e5628972a634eb08c0cc9c48d513676669729470fc91cdf25ed98b9b6dd76b71159659bfecb4cbd61e029ad42398be27 WHIRLPOOL 20062019e3f8e3ade9d4c9e342508231c3741cf835f2db6a034d7fc09d452b7475e51998e05c978acb45da84e7e3cff8942943a23f70952e06e77fe3a1d315d7
 DIST kidletime-5.38.0.tar.xz 26620 SHA256 5bd30a316ea72a44ed4e4f7f11533e5aa74fc817f360f471b2658ac560e221c5 SHA512 7318e2fd372cba52c3d386d66da330fa801add715e06ef895eba1bd61c101ba9bdc8494f4ad085a569fe411ce4f7678f0fc7cb0863a3eea1b5c376b8f16771e9 WHIRLPOOL dbe18e9957f2584cd8552e702891ffd77e3c03eed3ddabccef1b3046db6369942df1838307c4f2908c96d08bf7229c92a24c95918dcfd17179673cac5cd2c684
+DIST kidletime-5.39.0.tar.xz 26616 SHA256 a8ada849a4c740a4346bc3c073e38761b8cfe38be6eb0ffc9221d85932bb0506 SHA512 f9eb585b9677f1dd5f9a0cb71fae5fb8faf9319256a7bca79528354244a9275feb061914cf5306f4dc3caa2ce914e23c378140cf3ee190dd5dc5ebdf9b20cef6 WHIRLPOOL 2f3d0c6d2f2aab658e7cf7e2b06adb6d565cf179982aa0a18d5c45ba6ee7230e40d4e561284adbc08a7d83688b1608c12b6ee0e111e266a86c04e5b6c008e01f
 EBUILD kidletime-5.37.0.ebuild 907 SHA256 f677baacf1b992fc9058bc256b4b8a9f95819e6935ba0ccd49419f227e90a5a3 SHA512 2264aedc4ab159f280291fed6cb146ea1e2a906d9d5fdfaa788c4088b02a1c9b70289d80167e78f459c23847f9241eda4bae8e45b5f83beb5197509a72ba406b WHIRLPOOL 9c3d0b1723459578ec18773fc500aca6bfdad013af222e5be72c1a75689d0a08ad4f151d900e8e2ff6ae73a2f0369e4366f2d0ea7a6eff6cab3548c3e02a4570
 EBUILD kidletime-5.38.0.ebuild 856 SHA256 55188af1b6902c9b88084f73b9202f3c23457ad91fce0c06f48d57774d3188d8 SHA512 6ec16458eb70ad62bc3cd7eb5c4106ba4055cbc67f697d6745e4b0b5903edc97dd2bb1dc7f19b67ce342fad60317df77a2fdb1961325910d4e8581c07ef195f5 WHIRLPOOL 40b7f44c9e42e25d41e451ff1e5da36cd147c21bdb50fa8debea774cdc4681ba76ce9ce347b25515d3e26b2108eb3b14eca53f72550e338de60669fd7f9c7d52
+EBUILD kidletime-5.39.0.ebuild 856 SHA256 55188af1b6902c9b88084f73b9202f3c23457ad91fce0c06f48d57774d3188d8 SHA512 6ec16458eb70ad62bc3cd7eb5c4106ba4055cbc67f697d6745e4b0b5903edc97dd2bb1dc7f19b67ce342fad60317df77a2fdb1961325910d4e8581c07ef195f5 WHIRLPOOL 40b7f44c9e42e25d41e451ff1e5da36cd147c21bdb50fa8debea774cdc4681ba76ce9ce347b25515d3e26b2108eb3b14eca53f72550e338de60669fd7f9c7d52
 MISC ChangeLog 9235 SHA256 35f5057d26eb9330b324bd91d09217bd362956c7d1cf5e14a4b86b4f16254088 SHA512 0d6eeac1c6038857c13f57392806e3adecb9fd039423b6233974cb3b716fe7f9ff3a7812cde8ba0a77c0ca07f227f56b5a4d58fb63ad09393c3c357218f2abbf WHIRLPOOL bb38eedf8bfa684463bf6e8be28b8297cb2a73789fe91382979580c04c7cb523a14cab20202b498390ce9d4fc464467e4029bbfec36066c00de14279cbf3abe9
 MISC ChangeLog-2015 2348 SHA256 1160b06e40f7d70a297c1ac9a606e09bf947056608755d98c180622f7123d908 SHA512 25aebbb408fc78b1b938eadd4f96793aab95d81743e2a74bc4cd63812f506dbbbe68e8fd5567d2d8702428280137f0d5fae605940d6491637b0b20f23276f65f WHIRLPOOL 6abbf1f5a0ee87a4e171a9eef7b4bde60f45c33c896914ac4ada46bbb7cf33169fddfdd6d04e09e125c24bb1c4a225bdcf352bd4b24f11b765d1a2fac1b6ec19
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kidletime/kidletime-5.39.0.ebuild b/kde-frameworks/kidletime/kidletime-5.39.0.ebuild
new file mode 100644
index 000000000000..f9b3ebb4a974
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.39.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXext
+	)
+	xscreensaver? (
+		$(add_qt_dep qtdbus)
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+	if ! use xscreensaver; then
+		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 733e872b99e0..7b1b4e03d998 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,7 +1,9 @@
 DIST kimageformats-5.37.0.tar.xz 204336 SHA256 6fb26812cd971dd23676f10096a097e2c1f1be8dee7249a7dd40cb2fb951d0ce SHA512 b15ecfbadf002dbc6984d621ab7a401f29b84986e5b98f820518ae446da6b7e875d0279f8b9100616da516925c5a8c638ec63cc0834d49d806006e6aa9830de2 WHIRLPOOL 88e43a93355ab33ea9e41292c9fefca6f2f13529caaa804422c4a197f389dc8e4b46fddac7cc6c7855dad54493676c682d77ed4eb4761f9dea964a594fc94ac2
 DIST kimageformats-5.38.0.tar.xz 204624 SHA256 97ca8eaa52f296e7fddde25abfe6c7707070b075e92e487da9edb3c719d4e860 SHA512 1dccdf2cebb528fad07df8e66e88c203246cb511075a0fe3ed948771d166ccb6bf0e275748d41eba93f47f6b7e2b47f21a070f665d03daaabc5561c7e272ae98 WHIRLPOOL b01964dbe3ac43ceaca4e3e1eb52eb45630c4a58d907c1d29bc53e5c2765abedd205504e68cc2162fe64714e3fec060e8d090393fc9dad4ed067e0d90bb3ce55
+DIST kimageformats-5.39.0.tar.xz 204404 SHA256 a59082e8abbd141849e49762aac952f5f6d6820bf61cad0687bf618bbb6eced6 SHA512 20bf2b392becf0c3deea31736577d872cfd58e106746b7df5d929309555d3f85b7c243ecb59a89c5dc26826806267a8d25bec6b43993774503350783bb71770a WHIRLPOOL 5ee3a90c1baf5987c3d7cdb3bda55ef5036846b53c398fb6e8ff484d5eabd3b04d3078f7c5785a99aa764ad4be5765cddf21dee8fbbc408900e4615d88c3fdcc
 EBUILD kimageformats-5.37.0.ebuild 695 SHA256 afc47f0c460ea2afc8b0f590975fa95a97e2b5e5086f124b44f1697fb3f738cb SHA512 35b932364a7229c0c3c83b4047d4bedf514b9843024e7bd6c7489102fdf76f093255b6425f59b60ed8b404a5337922f391a029d5a640531c12d7f07d79a8ae5e WHIRLPOOL c029b1588a5476b06f7bfa8883261623792e8edcd68b95f2dbd56bb522dd8876d172eea377bd7ec8e54af29f028a67d8fac5b373bf0fb06808095db3141ebabc
 EBUILD kimageformats-5.38.0.ebuild 697 SHA256 b44ade95c49afd01ad03075de3e37aad1764bb9bf060fbbf9d2d015e5c674e82 SHA512 de746a751c3076630c64b937675b7a15180da715a70d22eb8aeb63ac74d0a3f81a4546751d22ad14000d04a52027106075c588e218aa9c65df469b16bb637563 WHIRLPOOL 179fc5bac0452f245a8c2460cb7254f261c3fa278037613b7a77551e9747f725ce95dff5ab845021bbe69840161b4802fc27953032e63b8d1cb8de6bf4d26667
+EBUILD kimageformats-5.39.0.ebuild 716 SHA256 9491be5271bcd76ebe11af722c309cc6e04499c81ee36caacb799724e64242f4 SHA512 9228ff124b7a63c9ec126c5bbf170f0f87a8e36c91dcfa454a85db2ab9b368d8f1e40138bed198ab03daca0507a47aa8a3ba964c0d19e5745cbf6810e8ff41c3 WHIRLPOOL 5a06c1f4d3e1000c1697217ec2ecbd45f3e618b9989c37220ec32ac933da9e605ac3784d57b2baeceb01c57a35ea9567c6d4bf730af8825ad4b3213f0f0088c9
 MISC ChangeLog 9473 SHA256 358ee70f406ae521287b9f8e7b37ce07c2e3b6eaf37c83610b0eccc00eca9c92 SHA512 5e6cbfda4b7ac27188e0c6159d43c27026c3c3e1842cf90317e9229a855997f73cee3b44bea8def5be1d90f4004a8010fb917fdfeeb41b47d907b3c1ed994ed1 WHIRLPOOL ef9da34e26b1e8faa2c3a8bd4ff1aaf90e69a7670e0aaa0fad7ff6af7497e675050f12f873ad5b6d4885e63def4a57f4c2c17d44d3b90665034b540af09eafb1
 MISC ChangeLog-2015 2476 SHA256 70571c376706dbb385ac1ed1eb1a65b8cca49ed79910ed4851353f1bed3b689f SHA512 773ad1ce0e3eda76f370ae416257aa93ab427164b818a5afd9c8f7652e88c1cf8f6e92e2ec7c04469d0850c905bff333ca06ac6393b27428a8c0135c4bed55c9 WHIRLPOOL b1f4f149f9da47338559165676e2658de5405c60c3cdf8f8a039d54843a875b5643977b1f9499e2d2b786ac37771ea0d101a67872b1279a725cc89115bbaff14
 MISC metadata.xml 327 SHA256 0dda302d509a74c2507c792c276a1a2243760f7ed2c775f50a9b0ea080173dc0 SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69 WHIRLPOOL 4d56250d616367f1bbd73c9ac2de8a37f63f29185225fd463d38ae50c133e149fded829f07c0bbc7366269436e3ee42e288e0d565bf20d65bab778cd205d0eb8
diff --git a/kde-frameworks/kimageformats/kimageformats-5.39.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.39.0.ebuild
new file mode 100644
index 000000000000..0173cfc5f438
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.39.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+	eps? ( $(add_qt_dep qtprintsupport) )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eps Qt5PrintSupport)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 2cfac8fa356b..3bf6deb243db 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,7 +1,9 @@
 DIST kinit-5.37.0.tar.xz 121296 SHA256 b9686968cb277a027169bc48ff37a25f44691b1d828af7cee4c6790c89f7ed2c SHA512 c12157a88eb708b5838ba381f31460f21adf190a9f1ca58f2f32824c10901f5c716a251af7a24493e0715605c6c0fc480a361bf2fd656a6f38763f0de99dc576 WHIRLPOOL 4a4a1a082d1ab97dc1910539a4e2f4b069a46fea2011d6245f90451e2c65c4ddf246ea5740521314020713a387e9c52429961c9c9425529b6dc5c4977704e835
 DIST kinit-5.38.0.tar.xz 121368 SHA256 ae49e0a3cf8a86868afb57bfd820c65be60939e4a79d39e54608fcc9f307914c SHA512 e5a6b166c4d20b15c558f1d80a0154ffa40fed4dbf452a7e8af334c013d094da34064c06478e86125e8187d410e02c74115b4e89521562730157576b43c48667 WHIRLPOOL dbd7a935f9bdf09b5071019da1897d276431c05b4439caefe577d1e3f727b2987d49e2efaad619ed0d0f10532bac8f9ff31dbe5d1db21cc8197f5f45207f6900
+DIST kinit-5.39.0.tar.xz 121508 SHA256 c26a88e6c3e0607bdfa1b51ae6fa0d7fa6bb863c9f8f2659e8622d0d77a05c28 SHA512 538f6385bf76d5ff267b0ab70a1cc26794b5489a56c65080b29f3d8b2eda1126aa92f7e60b223a0241db17c2d81b89b5c9e361545dcf35804d82f7133fde0904 WHIRLPOOL 602fb9310372f1ff7c0b186e9bf9f38fb097926a57837a2b2901fea0c54674a449c6a9aaa012c82ee1bec1a06db4da120a324e658396a09de9e94b7065468a7c
 EBUILD kinit-5.37.0.ebuild 879 SHA256 0d1bb97c2aa7038c31ecac80a93f971678699d70eed1e1e517ef11e4871b3080 SHA512 4e5303b713fed172337f93c6ced3826be8805e66d612e98488eefda2ae9043301f6214d83702cf49a4423fcbd3bec6cce623439cec92c2b25564b7a54eb5ff44 WHIRLPOOL b64664ce9427708dd03f1ad25ab3fa3a9130bfca0398c1fb2e7e6accae660f0f7f514fa0b09cb2b4afe419eb951c8650aef1d9b6d0738f5cebdd69af3e357a62
 EBUILD kinit-5.38.0.ebuild 881 SHA256 4b6ba0a589be8b3283a8800a30c2899ed38ca595e7623afb5d4adcd00b2f0e09 SHA512 f22e47d90f8a7aa13c6608dabed4b3316cab2915be8f1334e2126fff3639015efaa64f14ae055d91d3ed16be4fad90026e351f1eee11c53275a1773f49d64cac WHIRLPOOL 8081268070b6d50565205e1ace0b32a1caa7e8428c686b64857dba7ff9e8897413120e4a1bce7fdcd25b0956d02286db410d85e3d3a47ed5cc2cade04c9ed1cb
+EBUILD kinit-5.39.0.ebuild 900 SHA256 55e303cbca7a678d07fdc45452ae8576689b30ec0ae7c4b25f94cc54c7050b7e SHA512 303de026cf90249af559d5dc992d05d1210cbfd12878cef681ee34af256f895c40a764fd485d7062de91edf659dff397e7289d671a0d61934cd1bcbac2fef47c WHIRLPOOL aad4b06e619248c4bad142779b0c16fadf9ca72ad72da86a472ddb985758f3128627adb16b1ae32ee03abbebe5b5ed9053e1c90e8d89e18b0143793401f27bab
 MISC ChangeLog 10413 SHA256 4ac4514a1e848d81796d3c6695fb11afbc700f39a5297c125b011d629497bd01 SHA512 2835eb64a98f8aa744f8a1ca997380d7fbf0f83fdd8e2391d959addfe5ce6e20a56da10efeef08bb45631b26a33e1fd1cac19334cbca119e7cf4c3795e71b7c6 WHIRLPOOL 34b7ceb5819d5809448e76451f955ffc0b3b570a6077d4ee5cb65e4b2734390c3b15d2315067c4a16eced2ed3989f11b493d724096333bc140b2e8cbd6fea90e
 MISC ChangeLog-2015 2222 SHA256 a757b2bac97cae1474b0edfe2875ed98ac7bc3cd1766e60f53d73ae596b91935 SHA512 55d5b58dbb7e813c4cb66cfb7bc7eac45b1f2b4064b35fd34db51a052e7417324f9d030fbddf60d406bfdc2c53b005ee00d6d7cb5ffb477f35d0f66903662dbf WHIRLPOOL 5e794dbd15284a9ec5fae3513bf7c6fc8163607b0bdaf65af8294f828185d399751a163671e0668f80be9a2a964e9a5ece264d0b2fc01571cb3ee15cd355e775
 MISC metadata.xml 412 SHA256 aca5299db10d266d0eccd646254e629b237249f02a4b832c9e3b976debd61d16 SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a WHIRLPOOL e74ac972291b4c4d5861ca94299330fdddd1e8479a6466ce999b4b4f06b4e1629c9aac6c95b6b45521344826a089664341cafad6dbe6af7c85a3cfdc76016d17
diff --git a/kde-frameworks/kinit/kinit-5.39.0.ebuild b/kde-frameworks/kinit/kinit-5.39.0.ebuild
new file mode 100644
index 000000000000..16d82b94ed5c
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.39.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+caps +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	x11-libs/libX11
+	x11-libs/libxcb
+	caps? ( sys-libs/libcap )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	x11-proto/xproto
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 45c8d2ce8520..9c0f71f046b0 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -2,9 +2,11 @@ AUX kio-5.37.0-tests.patch 1399 SHA256 80b9e50c877228c1d0f4f448f30901a4afaf87e27
 AUX kio-5.38.0-kioexec.patch 3477 SHA256 9f1a8340403f6464892c92b5fe08aa4f09347693042726e072ea6b2d02a73c29 SHA512 541022aa531aebfbf7dcaed8599dfc1c41fe1a2b0d8a8328a3f14f651fcb6791d13bc4b273a597711a83233fd30750c6311526c9e902337e3d1c3b49ab5e855b WHIRLPOOL 9e24afc1b68f02131ff1106758cc9a0e8b3e89bf0ef812430da29bebaff5611c7c8a1d934d575afa770a034035ceb65dd5a0abe259f925a9f4dfe17998a2e04b
 DIST kio-5.37.0.tar.xz 3084204 SHA256 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64 WHIRLPOOL 649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6
 DIST kio-5.38.0.tar.xz 3086436 SHA256 f43ab29c0ab51c78bd323e57fa6bba4aedf2d26d70df973b7ef7c80c9fc81597 SHA512 7a35c20d220308f329ba496cabc71f4be44debab09591c3301533ddc348a88bb928f5220ede8500f70fd6f8b50a77ae99877f4ca9544be149e3eb1b7ed785611 WHIRLPOOL ede2c160e5216dba084f3b475744c780b22095032d60e463f9891f85f6ba98df337b6af82426f46d8c1c47857726e79925172a903ea1de033138d3cb4a40925a
+DIST kio-5.39.0.tar.xz 3093732 SHA256 96cbea5aba34b4e1b0df5ecfb4aaf65ff324341fb00f99796146536557232f24 SHA512 18e87ba62610c1aa1a3281642cda627407ff0c0cc5eedbd990bb58721271442a3aad7db58b3d808ce977400ca3dd9d64792feb64f5746c54e2d3ee8ad2820d8e WHIRLPOOL 3c2f2e3c76d64f687e3ebdbafa8b0feee9be3fbcc45d7952b509af041b6b404a2eefec1583122a9a17459bbfcd996e17c16031c7790a28a3db2462e498db381f
 EBUILD kio-5.37.0.ebuild 1948 SHA256 30b44f31ba80d84a49e1246d618d9ee2061da567b9033cd73bba712383d0771b SHA512 214a136ca904777793d39ad7d88ac9e60df3a253dcb76aea6782b27a4caee9f9581e64d1ddc9793887152661b875092efe09587199e24171bbdf6259f762416c WHIRLPOOL d7c12619348fcc1e5f5ffcc2fee92fa62c8abc67bd23d1f5678f947b5c63466cb53aa5245689448b9f73734d5f68fba580520aacb166e49d00c9c5a9cab935e0
 EBUILD kio-5.38.0-r1.ebuild 1942 SHA256 d94969ff3ef50d994cc499bdb444cf493870917c932f4f2825769e0f1403ae7b SHA512 8461d141fe9700d039e8ab6d5ec8f83668e16e4bcf14530e93ebb217240e39e20df9db798354c8565b88dc82279c4eda806b6f4eebc9845bfadc2bcdc6b3535d WHIRLPOOL a36addf8ce324782c839cf33bf76507047a69c0ca91d30c375219b98c372976cf7573b52b1b08b492b398dfe1b280f5fb91babf168e2bcb78e8936bf856ead4d
 EBUILD kio-5.38.0.ebuild 1896 SHA256 0b63d98e1b6445bdd73276dd01816256bde3deda3b354cb0c1002cf906119c4a SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c WHIRLPOOL 636837fdec548575f4752f0b3f9c2a946d207b64e68227ceb91c7caf0b490c6f7cbdc11dd02d897d5c150118798243bc90c3906a933affeafef28d7a25270699
+EBUILD kio-5.39.0.ebuild 1896 SHA256 0b63d98e1b6445bdd73276dd01816256bde3deda3b354cb0c1002cf906119c4a SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c WHIRLPOOL 636837fdec548575f4752f0b3f9c2a946d207b64e68227ceb91c7caf0b490c6f7cbdc11dd02d897d5c150118798243bc90c3906a933affeafef28d7a25270699
 MISC ChangeLog 9546 SHA256 9e17967bd3565b198168d6dc021f277520a13ded7350b2dd5a73ee6fd79efa7f SHA512 0b58325a8275e41361a01a7d6a1103ddee403b132a8e4b913e0ca64c95cbe5e031a97814ceed61938a060bad7a827df65bc979b96eb2215543e20b4d894fa34d WHIRLPOOL 45126966e1717a335cf2d9ca0619dc8e6768b9d13e2464c6ffb332fa533edfd6b333e0750934ceb4a68e5b4df344df1bfc7ba2e003ce446d839531fec0e97acd
 MISC ChangeLog-2015 2347 SHA256 b66a1e5fa0700a2221f65c2867d57fed1bb029f534bec846640e9c302f316d9f SHA512 08b698d93c23584f1608bc51a7099278b149239ae0e5213063435587be29ca6e91e4584a9b08c1be4cc878fc561ca679267343a41374382d44ba6c9b29c3fa41 WHIRLPOOL 7992ab13bbb1831b3ed32cb5fe50d27bd3738ec8af3e94b9bb5441740c41d087f1f13a1ae3b1ec05f77e11aa21012b313713e0f933fe5a39c9b2cb6b65b2257f
 MISC metadata.xml 389 SHA256 40801af7e8ef22df9c39d1511359bb388a2ac6780d44d1d89f750fa1dd5743f4 SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820 WHIRLPOOL 9fd5fae20069a3039eaccdcd8dd295ea50ed1ee30f6627de8ec176dd4cd30dbe3f66f7ce6fc71bb47fa5769abda9975bc0d99cf055a2d8a25a1d6ff65016a795
diff --git a/kde-frameworks/kio/kio-5.39.0.ebuild b/kde-frameworks/kio/kio-5.39.0.ebuild
new file mode 100644
index 000000000000..4c595b88b638
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.39.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	test? ( sys-libs/zlib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-proto/xproto
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl ACL)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index bbbf02da7f9c..c7fdae4b4942 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,7 +1,9 @@
 DIST kirigami-1.1.0.tar.xz 262152 SHA256 6677af0c486a4c9cfefe74a0951e85dad53435010031bf2b7fcdf9c5df6b3edd SHA512 83d1c0600fed7838b25ddfa3d20e1abef594c8e5fa202314ef1c22b6548573db36058f02620236cd9bba9f65f45f8821fa37558689b49776f9fe3119c89b0b63 WHIRLPOOL b1d4cc22a0759f561c16bb61bf2a47494e92cc766401862b97866156dfe1cda452e1db01a62805fe902320fc106708794b7f545abfbd2ff5c0d8909acd024bc1
 DIST kirigami2-5.37.0.tar.xz 278452 SHA256 ad252c1ff20060f1de5afd41fade9b86e046bc9a7da38af6ca507f8ba2ce82fc SHA512 fcbeda787b571e9cad820b5dba9fc1fcf51e9411820765138bf350f57e8be01356d157d4207a78954901d96c3ca9db4c47604b054daeecc1cf10b0a769c5cf10 WHIRLPOOL ba3abe68200c96741ce2803a62fdc632127deec79adfce6218d4a583d4a36999667c2e35a8c8cf69f450133d8d259fd2701eaa1ca3af1102286059e6988a5d92
 DIST kirigami2-5.38.0.tar.xz 278672 SHA256 6c84eca0fdb7cd852aae36c45f40195dd16e17608aec2ce8fbf555198b0c64a2 SHA512 b301efc1c41fc52a1b3b1337603aa133ed6074eb3e1113628b392d0e8db8a7ff0eff4fd7ab368212615f18af4b53f7e1600f6b2efac166eea3a4b8ee3024ed46 WHIRLPOOL c8eb48f4cb43668f836160ea43d8f61c7faa8616c0113315563bba74bac9047380b2922799fc4e2b19d93857bf2f5663d8796e60e176d962182947b0fa949244
+DIST kirigami2-5.39.0.tar.xz 290808 SHA256 2714ee82dbcc2cd1b799d5f12193cae5637136466295567426c74b4f26f5ef6a SHA512 ed6605072b8cd28bb9a6c70ab0f9d65e559795bf6cdd3118d63d36588a6c397a7b8656e80201ba320ae9b85a38f31550897762dcbee8347cd9e657efc6e8af11 WHIRLPOOL b993c99ff3c0f5d577e79ab6f1b28e097ff62c6d11881bf3f2b06f4e16be230c1853da0e0410dca2784974c03617022ecd7fabd46ebf4b6710c38009a4278956
 EBUILD kirigami-1.1.0.ebuild 803 SHA256 2ac91ce41ad4ae4b72bc0f237a1515e8ea7ac6bb2107a98987bedf46611017a2 SHA512 1b1a3204c7332978ed57199d0402eed4fd21b945a0333a310e4d6678abdddc76c619c467974a9f133e8655491554c72a91242ac638ea9f39716aeefd87fe5271 WHIRLPOOL 56f78bfafa538a4aaa136531ccab12a1672e98398f4f44727812a1b768845aeff777bf83a9a11f0f6967a5017af286e6f374def8dff9243f7fb364d1cfb93cf7
 EBUILD kirigami-5.37.0.ebuild 978 SHA256 54a2810b07f24a06eea6685cc1bb9082e024f1db3f8ed8a2d70de782fb9f9f54 SHA512 fa644faa805bd22ac949a5b4dee6c8469f8a5a5e8ad99b685347d59b9ccabc0a612e54d648ab89f84266ba7fa776f80e858bd74c47a4a669e924e68617b549cb WHIRLPOOL 6b6901fb620bb362e9566dd8982457e4cf90dd3e3615b70db7028cb9ad42ac98306b29bf18a7f6ff2d0a7fc47aff39299837ebaf273c326d4b7cdaee115ab483
 EBUILD kirigami-5.38.0.ebuild 918 SHA256 16993dd9d21ca351c92c941ff0812332f6d29556b4a8304874cd574572d9c19c SHA512 01fbf0721e85efa1656180d467d79cbe0e72c1fe71a845fe13f8740d56d9e80b8db013c4de7d71f058bd464b4d9f76497eea5581bdb1a7d2eabe05d7be9b0fbf WHIRLPOOL 63b794240ba058c36d5ed768101d8003daffe971df9bcb451326afa358cc94c38a251843d79a5778bebec4fed09517a8d1e1b40d29ceff95ae4f6f50cee04da2
+EBUILD kirigami-5.39.0.ebuild 918 SHA256 16993dd9d21ca351c92c941ff0812332f6d29556b4a8304874cd574572d9c19c SHA512 01fbf0721e85efa1656180d467d79cbe0e72c1fe71a845fe13f8740d56d9e80b8db013c4de7d71f058bd464b4d9f76497eea5581bdb1a7d2eabe05d7be9b0fbf WHIRLPOOL 63b794240ba058c36d5ed768101d8003daffe971df9bcb451326afa358cc94c38a251843d79a5778bebec4fed09517a8d1e1b40d29ceff95ae4f6f50cee04da2
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kirigami/kirigami-5.39.0.ebuild b/kde-frameworks/kirigami/kirigami-5.39.0.ebuild
new file mode 100644
index 000000000000..d3fa319c2d78
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.39.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_QTHELP="false"
+KDE_TEST="forceoptional"
+KMNAME="${PN}2"
+inherit kde5
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="plasma"
+
+RDEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtsvg)
+	plasma? ( $(add_frameworks_dep plasma) )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DPLASMA_ENABLED=$(usex plasma)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 95e952cda9d9..b1697d019f66 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,7 +1,9 @@
 DIST kitemmodels-5.37.0.tar.xz 389648 SHA256 39ffbf6aacbcc20417fe6b228c16621d4ab828b13c4371c377f0814aeeff97da SHA512 09fce62011f4519b91d64c3b85428dd1ed8003cfa5c455fed813eb21e047985669b34b67885aaf95b4fa48d803f5ead479b77f4509863de8a0963c060e47ccb3 WHIRLPOOL a7a84a194d98f342683217778caff9eb1d77e4d26624156212d7b039b8b3d0ed564614d82b76fc8412a3978663b6f35b4bf628f859a4761b5ece85ff7cff17fa
 DIST kitemmodels-5.38.0.tar.xz 389664 SHA256 4cfa7661b6d3c1e242b92c9200383400398af1db341dbbd2de573429898d4068 SHA512 19a9d236a75b50d53e6a8ac97af8213e497ff8b3838e377a2f8f9f358796bbccee19f41849319b9501fa6959886be13f682dc8c97f026d3893c4a946960321f8 WHIRLPOOL 6873169d1ef26e3d417c6316e6ad190eb1162b165b9a70104867d342744b53c0fc259779d45e5106957b8a0a2046d5fc8aa301fbedcb8dbb45b4e5ab464ffeb9
+DIST kitemmodels-5.39.0.tar.xz 389656 SHA256 699a1e7e1c78159efb501afc197f9b9959a800405da1ed9de9115ea13c98c0ae SHA512 cf00e36915a9a6f6078baadc7783e5e0648c7197aa212a095ef1e2d1ce21e03877261a05a4cf521cbf6d96249a49df13fef760352cca5c9c74b3605534cdb24e WHIRLPOOL 1e6b404326e292501e300185836acf2f55dbc625c0e30d21c4e028e1c49e1cb0c49dbf4dc7b1455613f3258eb693b1c7e66b389552f2fd84ecb690593b275a3c
 EBUILD kitemmodels-5.37.0.ebuild 353 SHA256 1f38cc394fbee634c6a028368583b1ae7b46fba513df568f88ee98dce1f21547 SHA512 704035766cff8bce455a4e72b29ee132acc6c8ef4a1e04f6cdcb9553a87356495ccd02d449fa2056b385561140e632cfe001b8d9efe0f22e3ec7d7021401a442 WHIRLPOOL 4656a687b7cd7023cca55703518324db56178d82df767351fc043e375cc1d51fecdd76b64375afa5d8c7c42012177191da7a5b5096461124941e17399ab6a027
 EBUILD kitemmodels-5.38.0.ebuild 355 SHA256 fbf176e6e5a9e2d97e31782808f9f32e02073ce33fcc181c7174824b903f7d3a SHA512 08cd15763d11eee83254a3a467bb5ae2f41c24c57ec1bb8fea2b7f36709469d44f4e68ec54cbcca047b91d22491c4f74f73b66c3097184f19f2a6aa19c7b3b3a WHIRLPOOL 4f5eece3ce15497f46e691242cd2370e388da23d4b8684f330a80edb789e2558f422734d9daf563753cd9ac09aa9f81fa71327e9c158d7e5cb5a0acf286f298f
+EBUILD kitemmodels-5.39.0.ebuild 355 SHA256 fbf176e6e5a9e2d97e31782808f9f32e02073ce33fcc181c7174824b903f7d3a SHA512 08cd15763d11eee83254a3a467bb5ae2f41c24c57ec1bb8fea2b7f36709469d44f4e68ec54cbcca047b91d22491c4f74f73b66c3097184f19f2a6aa19c7b3b3a WHIRLPOOL 4f5eece3ce15497f46e691242cd2370e388da23d4b8684f330a80edb789e2558f422734d9daf563753cd9ac09aa9f81fa71327e9c158d7e5cb5a0acf286f298f
 MISC ChangeLog 9353 SHA256 b13fb59195200846d6762760f47f9484a22b166c5e3dac5e01b7d8eb83f6a80b SHA512 658346da4f3a3a6464c05a949e3d99bf7841987175d17e8846a4f91fd481959a65a7ca6213d33d38566a9648fba282187c2675f3a6437127883ad6e8693bc875 WHIRLPOOL bb8d3f4746232fbdf5970e8c7ce2d69ce4c80eb3ad8be03b91e24705b3f1dba884f3d682172c673f67c1f813a6ebc4aacbb8bd9c619be238bd655449015e16bd
 MISC ChangeLog-2015 2414 SHA256 4d6bca5fb236a0323cf22b1357ecd37af020a61ba190286571087fb7b18e583a SHA512 8988e5daf8bc70393fb5dd847413c95086263946d66fb1084275497629f2708e9e691ef39116caa8538e00e4bc22fd4e09c5e62542273910a585a554a55b6594 WHIRLPOOL 641c6e9e52c899658b9d117353e5266a175ddc721e99ca531d68d809a50665717fc78809beed50da228707403a65a5673a5e6efd156e812939a95f626304765d
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.39.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.39.0.ebuild
new file mode 100644
index 000000000000..776ab481c87a
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.39.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 398542e3e2a4..2cdb7d618a6e 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,7 +1,9 @@
 DIST kitemviews-5.37.0.tar.xz 74868 SHA256 55737ee6cf018c86e2674d417a0c234b060bb58b8eac477e862ec6e8a9dd279f SHA512 bc9333da6bc5573978ff1f7b558de789a3b63d88ed8c3c1b5d26706b00d808c90e0ef878b309d0f4f6ad538954e21f455fe6290d246a546838e2130053508333 WHIRLPOOL 3a506ad3b08cb36e945e4fe927cf24936548dd95cae0a6d82230521b7f6aa742ee3dbbe75308cd18d507d0001037a96370b4b23867fd94b8862ccff55afe27d0
 DIST kitemviews-5.38.0.tar.xz 74872 SHA256 46df0b2a0fe436cac2e1984d9038ac894ac86d9650db5328fa7069a13f46b151 SHA512 4724f953669d3267045a63071698f8f0e7218f201c424061d5158f8349646ef2bd8ac15bc19ae0a963b732f097db4ac72606de7a9fa0113716e28d18eaaab9ae WHIRLPOOL 8c958e064081b72616877a3ab645c8ba3cf0f9fc2e9db5af196c3d5296c8533dac29b7c7dc7adafcf0b3173d4a3070aeba656a4735f96a1a01a78570caee62b1
+DIST kitemviews-5.39.0.tar.xz 74896 SHA256 d069da87a28b373676b7bda1a1474c5f8c815441041cbc5af52d7c1a5a4a885e SHA512 b61238d5a59dedc8c262e572e757a2a5724552f41105b60285b04111c24257663546df3d9b964db9abbe8b6445b29bb4b12c7f7fa78ca29688b1a88d64105371 WHIRLPOOL 7b6ff93ae3dc9dcfaf1488793ef3e399877d1286745ee95c5337f997aac7b30e5c09556fa23b1cb479c9a9a63b7cb63519dc1b26347c2023f8196b8f87090ca5
 EBUILD kitemviews-5.37.0.ebuild 405 SHA256 fe991af6bdeb50bf66059c8005b2b501457da32da76c4b6b3e717952dc9d817c SHA512 79dd367165031c500518814a0568b4be99d71e47f43ce37bec2661a4bb6700847979d15563d83969a84075b722eeb698277dfd7354dfd4032c044207570f0781 WHIRLPOOL a9671953ac2f19c37519dfa9c1b75ba3e851164c1f537a253111e073d1957be826b57d172f1e3e3b0ca58c11162536cd3f010d017eacf4902876694d9e84aa4b
 EBUILD kitemviews-5.38.0.ebuild 407 SHA256 b850d2e766b21b558c84c58d6b6106998eff60654983b0afaa56dd5660c918fd SHA512 826dcd75962bd4cf323204fb0a92fe4090d71474e8c91d9a78f89383fae2ac453753b56f63e35cabdd7ec07f9ad6843ccd2292f3b3921fbe2d8fece0dcd209b9 WHIRLPOOL a751d70e94dc83ae1ae44f0716324eb2f701c3edae9412a56e1c146f3b1fb6cf3c20b014f4555da595e1ea5d616eca2a57362e36fea22f8ebc37b7fc2a7a6912
+EBUILD kitemviews-5.39.0.ebuild 407 SHA256 b850d2e766b21b558c84c58d6b6106998eff60654983b0afaa56dd5660c918fd SHA512 826dcd75962bd4cf323204fb0a92fe4090d71474e8c91d9a78f89383fae2ac453753b56f63e35cabdd7ec07f9ad6843ccd2292f3b3921fbe2d8fece0dcd209b9 WHIRLPOOL a751d70e94dc83ae1ae44f0716324eb2f701c3edae9412a56e1c146f3b1fb6cf3c20b014f4555da595e1ea5d616eca2a57362e36fea22f8ebc37b7fc2a7a6912
 MISC ChangeLog 9294 SHA256 3b06282b85adff5c9485e07994c2e532256675f0d8d6baf5081afe031f1385a5 SHA512 a9e4dfbb54f7c1af3395f22872f2ac67f25901ae270e3a1eee34ce3f5c09225b7f00297667a58d9cff0f943706d62f5eee5b2f36b824611d6ee22603ca0c1ab2 WHIRLPOOL 4538c5ed56c545535055ef9a8ce0e1eab40f35c97b06ec1aa08a4d9b145a541f3ad673f9460cd858cd112e0694e7dbbe67446795c4fde3822219e16432c96872
 MISC ChangeLog-2015 2383 SHA256 e28012a7dc013d03eddfd3612a2566efb3902bae96f846c2d7d4ef6463567177 SHA512 fd6605eb43e96f6ff0c37a144f677e19e73afb6125f2b9657dfedd10027dd6bdae630d6ad67b21ad8e43f7c790ea4e0ad658c979b4592d31b7bcae03729aba41 WHIRLPOOL d867ca380cb2635f15a6c883a49ed13e343df2a729850738c4bf6c9cc2f8eeeb5babf6b8ed584e3bcf86ffbdfd6d9351f60fa90cff133bd19664a4d94cc46860
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kitemviews/kitemviews-5.39.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.39.0.ebuild
new file mode 100644
index 000000000000..e1f1390aff16
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.39.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index c13027b59153..15d4f58c4e78 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,7 +1,9 @@
 DIST kjobwidgets-5.37.0.tar.xz 89892 SHA256 8b645c1dded5ec2c6628a6b8638804abe49eab02f7da324eb8a75d7d616fc284 SHA512 81192034d3385b661f3c6b33a197a9c8e621839598623cf7ae43815b1d7733b22ae7ce86d65edd5d21437a9bfe0ec3fd0097a3947c234eb5016efc072e5e4063 WHIRLPOOL da4b2e8610bf33d5d005a2d6cdb12c92ce5473517380d3f8d8316dc6bfaaa25cd346da68f4305662c9a14ce934f2687e2db1779593e801f7f9c413fef4e5240e
 DIST kjobwidgets-5.38.0.tar.xz 89988 SHA256 a5340df37ba44f6b5b82f8c6732aaaa42ffc6d9a829c15b345e824360eb3e66e SHA512 5a6de35e111d6c65ac408e50d40f059761716e998a5dea9bd4e3158917f0ff27e359b3ba008b3a5ec353c4b3320c4aa27ecf8c76a5efe7a56b479b1ede33235d WHIRLPOOL 0842a832d6ab65e1ac2e5502dab2c27e93c5bb68a652a5b6c501f20a5cf4ba14ffeeb8521e1bc5cfdaf2340affb3e2eb24db5430ee3a7260121a1b32d934c4fa
+DIST kjobwidgets-5.39.0.tar.xz 90020 SHA256 ccfd26c54e15a854d4d86028e7339dcbe33b0c52412686b89b2dc7794b2946fc SHA512 569204f80febbbde4d32c0cd105fda5de0bad86258688bcbca6687884a37d2e91bf4aff833a8bca38f4a30e812f9a122d253b1888c626ef5437c767d35746a2f WHIRLPOOL 38e81e0986e31745231bb5e5e089c1d1480c4a498db9412dd9cfbe170de08ba84c5dab0ab549b3a34190912db6b99c2c450a634434c9ca990f6b1c6e15668d6a
 EBUILD kjobwidgets-5.37.0.ebuild 678 SHA256 ef6a669fae1ad621bce26be0e5242774d8f29f27f2247ef28c2cb57571648192 SHA512 73443f67e43df69b89d234e12ca7d9b8d340e8c6bec88dd87dabc54aeaa3565db9aa265594837c64cf030102ef802774e3d44807aee5f7220697fb7d2526c632 WHIRLPOOL c2cc9c534791da37f8d9d5b6f2ebaa08baabe5f2df3b861e20456cddfb3c054606eee884fe319ef82e6ccb8e4f1b5f06a74e61fe29be3c47e648adc1ac207f7d
 EBUILD kjobwidgets-5.38.0.ebuild 680 SHA256 0b46e2bb4fece0ef69ed048bc5593d244b5eb948e6a775bdeb84ab51f985f6be SHA512 fea88e513d82fcdc5a7c16a7cc265eb15e4b5d8d14524ef0bcd5af6a2558a2ee8c6eb1806a0b36f4a12e5b8180a15ce8e28970cd8a8fd8679ca5b819f98041dc WHIRLPOOL a10536273eaf7553321476e647e4b6ee192f979303fb4bb3996b93ec1bd6bcd2355c9074a4ce0578c18157df26686d5082951c13f59e8333260ec36781f1e50e
+EBUILD kjobwidgets-5.39.0.ebuild 680 SHA256 0b46e2bb4fece0ef69ed048bc5593d244b5eb948e6a775bdeb84ab51f985f6be SHA512 fea88e513d82fcdc5a7c16a7cc265eb15e4b5d8d14524ef0bcd5af6a2558a2ee8c6eb1806a0b36f4a12e5b8180a15ce8e28970cd8a8fd8679ca5b819f98041dc WHIRLPOOL a10536273eaf7553321476e647e4b6ee192f979303fb4bb3996b93ec1bd6bcd2355c9074a4ce0578c18157df26686d5082951c13f59e8333260ec36781f1e50e
 MISC ChangeLog 9353 SHA256 4ac7f9e84862b048e853005494f97b3998f9fa931314f4aca07916df89014328 SHA512 2ae3307517ce05e200d846227accf877150867f211fe43494e928b87a74aa572ad6278b7d3654c9c428b119b250ae9f36c57f04c58ca68019a9b183e33aae252 WHIRLPOOL 95a76f213790c935746ce12ec4318bfc649d8e7ec9330df41f34d4e274662e99ad2d0a1b380f4b32e69c64b0ed57a8b268481ff3ac7268332c51a850529670b7
 MISC ChangeLog-2015 2414 SHA256 861d2b2c44638f90b41423bab570e9e798738c66540cc732261374a16f48ff13 SHA512 974a472598060def868213ac34439335f97d16226851053e26ac8856b881e25d5bc36eddbeb328abdb239a5c6f562b086dd2d49e19d8c155ba78959e9eaa7ff3 WHIRLPOOL 4fb16b003d49e98b02494ef99cf9c6fef1aca3381882bf7a4493b343946589c76fd4c59a252541c976b1bce17a57e81e8756256e8e1c1fb17d40dfa1d1c9b6e4
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.39.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.39.0.ebuild
new file mode 100644
index 000000000000..9d5fa5ef96a3
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.39.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? (
+		x11-libs/libX11
+		x11-proto/xproto
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 42506a9d1bfd..5a7e19b99510 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,7 +1,9 @@
 DIST kjs-5.37.0.tar.xz 294908 SHA256 2be1dd4e8a6b0914d3f1c7bc4ee0d2666b8166430adb576e17d7441225f2d010 SHA512 0cdaa4e8b2d239e3ff53da12220a60e48e11c1e04a777cda53012d1bb3784948aa846f96b81c3aa71b35a5549a549fbee6665b68439fa0f47dc4e47f527a9cf2 WHIRLPOOL 16ed43862f0ab3b2091072b915ffc96f231c58b5c56fca3e1277eaa9b039e822c3ef707f1940b1ac686f600cd3a1ef9fcae4f05b7efc6c12b19f8f699167959b
 DIST kjs-5.38.0.tar.xz 294828 SHA256 c173775230d93ef9da043e2664c71d0bd84c6dc4b05b881730dbcf32012a3c36 SHA512 33941a4dd77f1df46d88357dfa7363bbb0eff81a8d0543f385237d301d90955ad721bd255fbba810b602d50569556a3d5df0d37c6d4b16fae10e180263e45689 WHIRLPOOL c316225b986f04ebc8cd5a60a6641481b570e2b19dbc63a6fcd95653b94349f0eab1fc99b3e9b17460404587ef4b96df5e5237a081a07acb53d1a6920e7e352b
+DIST kjs-5.39.0.tar.xz 294876 SHA256 36b365c9f3f41b8ca60d9816d58e6a67e32b2c83385a92d43d3237431118763a SHA512 86e38cd720d971469434ef95cfbb5de19a1bba5434b4b39ec922ddcf2812996d84b15746ff2bea19128f8467e1e322916623d93e05b2d4d382e3bb1016305805 WHIRLPOOL b634402ee367b0e599eacd6eb6493f641cfa60a0d584671bc5fe3ceedeac35e2ddcfa18533b12df1aeea5a6a6320a4c5c2582bdb83cea6ed289058435a29729c
 EBUILD kjs-5.37.0.ebuild 388 SHA256 c68ebe3eb85fa8d85b03da9cd86d10799501eba47ff28d97c4b81e35ee8e8ac1 SHA512 388cd6c3b6bbc37d9d146de2903e8fbc0a6601b09373615d4e27b2bd5e34809019900bdbe5c178487f0aa1af1ef257c5a2a281f376a34754ddfa45feae873566 WHIRLPOOL 615c6b816592117118a324aa2d3b5e6addcaff99744a54961fff7096ff17eb8e4f71d849c6dcf46c08685b754080baaec92709a45bbeb62336c2538265c1c64c
 EBUILD kjs-5.38.0.ebuild 390 SHA256 6c715de94e5fdbe2a7a496e5c9c8813ab8b1fa1932c928ffe0dda3c026fa32e3 SHA512 f37b751622b4265eaf7361e8aaf3d2fe623cad715c34345113849fb2bc360681aa38076cae192c117de91dbe4ef65a5e8f5db99de25e7c41137ba20d869c980c WHIRLPOOL 5e0fb95425805425e29061137ff45033f152f27231ce9c9c1a86ab0091f90b8794017567c390d0ffe589c500328c3422d90fa52b1891fe6bcbb8011c63965001
+EBUILD kjs-5.39.0.ebuild 390 SHA256 6c715de94e5fdbe2a7a496e5c9c8813ab8b1fa1932c928ffe0dda3c026fa32e3 SHA512 f37b751622b4265eaf7361e8aaf3d2fe623cad715c34345113849fb2bc360681aa38076cae192c117de91dbe4ef65a5e8f5db99de25e7c41137ba20d869c980c WHIRLPOOL 5e0fb95425805425e29061137ff45033f152f27231ce9c9c1a86ab0091f90b8794017567c390d0ffe589c500328c3422d90fa52b1891fe6bcbb8011c63965001
 MISC ChangeLog 8839 SHA256 cac3bc7f4de92f5c8a4fb4e7177d29fd3d496a5ccf1c23a512bf0ba23e181c5f SHA512 497bd9e83347ee10ee100c78020e6b25f8d1610bd24489181dc2c0aa49bf61d153736de0e9909a491bf92bfa22671713a46a1c6c1f8550b261b6a79521982c97 WHIRLPOOL e0e03e5d4c1fefb86eb7f5f2e93a817360cc59852eb31f7a2cdb480baf53f6d08f47efed6e9d7b518a44f1ac42a1999129b26b28df5057746a719623977d829b
 MISC ChangeLog-2015 2261 SHA256 e8a957a2bd5f1b6ef5157445be8318ac37f259d1f5f74621364bac49f28be9e8 SHA512 bb1207b4495f00d6104dadf4224ce2649aa3f867be9cd44c1a21359855e1473b9b0bbc732117fb4b2b77aafbdd6e7d4197adbd49766bbe421dd5724c4668adbe WHIRLPOOL 0c57288767ee90073afbfb02c4a0a22a7b766c41393fb3dc2fa5c3c29c8a5c1a52f64ff497d664cb18760378a6c39bca527bc1e363926f981ad06983bc77a75d
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kjs/kjs-5.39.0.ebuild b/kde-frameworks/kjs/kjs-5.39.0.ebuild
new file mode 100644
index 000000000000..5dc713b5658e
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.39.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 8b52878c7738..10ee9cb19d4a 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,7 +1,9 @@
 DIST kjsembed-5.37.0.tar.xz 169532 SHA256 202f8377abbdf4ad564ca0b11e74eaa6001a5863406254562b6405f755995c70 SHA512 b2a46546a2a06e912634159c6c37a0a7fb617efbef592c94afa7d6c30b116cfdd8d419d42012bc7890a5f846ff3c4dee113687cb7877fbbb0aa599d3cfedba8b WHIRLPOOL 2ed138400c26b1b845443b0b10c47f8cb485146b3aaba4240514ce75aa1db353b91e59c6a23bdfc11558a83f20a85936a60869d34520f87dd5d5768a78eea54f
 DIST kjsembed-5.38.0.tar.xz 169576 SHA256 0afdf41564f2f00e98c13cb160e9405ac40c11836dc0f354b50f01418a3d6059 SHA512 f48ee40da614ad456d1d3f50614fb59cd88dc4cef3f74378b6a73a7b04a2cc8028aea2f60c2de98aee141b727a4f0ad2986131213dee2d9cf99bb1f853728eee WHIRLPOOL fff85140c5308d33cd5e697513b8ae248324e0775d85a0dc68f9e4652fc3f65555b8ab543827578e82c46efad304db42ceba28b6b969fbdf910bd05f6ce00fcc
+DIST kjsembed-5.39.0.tar.xz 169676 SHA256 ebcd97eaa6a5e36f6af7201e10f716aaab3a8cda984ce6b115a8274072f778c4 SHA512 48b85bc2a8e1860cd2033e76aa76f6de18db4eaf6e89ae091eedc83956e8d1cbfdd78b56cf3b0177b9c057effbb687742428020b0219a2eca7e56bab5192576f WHIRLPOOL daebdd0631fb6c19b67cfe3f759737362083beca754fb741e27aca471a7b9da881109e7d49a7baf636a9a5d496da3e62ce738ca5b34d3523589485e127e3cf35
 EBUILD kjsembed-5.37.0.ebuild 523 SHA256 d8baf2cd13e76736cd9970970de56d86143285765d66836e448d6919beac90a7 SHA512 dcbc129d1902c38a599b43d4f75c9b9c1021694993f79e65d65f9360b139e5229d73edf65440a49bef3839078f3d42a4a5388595372e3f77970525db84e082fd WHIRLPOOL 0159f5d23a64b7f83e06fc55510b6f1e33e4d2b7da852b03b4f52663e2d107d422ee852281780f0a2254ad7f5d6e47261df6387dec456381395730c197b2c045
 EBUILD kjsembed-5.38.0.ebuild 525 SHA256 b4c76e9dd17035a8255f2ac3b14e72dd0a169476935e2e7f47f5d0f91093a7dc SHA512 c7802f98a56a73435e42f33f0ca70267c1c6b2435bc78ad2f8d9ce68e6c0a9668ceb36794799fabcafd2c7801993ba6589e21876483d4c8ec2a7ce4359797457 WHIRLPOOL 60e0d1ea5a44dde70b17ecd3e3ce87372de2391f8f2ea2cdda675272a5ff69b39e23e8e57d58b410ffcd426ad71837ff0fd90fedde9193709eda8d709bb85683
+EBUILD kjsembed-5.39.0.ebuild 525 SHA256 b4c76e9dd17035a8255f2ac3b14e72dd0a169476935e2e7f47f5d0f91093a7dc SHA512 c7802f98a56a73435e42f33f0ca70267c1c6b2435bc78ad2f8d9ce68e6c0a9668ceb36794799fabcafd2c7801993ba6589e21876483d4c8ec2a7ce4359797457 WHIRLPOOL 60e0d1ea5a44dde70b17ecd3e3ce87372de2391f8f2ea2cdda675272a5ff69b39e23e8e57d58b410ffcd426ad71837ff0fd90fedde9193709eda8d709bb85683
 MISC ChangeLog 9176 SHA256 5e6020361ac822f04d22c5d4b0019aae3d5bfb41b6a7b5fd6b00c49ebcb0250d SHA512 2ecc5c5b86df41111e6e61617dbb9cd6bf9127bb18a082f2e3d336cfee0b093203ae51d21202102e8ae16005568d7bd2ca4b1eefdaf640dc21c53b4cdf0eb0f3 WHIRLPOOL dc1c3c8be5d25d43228fa44fecf8c893901cb6b8dbe70c6c4c8530a8c3cc93119cd2f8f894d6b2f36cb920305bd509c4c6b81e2a90883aead1e9767f99375f64
 MISC ChangeLog-2015 2315 SHA256 0992df5fb4345dcdaee06c5227386d92362dddc8c293432e54f25f2d361b40a5 SHA512 8539562fd4d91569b3b3be55f75be01afd54b332cb4892d02b14ccd715e5153f53829adaa0e12a7680ce575e9c958cc8641df114bf3e8bff1defd12afc712f6c WHIRLPOOL 3508f4f7a4f3306525db5df93cbeef6fd47aef0e8d089cb1007c970c2849b356675523921a0a3961e2cd685258421578d24a57afa8d9141570a49b64ef3ac4f8
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kjsembed/kjsembed-5.39.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.39.0.ebuild
new file mode 100644
index 000000000000..f7e4cef3bdb6
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.39.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjs)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 7a10ea7339ed..55a0f4c2f90c 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,7 +1,9 @@
 DIST kmediaplayer-5.37.0.tar.xz 9568 SHA256 5712f0c69f77a2bdbb698c9187b54cd7591d693201a7aef40fe17dced9cc1d3b SHA512 8279819334eb66c02a90b4bfbabb4c3c10374bce71edad923c30a70ee1f44dc4c271db1374241c82d1bbead18e5e1de2ce282c4a4982752b64bf140d778ccb59 WHIRLPOOL 46f8d173a3048ab1412c099167d05542910fabf6ce9ec1148e4716a9a1c942de9ff095eb1f3881ac43ff5913a33619f17b33f9abc5122325e7b43c990a9f444b
 DIST kmediaplayer-5.38.0.tar.xz 9572 SHA256 669c07be42c2412212a183ca86e7500e11a49f4a52cc26221aee8583247a62e1 SHA512 c26edd9e6b475242e0b1a3f15b99b68297e0fd253a4d7314d4b2ae892834ed9923c6008c1fb202a922922c6d037c34b271a1699332eb733e5d3d4671254de71d WHIRLPOOL 94bdb032ae86459c68fdfadf0d8e40c9665f78e1b04e5efc9142b3f8b0c39887358949f7c33bdacf7920146e7c4fbdba4005992072f1b100d07d983b0e253ae8
+DIST kmediaplayer-5.39.0.tar.xz 9568 SHA256 e11e51541d4f70c4ba237fca37ae19a398f284e6ecef6cf0326292bc42e0da27 SHA512 317cd599ffc58a7be3fd63ab698831d60f0c569f5a3ad593fca9e1877e3c89fe4bee03ad91db3558aa05a80cdf220382f2632c49e21ba2146c31dfe8b9866958 WHIRLPOOL 04c3ae341cbc5a98a8a20d1a7b39b967fedac289defa5d1940d008502691b78c0a0b5baff8b0c8ee3f1a5939ee770f74d0998487edea65e9db8caddb9bbeaf0a
 EBUILD kmediaplayer-5.37.0.ebuild 453 SHA256 0a56714d2150c32cfd2604c88098e77e28e1b4b46ddf2b0a3c763f0817ef77d5 SHA512 3ad57e3872c18da901fa27104eb04e5a00db786c2c8004fba99daf13532068ab5f9750ee7fe0b4a93862ab3a580388f56fc36b796e40fc5718380dd36f99cf5e WHIRLPOOL 89f813588912aeb78e02fe11249da94aea7db17f46d0b31570244362e6b01506db12adc2d714173788b969c4569dcda68e2ee657a986e436f8cf1c79938e1d41
 EBUILD kmediaplayer-5.38.0.ebuild 455 SHA256 9f6da9515da9135cc8333ef0147732d33d01f96587cbd9b3139a1ad899216667 SHA512 6709f80183278d864c22d09691855a4a88f86a99725ab38dc014c4edce7d929fabc39d323b2190c630d773b2bc124d18c0537211828534831a0642a172a017f8 WHIRLPOOL 8941dfa53dd22d42310957c37d39ac293a5d696af056c79e3810694e4a907dbfb680efd8833a16321c9a8e77de813c72aab41c1ce7d61f753e09d6a0c65eb053
+EBUILD kmediaplayer-5.39.0.ebuild 455 SHA256 9f6da9515da9135cc8333ef0147732d33d01f96587cbd9b3139a1ad899216667 SHA512 6709f80183278d864c22d09691855a4a88f86a99725ab38dc014c4edce7d929fabc39d323b2190c630d773b2bc124d18c0537211828534831a0642a172a017f8 WHIRLPOOL 8941dfa53dd22d42310957c37d39ac293a5d696af056c79e3810694e4a907dbfb680efd8833a16321c9a8e77de813c72aab41c1ce7d61f753e09d6a0c65eb053
 MISC ChangeLog 9412 SHA256 376a0e61f3198ad8a4902cb799bf99380e579b8b139b3c175d0692f8e320a763 SHA512 941b563b375a3ced278844c186536d507b9a7aae7fc0309c812c13fadc18c1427a37c42dc10af20b990bd365ef39603e39c2f87052fd099ab573701379f5c17e WHIRLPOOL b8cd0adf51465a3928706f95ebad48ed85a70477a6eb4e8b44208c8ba0cfccbd5eeb7ca4ea5ee2f88246fdf410e5e58dd68343259a9665789ad7df75cda065f5
 MISC ChangeLog-2015 2445 SHA256 8ef7353fda7613f73a583e7957e8d349e59b57d7fd955653585dd9e3dd5ed0ba SHA512 a9fd7db9e7e65eab22e3a5101013021da80254b5f0e8239b88ecc0e0a05b8ac1efa4fa1fa29fa3f0cbb8d0c812906ad3fdce709907ab73840c8897caaae000bc WHIRLPOOL 27529fff443f25887b8ba4d2c44e3941aeb02b32252056788a39f3cc454216e2dc37a04a1444abb7bb88a79721d3218b7fa35235590d452c9e43935a67d6e8ac
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.39.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.39.0.ebuild
new file mode 100644
index 000000000000..20c65967558c
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.39.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 9b4892662d16..ad476075c8bf 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,7 +1,9 @@
 DIST knewstuff-5.37.0.tar.xz 890948 SHA256 dea2875aa1787525545e789fcafef75ddd0cc02e1175432b27123dd23bec96e9 SHA512 e67084ed5b6e54345daf125bbdb45c1c82a9cd4450de9a9c98d1aa76410234f8fe0f0f284418c46c55f6dfab23ba7521c2390998479c3a94f827ba8104bffe03 WHIRLPOOL ab46302c1592161b766cd61628e14e6d50e69669de9450be7eb165f8b7eb8b82f16e0e8619a176c32aba3942a6399cc4c9da4d6f74b56ab97f99f1655c966d06
 DIST knewstuff-5.38.0.tar.xz 892220 SHA256 4052f0ac27bc32de02493494816809261e762eeb2e906168d9e749aa99ab8cd0 SHA512 a4a4b21a8ca86740659113901c318061c6ffd07e0f3406a5232d778b14c1e76f03d9890ae07d6115725156451d258453d0c8f7044dddd380e4c986e54bcdb43a WHIRLPOOL 194c52219d54b8783562220d92d8f956048b0b19bbf5c5abdcd2e6dbd305711f52bad829a99bb0bbe9c4fb259d958fc9cd3c293d5bdd9a225dc0ff094db0d15a
+DIST knewstuff-5.39.0.tar.xz 892112 SHA256 3925f2417e35f5dfa9d2dc1d8059233467569af915b2c0266ea62d6fd2a6aeaa SHA512 7ff97230aea7cdbffe721167a4c42963eb9d620f946f8d8369f040a83937ef211fa5a614cc8ae791c9dfb85b3168313fb44e7376fa19275ab6ee6c7f0af3af6a WHIRLPOOL 22fc35b75b1c61990d6a6e451d97a8e83d381a69077e8e4b6db13c29fbabe91ece9bd53cc9b6b2e27ab179d41375af3c7efd157d246408999de1b8856fcd0922
 EBUILD knewstuff-5.37.0.ebuild 865 SHA256 5b91ec5e05b8681ba1cbbf51dc6c8cc71c818febba61e1b5c7f3ce0107f5056f SHA512 52d8c93cb4c3280bbb0907a70296a304bb8104c0a86a4ffa8f068722d9a59417a50d6af35b5323d1f0a5c4b3f8c45bfa762724c10c5899cc33f69d2f708039e8 WHIRLPOOL dfde5cd708f6f3b8e34cc378d00d4248932ce2a3a7f5154f87fa2dbf5dda75bf34a64e68b5acee3eff2d3cc4f83352e4e61fa907b4c94ab9a8edaccd10929da9
 EBUILD knewstuff-5.38.0.ebuild 867 SHA256 4d18045aa6fa0e869db343437676b17a724ffe8dcfcaf7ef2653f0df8ceb9ed6 SHA512 c9f1f2aa0794e5788bdc8435be1952ad78fedcbd9a579c06a92514f1ba259e9df91a8b19a96530cd9b193e3e5f790dff3a171849c9bd9f159ce24f2858bc35e4 WHIRLPOOL 2cb581d9c4c254457b8f1665ae7aecb8c42c6d36fd2c5ba19093a580ba51b8698846e9d86f03384195f6cab9cf42ea87903fe4b381b90ed35574328503b64639
+EBUILD knewstuff-5.39.0.ebuild 899 SHA256 af64c009f28824e385c495c7cd43dccc822ccb85ed7701d892898167db4fa33f SHA512 14146f4bc9998168811e79b12f5e5a9c07681916a0b130daef98c1b2b669f127354bb6351fbf932f968b840d974327a635089d0d55c93769c87c1734265fe448 WHIRLPOOL 7269cab11fd54c65c281668d178ee8b044c462986a23ab67e44c9d30cc7ad95c2febcef6959d690430a4220cb0ddd2ea59dc8f0e507685d2f0abb5a046ce542b
 MISC ChangeLog 9235 SHA256 4a7e7d0999765166c58f6d398b946e4e87c667cb08a557c5d01550a60b273b4d SHA512 123339c981f9e80cdabf8d25004795f9c4885cb2277d99fd579872cc24a81b7e238f3d6b6d5f06390a599b16a751f1973eecb7c7a5c1648011cd3db145a2c476 WHIRLPOOL 541670d3e521a3934861ab2999ac3dc3579af0aa8a56fcd1a762b0ff3173bb30e25052fae8a8578e728f1ce202e48878018938df53c737738999a5c44175d80d
 MISC ChangeLog-2015 2348 SHA256 0cdfa0576377565989cd532feb700fce6cbb5ab60343d248c7d5adbd6dc52879 SHA512 6a2d6dcab5903dbb037025ed37ed6a3b065d30f77d061ee96a0c78f3ea3f640630ebf70e1d414fc9f6315d1f977f3abc0f2ff6b73a946404ed3d5e2ebe679e8c WHIRLPOOL f0531c8cf885c420e3401e84a263d4540e9b695a09817da95c35c760e07206528cf3d87a68b05f140ff03909d3af4291c1be44049f993cecdfd89c7a44f9a9f4
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/knewstuff/knewstuff-5.39.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.39.0.ebuild
new file mode 100644
index 000000000000..5050b624250c
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.39.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 69b3db901cf2..bf59c08daca8 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,8 +1,10 @@
 AUX knotifications-5.34.0-no-block-notification.patch 3726 SHA256 50cb5193c7ca46aed5c9daf11644481bd8504506e2e66a220d185dde3aa6e704 SHA512 836701ab0522090700c11c2c89aa046ffa13c5fd1698cf099b19d617cc4ceaa3c5f563c8ba70d9919ed83077d1f2909dd555ca34529d3bc57ad6758ce177dbfc WHIRLPOOL 13ff9d3d2e1667e167608b5d4640a51b6a90452879800b0cd9ca47f7cdc4a5bb29737bf2d6a69c4947d44f04d72b1276b3a372024889dada7ea5e048d980977b
 DIST knotifications-5.37.0.tar.xz 100004 SHA256 66cdfddaa31f773a538d429026d0117e60f8a0a7f2a90c861f95d84395347b3f SHA512 3b08faf67d705233e98ff5e6cacdb6983134942f1ea5bb8cac43ecfe7b15aac987702cf635dd8dc3e45047e5069bb3fcd39c9745ac4bf414bb33f69336013644 WHIRLPOOL ec6c1ad4da2c45d0dc058d2b1c5c53679c68a1822b76085a71647f3386eede2ab86b9c8f38bc26b2f7b9a793de0c8508c5b22d539788e0043c37fd9212e01102
 DIST knotifications-5.38.0.tar.xz 99904 SHA256 ed7d33414840c8b25ce0f7fc446516bd85458b4e349825da026eb511a1d875cb SHA512 47d3268edd3162f48973e3ca0586df73ec3115b100c866e014e8dbf4b36f5102d85d97d722e849641415e2f91e7e1f2e5976b42e7a34ae95ba8ecf88e8ec0672 WHIRLPOOL 9f332d335cdae3af9ab4927ff26716b810c848c6215852cff0ed16909743654bb8fcca39ca4939ede2ec6ef16aecb6143b21a4c5b4dc0f61bb2134b63df6578b
+DIST knotifications-5.39.0.tar.xz 99972 SHA256 b21daed46b95f7d109c5c0e8d3d43e9f435ac497e33912420b495c9080626838 SHA512 510ed096fcb241b9e52af39d1b1fd1d5d22309e06c3979eac7c05bbb9174c484c2f88a66a4b6f645b11b398d6dfa4be77399982bed53c903537259bf4ac1b66f WHIRLPOOL 36f393ec2c0a211aa710e763601c7d138b0db22704ff4d969e66f3a03ba4fbb2974df282fcf4d4b1daeaa0f587fc7904bed60b85941e7be0cf7b637e87a2143d
 EBUILD knotifications-5.37.0-r1.ebuild 1047 SHA256 952ba305aa987ef8bf7709f481d5eeec338682f33cbdb1e3e61e79a892717d30 SHA512 c5e18a4baafd71462a437d70f714ec08abd851aecb22fb6321756d7e2c22fef0bd0d981fcb66c6fcde890e84dca9398f443b1d7b7bd1c3dd065e2fa8f0274548 WHIRLPOOL 7afde0e221a7325040d8ad57d35dfa222fc25499f2809ca9141e4b3cdf83e5b86a72ae9b5d810a30ae8d9b9b5dfe5b6e04ca2990a9b846b7d3851d13a8fdd563
 EBUILD knotifications-5.38.0.ebuild 981 SHA256 6679028fb1a900215d51a87ef6b3bd7698174a719eaa9498bf95470ac93c4028 SHA512 f9a7ed59e8ba364035e79b26efed0d4717dd501fee5906e70327fdf012f1e21b31802748505f83d12006074f4daa42e1d7895b4206e4a8c191a8d48f1e5ab012 WHIRLPOOL 8b606e6f4e85c187f4b67c7e235711063108cbb468368fbb8e2719973219c57ba16554a006048a897e47f89cca8b23a69fde6598fad321359e1d53e3886f1fe3
+EBUILD knotifications-5.39.0.ebuild 981 SHA256 6679028fb1a900215d51a87ef6b3bd7698174a719eaa9498bf95470ac93c4028 SHA512 f9a7ed59e8ba364035e79b26efed0d4717dd501fee5906e70327fdf012f1e21b31802748505f83d12006074f4daa42e1d7895b4206e4a8c191a8d48f1e5ab012 WHIRLPOOL 8b606e6f4e85c187f4b67c7e235711063108cbb468368fbb8e2719973219c57ba16554a006048a897e47f89cca8b23a69fde6598fad321359e1d53e3886f1fe3
 MISC ChangeLog 9548 SHA256 f1da82297eefaf2be28f62e8767c477f85a99daab7d84389e1f1043388541f8d SHA512 fe43af1553969537c16a5d6a76b993d47268835cc6531e2e3f39c75b40462b8b4ad460432f964971ae5f566cfb3a3e3806895c30c5dfaf672e58ade8e2f3902f WHIRLPOOL 7792d3b1b72b8f92000bf83b1aa9072d8ec103d27c2d15e58f0c865ddc6d906fb243950bdf7099c410318a5a6adb3d6a073ec11d3ccb9875c8820c0dff1f44a3
 MISC ChangeLog-2015 2507 SHA256 bc35d540e00e4f495c64e973d556046dc6c4141211d0c7ec79ef3d1208f2ad48 SHA512 6b1ff047ba2dbcd858778cffedbd4f1bc55eaacb1aa1660e332d0c4ebd9634c76ec829ca9ba982f8cf52cdbb020635e4d01fbbc45bf9a706a656ed9dbc3291e0 WHIRLPOOL 624f79d1f03be446b3b366d623357dee6f303fc480c3cc245beba3ff84c5f970c274a754d02ebb44f0763454b384b6982df58b08e4768233ff1a855114e2f797
 MISC metadata.xml 336 SHA256 060a96d368bfaef82d24c39580e341055359094792cb45f9fd76960778807e86 SHA512 10046ff92549d9bc3a8487d66095435045700bb85032f00e4f73477b0f7e506006601b7b1a61d341ff8af9a925939fb099b4adc55867f9b1faa5834b717283af WHIRLPOOL 1c729df378a70b5c572ac0a0c825066bd9538857d16c7f37835f958f96a2240790a98a02106f4f3d1d068303be6aeb18f149c99e8af51e7219bd56137944f912
diff --git a/kde-frameworks/knotifications/knotifications-5.39.0.ebuild b/kde-frameworks/knotifications/knotifications-5.39.0.ebuild
new file mode 100644
index 000000000000..46d46ca122ec
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.39.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus nls speech X"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+	speech? ( $(add_qt_dep qtspeech) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index c02eacd3f5aa..306fb8d9faed 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,7 +1,9 @@
 DIST knotifyconfig-5.37.0.tar.xz 83444 SHA256 65c695561bf26dc5899e28a35604afb3da39283a459e704b00687f6dfd647292 SHA512 29b8216415161980f21d6459c7877d42a4b489870eb70aee15f2d2ec7380c7cdb985f59b917ff34328b8a9128a440b785256b1044e285bd31c80cca5eb1474c7 WHIRLPOOL f83c3e0d2ad5aa9c5a4c50cda090826a06e92f0a141a59accbe4eaf946ff8a7b653f8984d5ad76bccd43f7578ec503b34f2440b44e238f089ae1cffa586d9073
 DIST knotifyconfig-5.38.0.tar.xz 83464 SHA256 d333e83fb372b93493092084418af9fa5557e017c30c923bbd6a5d6f2a7d0f16 SHA512 11218be988cd21982e0cffcb268996f2c0cf5ae93da860f29fe286522f78c66eb2abca88dd4cd679fd0ff6fc6c0712d3c1bfaa0d5055954e9dee8df7289af182 WHIRLPOOL bba82d90bb75f483c0d5abfdcb119cdabce05f89fdde8abc75c45b66aaf96896a0f60c502ccc1ddb0617bc24737b605dd9c737df8406fbed886bfb8a3d50b906
+DIST knotifyconfig-5.39.0.tar.xz 83632 SHA256 2bf7d5c455a49e56d23a2295811060aa689223602a752269412a5d6db236d326 SHA512 25ef22f1e8a8b82eaee27a7de530addad2c6d7028b46eeb3f8b61a4daa9ad3b37457837f5e62ed8d0c3a6cefc92ca6ee71043c3bae56c6b671146f37a4553745 WHIRLPOOL 4a544481998f66a3e274dc4b1844ccc92f1a262d69ab535d53d6ddc257eb94bd7db3a1943378ec9de9514db49b94705f32c67bcea15970d0c6e1d0bbda640df2
 EBUILD knotifyconfig-5.37.0.ebuild 536 SHA256 4b5d4d14ad11e8344fc15206bcf2b9244019c3568217931ceb9c84d86c3a02e2 SHA512 8b2ca475073cca3a27bad58dd0602545a7ed5845a9bb78290d36304c0e0d44ec4f41ed70dae2194a3cc17afbf5584d41f3744cf708772c3358f12c7ba5aa36ad WHIRLPOOL cf8f80e9c40be5253e14b45822bb7fb10cb2477085d25aea9222eeae43b302eb0f14679972d60683bddd8d274bedaf9458b27216707ca134c666bfa95e2fd017
 EBUILD knotifyconfig-5.38.0.ebuild 538 SHA256 68ac40a229b232bca9ab0a7b09a0df5a1cd43b317bd7b6b7599b37d9a7e4fdf7 SHA512 5c8c12e1830d6fc309d4afe0019d3a6213d010d6b23b7b71c40c2afc7c002ff1bd23cc32655695eacc57029e4b7c5107f64b26588560ebf11daa412cb520b366 WHIRLPOOL ba20634f55206bea833b4fc3947a6da2b467af1368fbe21123f7d8f19bf60a6d488e2f35146da0f869896adbe542389fc9dd0fbf5724997d25312f3245c2b005
+EBUILD knotifyconfig-5.39.0.ebuild 538 SHA256 68ac40a229b232bca9ab0a7b09a0df5a1cd43b317bd7b6b7599b37d9a7e4fdf7 SHA512 5c8c12e1830d6fc309d4afe0019d3a6213d010d6b23b7b71c40c2afc7c002ff1bd23cc32655695eacc57029e4b7c5107f64b26588560ebf11daa412cb520b366 WHIRLPOOL ba20634f55206bea833b4fc3947a6da2b467af1368fbe21123f7d8f19bf60a6d488e2f35146da0f869896adbe542389fc9dd0fbf5724997d25312f3245c2b005
 MISC ChangeLog 9473 SHA256 2cd785dbfdf33261b028babf1ee402c396cc5b0bcfd4934cb46caef1095a3866 SHA512 a715c99ebb2683e881a9a4da6813cccc4f1c6ca24f428fc4a2d60091e35538578793ab7771ee831d8c5077d459204a4bd58850d5a842e31b1a97582e79da1e9c WHIRLPOOL bd5d0384ff4e2e096c6ba40ac98e4f50f835895dd863ef4cb82301036e7547b88ca8a811ef5c73d68cc4076a393e151241273976b2373d2e7c9ab5c1794a26d7
 MISC ChangeLog-2015 2476 SHA256 0b2d8864c3b029a294db3edf5696ec801cf58392757ba58e71cec266453b15b3 SHA512 d89ec589fe6a45dd40868c91707a852b26ea1db32b35b8855bf1a1ed6048dd301a7cb013eb2d0d767a638704e56df0973de7b23064183eee9400c9f7b1cc5806 WHIRLPOOL 7beb9feb1cb479efb0d3b7a53712e6e721e990a39a784242bd0b9a18a732c5534fdac31791f3589e6cf3332e8792f269c78b9ba78b35bf0c58c718863b69407b
 MISC metadata.xml 344 SHA256 4b0ae8e994f8b1a6367681c563eb1e0e0917c0debfc4ad2cc7d23cc965559449 SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221 WHIRLPOOL b45519475ebbff742b892ddbcbb93bcee55e646a3716739bb5f305ea9613ee3761e958f2a65fbc5d8238cda445c9ec1f78919e5c96d4d7bc9326c54e61600a1a
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.39.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.39.0.ebuild
new file mode 100644
index 000000000000..b7895cf39f8c
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.39.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="phonon"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	phonon? ( media-libs/phonon[qt5(+)] )
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 719964a067c2..77520d0bca34 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,7 +1,10 @@
+AUX kpackage-5.39.0-tests.patch 4468 SHA256 06938389426f218d8448c19d79afd6acf06253621b329e1d727656cbec800392 SHA512 35060ec33293e735512500f561c39729107b12c4232f8d642bb1bf5e33d6656cac2446c04c6062f10fcadcdb4871f25a4ef7fc7d1f476535713e9598ea416a1a WHIRLPOOL ee98f0ec20698012804b4f4e01600fe8918f8c5320a8f371ff5bf54d3fde7ffed9ca7581fd71f79dff8ea952d270325d64b5a775372e763a2f0ee5ce2e509812
 DIST kpackage-5.37.0.tar.xz 122824 SHA256 fac4d94dc33760aa71078f869fa0fc090c25a7aaf9547cc1a91bcd2b70296ec6 SHA512 a96121acecf77b3c849415264baf382dcf8d9c518b92c5f8c70e909cefcc820c1c8d63b3e2203a95d1817322c785d327aec48f3a52ff2680c7407b5918c566b4 WHIRLPOOL e67a57bf7d2d09dbda93e69a8536c734b6e33ee89ec3a1c3f4594697932894e463d7d66a7d14f70d3fdefaa03c28b07f466ee58fad4959955abc13ebfbda01ae
 DIST kpackage-5.38.0.tar.xz 125104 SHA256 b6eb027aa8fbb0a45d87b026ae7117f14c08385628b5da5ba55994f7f01c926c SHA512 6882610e9e3ebbb7c61e5bd2e5588e63a262322d491b5338becae8dca737c43e14b419d096e5f88cdd27aa66993f0401ea485ddda12a1f79463de058395c4943 WHIRLPOOL 53a1f8c24c09fc43859e92b55e18a6a11e9a70774a694a6c099a7760979f677630ceadd495d16264aab9e4b2306567da7d140d429e5a9bc90ed801737a5a4665
+DIST kpackage-5.39.0.tar.xz 125596 SHA256 713eff23f61d9766f02b40cc6cfa73acd31d126a0c6a775903f79c9adebc77c5 SHA512 64d26f23911cb6f6d1912e92d9681885e4155b5bd06c284ba30f71ada37c7910e3acc0bcf63e9dd202005e523d1c7e184e46d3660595b174371319ff1c6a7583 WHIRLPOOL f39e3a66c4747751449bc46d4bd29ac5cb1fe4a38950a6ff624735f7c39d82d47c260abf72dba1321224eca18af99858f8b97bf4362c4a98f9b822d1e419cc95
 EBUILD kpackage-5.37.0.ebuild 827 SHA256 0e04f8028b575e2df6a745d930deb4ff36d03e4e53c0bb09b478362f3a2a8185 SHA512 da444b103065e27228ee14211e6616cef4b457899ec39e9ac9d8c2b09b5f48a7faa5799c00eb9ef9da27e9e42a79de138d1e0f0d1e92a4f11c5e1607ca34aff6 WHIRLPOOL a8df8875773d976180769a0051bfeb14f2845d48080f4ca3e4b76a5159a2c7c4a82db3ab58676500d1bc9a7d68744bcdca7fa2c6b4e0f7facfcc37e8222bfa59
 EBUILD kpackage-5.38.0.ebuild 884 SHA256 a50930c87be16c7b92bae03bcc49f7cab59286832b53df4aaee75620c5c55c6c SHA512 fd1b0b7c0b373ceb3363e22931d5b0bf591c26d93144915af9d91de20bf1726faa15d357676b697e1317b69e591989b42138a574bf53020703d3b6efb312be0e WHIRLPOOL 9cd8451dcc9d146c575c900ba1ce1216b51456edc1e3cde864f53d3ca5e1b1bf7c18b066eece33bd7701020625eb8930fe5f3a507b206936e1c57deaaef311f0
+EBUILD kpackage-5.39.0.ebuild 601 SHA256 e0e319b5714c7826f0ddfd567f2601fc2bd98c10693331527c95fb9c53e4e0bf SHA512 89a8e80140244f15e58012e39701a05658bc3154b0a4ca1fe4df5dbf351bf40af2d28aafcfbfa3f9521b3587388808eb5448f858f4bd0f46dfaf36d336e63a08 WHIRLPOOL cbb63528c14ca1526197a9f9ae4027a028c5b77560d671dde21c500a0c848b0a9f2c5cf66c45aa22559f15d80cafbf5ebecef90f00a5abf77ae2d3a74323ee90
 MISC ChangeLog 9989 SHA256 220d73f625f152d878ed3dddb06e8dc2eb7a7e4271ef19ea0d511c235831efda SHA512 c45f6e956f1aade0a84c65bd2ebc38588fefe6513f7af3a83c0696a62bd33dce62df7115410661be3486d7beb5593c0d29290cdb17fdc238fc7feb63b609e596 WHIRLPOOL 87a8f39fa85eb509f04920998850c71c44d89b4f9b70c94b8c4f0e452b7b74828c851bdfd68efa8ac68529ba73a36222705fb58b53da9a2a2a26a0a3c0a4fb55
 MISC ChangeLog-2015 1735 SHA256 f20dd9e72864b952554ee8c2611111f64790424e0d5ebd868c762b687430b26c SHA512 bb9e4c31078c166f12af4eedad61bde4531f3e3a2f4dbf0af47b1e96f0268b230405f6fe6d8b220ab6d138f4c4111a93f7f831225422760c59274e2654c6dd10 WHIRLPOOL 9f284b08481529f462a17092ed9d18d6fbcc7a8d3a4192a08a3d21def87b950ecb01e5b23f9262b0c77a3a7f52073ba0f2aaeff501567ba2576c01b38b796f9a
 MISC metadata.xml 318 SHA256 43cd48f250622a102d423a68b4f54b62554fa17977f6427efb2c499539d4e2bb SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337 WHIRLPOOL 2ab5f9c798a6585ac012670edb11964a0569b647b8bd218970a95796b1fed970e5c065dd39ce288ea8ce81be2fe0e9b484e9470b82305276b06cd06f55b0f919
diff --git a/kde-frameworks/kpackage/files/kpackage-5.39.0-tests.patch b/kde-frameworks/kpackage/files/kpackage-5.39.0-tests.patch
new file mode 100644
index 000000000000..bdef0c909c32
--- /dev/null
+++ b/kde-frameworks/kpackage/files/kpackage-5.39.0-tests.patch
@@ -0,0 +1,86 @@
+From 6a8e67b0c62349c57da492c19490f1a03e3c7d37 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Thu, 12 Oct 2017 12:36:19 +0200
+Subject: [PATCH] use the non installed service files
+
+---
+ autotests/CMakeLists.txt                                            | 1 +
+ src/kpackage/CMakeLists.txt                                         | 6 +++---
+ .../data/{servicetypes => kservicetypes5}/kpackage-generic.desktop  | 0
+ .../{servicetypes => kservicetypes5}/kpackage-genericqml.desktop    | 0
+ .../kpackage-packagestructure.desktop                               | 0
+ src/kpackage/kpackage.qrc                                           | 2 +-
+ src/kpackagetool/kpackagetool.qrc                                   | 2 +-
+ 7 files changed, 6 insertions(+), 5 deletions(-)
+ rename src/kpackage/data/{servicetypes => kservicetypes5}/kpackage-generic.desktop (100%)
+ rename src/kpackage/data/{servicetypes => kservicetypes5}/kpackage-genericqml.desktop (100%)
+ rename src/kpackage/data/{servicetypes => kservicetypes5}/kpackage-packagestructure.desktop (100%)
+
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index 6126463..6d9767a 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -32,6 +32,7 @@ function(kpackagetool5test testname)
+                                                       -Doutput=${CMAKE_CURRENT_SOURCE_DIR}/data/${testname}/${testname}.testappdataxml
+                                                       -P ${CMAKE_CURRENT_SOURCE_DIR}/kpackagetoolappstreamtest.cmake
+     )
++    set_property(TEST ${testname}-appstream PROPERTY ENVIRONMENT "XDG_DATA_DIRS=${CMAKE_SOURCE_DIR}/src/kpackage/data:$XDG_DATA_DIRS")
+ endfunction()
+ 
+ foreach(var "testfallbackpackage" "testpackage" "testpackage-nodisplay" "testjsonmetadatapackage" "testpackagesdep" "testpackagesdepinvalid") # "customcontent" "simplecontent"
+diff --git a/src/kpackage/CMakeLists.txt b/src/kpackage/CMakeLists.txt
+index c5e0cb3..95d7bc5 100644
+--- a/src/kpackage/CMakeLists.txt
++++ b/src/kpackage/CMakeLists.txt
+@@ -82,9 +82,9 @@ install(FILES
+         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPackage/KPackage COMPONENT Devel)
+ 
+ install(FILES
+-   data/servicetypes/kpackage-packagestructure.desktop
+-   data/servicetypes/kpackage-generic.desktop
+-   data/servicetypes/kpackage-genericqml.desktop
++   data/kservicetypes5/kpackage-packagestructure.desktop
++   data/kservicetypes5/kpackage-generic.desktop
++   data/kservicetypes5/kpackage-genericqml.desktop
+    DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+ 
+ 
+diff --git a/src/kpackage/data/servicetypes/kpackage-generic.desktop b/src/kpackage/data/kservicetypes5/kpackage-generic.desktop
+similarity index 100%
+rename from src/kpackage/data/servicetypes/kpackage-generic.desktop
+rename to src/kpackage/data/kservicetypes5/kpackage-generic.desktop
+diff --git a/src/kpackage/data/servicetypes/kpackage-genericqml.desktop b/src/kpackage/data/kservicetypes5/kpackage-genericqml.desktop
+similarity index 100%
+rename from src/kpackage/data/servicetypes/kpackage-genericqml.desktop
+rename to src/kpackage/data/kservicetypes5/kpackage-genericqml.desktop
+diff --git a/src/kpackage/data/servicetypes/kpackage-packagestructure.desktop b/src/kpackage/data/kservicetypes5/kpackage-packagestructure.desktop
+similarity index 100%
+rename from src/kpackage/data/servicetypes/kpackage-packagestructure.desktop
+rename to src/kpackage/data/kservicetypes5/kpackage-packagestructure.desktop
+diff --git a/src/kpackage/kpackage.qrc b/src/kpackage/kpackage.qrc
+index 5d4d077..6368c00 100644
+--- a/src/kpackage/kpackage.qrc
++++ b/src/kpackage/kpackage.qrc
+@@ -1,6 +1,6 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+-<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/servicetypes/kpackage-generic.desktop</file>
++<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/kservicetypes5/kpackage-generic.desktop</file>
+ </qresource>
+ </RCC>
+ 
+diff --git a/src/kpackagetool/kpackagetool.qrc b/src/kpackagetool/kpackagetool.qrc
+index 5d4d077..6368c00 100644
+--- a/src/kpackagetool/kpackagetool.qrc
++++ b/src/kpackagetool/kpackagetool.qrc
+@@ -1,6 +1,6 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+-<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/servicetypes/kpackage-generic.desktop</file>
++<file alias="/kservicetypes5/kpackage-generic.desktop">../kpackage/data/kservicetypes5/kpackage-generic.desktop</file>
+ </qresource>
+ </RCC>
+ 
+-- 
+2.14.2
+
diff --git a/kde-frameworks/kpackage/kpackage-5.39.0.ebuild b/kde-frameworks/kpackage/kpackage-5.39.0.ebuild
new file mode 100644
index 000000000000..dfe8d79b1bbe
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.39.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="man"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 9d569d4b1481..ac2be0b5f790 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,7 +1,9 @@
 DIST kparts-5.37.0.tar.xz 175340 SHA256 b050a342ca377c37c5fdb94a5532d9f159ac7d46eef12c549bd0a23f5b442d4b SHA512 4c1bf3f0a44e7149ee02331de527965a9b241d4e15631ee99d4d0c93beb399ab6a454991a2dfae4124e94db0f1ef06068bb68fc3bab7fdbcf9295aa41eb59b59 WHIRLPOOL 0e9ba7fac465d63452534b2b5b2b005305a284400c0099c2bbd964597fd3c1c23c7d143055014488acf15b97d591e30a0ef63da39ca1cb8c4c92bdb4f0fbb125
 DIST kparts-5.38.0.tar.xz 175592 SHA256 f7a701a02d89c5555d92047760314c64fd51beb13ed393ebee67597e13396aa5 SHA512 7425ae2e272a78c75c384a4770221712d202dbab05b6f22bdf880b96ff25374989c6c7aab28cc9021079c92380a7683c19b3f858d5fc0fff97236fb4b9224427 WHIRLPOOL b42d5ffa9a251a6d061ddfde01ade8f7260561950de6e1d57549a768c3572e6dba38fca5d4a7a01399f23d93d83c04eb8d388d68a151ad2fd672e437217168fe
+DIST kparts-5.39.0.tar.xz 175820 SHA256 26ebb165f82e8caacaadc70c7c996d2c68d3a40296389760940dc385859362e4 SHA512 bd930eac9acae96d3637729b0447ecadb66aef41d38e6b89b6fe5bc45ae368941cb0ca16452aa20ae96cd29ade7ff2214f8ca70e165a3cbbdf2593f4eafb38d2 WHIRLPOOL b521b44dc3caf010798960e52bfc158ccb9c61d699c2913bc0e9cc95da3180cac8dba71d2978fa1b4f050612468932b45195a86e3c6c89635c614843b3a514ca
 EBUILD kparts-5.37.0.ebuild 714 SHA256 02221d8b56a399dc1de5e52ecd4c05b9dad151e68c0a07992152dd1799126b57 SHA512 e993b6be81b7d112540309ed7bcb16fca83518edbe3ae4c1a42ff00914a1942d8c7dd478591359d67d1d7ed6d54b638212b0e38b8f66cd135fff44040fe107d6 WHIRLPOOL 61102202406a8b921b8130b5b509cd32024184602ba3fcdbc14e2be9566409eb9b81b99af0b9cc1c8e90d9e5258478889103617835a09c86dd3dde2caa0aa443
 EBUILD kparts-5.38.0.ebuild 716 SHA256 ac286e5f4bc4350ef652fe8e2e2bc8625d8750e12c8b51dbedbfdf0005b37922 SHA512 de0e483c199cf623d836831e6ee9c83ad0c53d4d43b74eb1c55d9e7537bf6a415a2305eef362dbe7bf3761f19d73a0e6d0a98a64fe56d3b989a58e3e8da952b9 WHIRLPOOL 1aff3681c5a609ab1f8687065c7823ff1f08199b6a31a9ff02ae4cfa87aaa7fcb00f6ed697c055f85f5192ed920f93259dfa05af35f25b0d56889976bed92057
+EBUILD kparts-5.39.0.ebuild 716 SHA256 ac286e5f4bc4350ef652fe8e2e2bc8625d8750e12c8b51dbedbfdf0005b37922 SHA512 de0e483c199cf623d836831e6ee9c83ad0c53d4d43b74eb1c55d9e7537bf6a415a2305eef362dbe7bf3761f19d73a0e6d0a98a64fe56d3b989a58e3e8da952b9 WHIRLPOOL 1aff3681c5a609ab1f8687065c7823ff1f08199b6a31a9ff02ae4cfa87aaa7fcb00f6ed697c055f85f5192ed920f93259dfa05af35f25b0d56889976bed92057
 MISC ChangeLog 9074 SHA256 483b6de0b5463d0564d12b068399e45cf40ee99bbdb206fa11fb5b7f50263e46 SHA512 2ad75d2d6f52d1df2e7eeb378242299f2f2a03df966f61ec316aba54f69127edc829ed6cf92cae303ac5c7f4c8aecf04eff82545909a86e28cdc854099f626a9 WHIRLPOOL c20dd1cf33b2d03fb5b8bdb6cebb914fd71c65731248944a85bd6a0e829f574e88efd4a85600048b557bee4568afad29786142fc6b55e90ab5c6a6b9c74ff2c0
 MISC ChangeLog-2015 2253 SHA256 b62b39f4e0fb6e01c8ec1ee7d9550d6fce117f15be7f85138cce41f22bf21a3d SHA512 c0179ff8b9312f5523e3dba906f8ebde5150cc7802b858b7f64eafb332e65a5d439ae80f20a27331badf0df2f8d29032e0f505b8e5a7d3c97225e341738eed1d WHIRLPOOL 8908e49ef6a8808e4947bca5113ab485ee1d66e8e2746c06bf5b01c50f1041d7029da85eaf2e7329f02f1f9c4f19481699f0016678d16489798fea3496ac2247
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kparts/kparts-5.39.0.ebuild b/kde-frameworks/kparts/kparts-5.39.0.ebuild
new file mode 100644
index 000000000000..66bde191b22d
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.39.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktextwidgets)
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 8f14043355d7..d9482fffc180 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,7 +1,9 @@
 DIST kpeople-5.37.0.tar.xz 59356 SHA256 4e6353c80dd9b7c3a21a6ccacc278fb90936e6d6772a9e6a60aaa0743127f7e1 SHA512 9b39cb0b08a079a9d142875c73cbcb2ce990df69756d8d39648e1beea81e3c74b21db9ca579682e7e469feb51d0b1697a302286f79eba3a12127955511b68857 WHIRLPOOL be7ed32be34af03f95ab8a253f33b17031ccf064179dd0ccf03ea1d934ab13b57b502d10ce873b32906d9ccc43800e7fb3548e55008e098c7fdd5e6bcf5ba41f
 DIST kpeople-5.38.0.tar.xz 59584 SHA256 1d78459d0c7da5674d64d6ef421fcd3598823a44c3a62ca534dcbd650649a279 SHA512 5c7c2fb9c13922b2dec51e95d79086ec8d720400325ae369e23aa21714c2e01448b5985a6ae83208468fe4ae3d7e30925e5467481222a7a7a2d483992dbb907d WHIRLPOOL e31196d8c48b749e358590c15f0adde6fdebb07efefffe6af25ceb69fd165cebfb3a634cf88f786e7d38ead510a461185603fa3728d3f316bf144eeb20375330
+DIST kpeople-5.39.0.tar.xz 59600 SHA256 59399598cc4f8324963a71fd1de12b3344fec9d8086863e6858dd23f1a6de8e8 SHA512 756b9d798da7f1d8583ef3ecd76d82a4cbb7ef5cee5331a371066401455953b95888974d48e86a6d132b998d48b480a80ae500240ac00e186bd5ae80d2e92955 WHIRLPOOL dd9ed461283b298adf7766dbf8e009de49992875cbe42d881cbcb9a8cbbf8fa3328c9eb6c08603cfebcf915e9ed31c96ab6446340bfc985d71eddc8a5b5f2daa
 EBUILD kpeople-5.37.0.ebuild 771 SHA256 dfb1912ba8c4484ed4d91da08d95980f48b0cd076412914d5b2586967051715f SHA512 065ab42ec84ad1bdf60e8f361ffd482811ceaa542919ccabd5c797c3dccebf786062e7aeae333b62b6ee8d81ce46776cdc7bcf7185a6228f8fd8d5a0392f18d8 WHIRLPOOL be2797bf3c250720a0229168752526b2547cbd5ca787ed50f7646d1a33dd595f0dbd50bc022ffef1380a93be373c6fd51f932c09b14b468e65fc5543a5ca2ae7
 EBUILD kpeople-5.38.0.ebuild 773 SHA256 f3c968b59e08c200c9c8a70a6a7100e79124bf90b8db900783916b3bcf076c3d SHA512 a8b51595fc40636d76d1934080bbeb90c326abe9fb42eb4ebe7804af6a8881a641935a123a229697cd96e455118f8325c6fc7617b3d1747e1b9a565871dd92af WHIRLPOOL 4b388f2026548ed8edf8b0f7cb0f83882b7e0e1f741e2486cd9d093e47b13a21f0b1b4251642e6d6fd803903896e4fb99c8c4c97ce7b06729ec217b1b65607ad
+EBUILD kpeople-5.39.0.ebuild 773 SHA256 f3c968b59e08c200c9c8a70a6a7100e79124bf90b8db900783916b3bcf076c3d SHA512 a8b51595fc40636d76d1934080bbeb90c326abe9fb42eb4ebe7804af6a8881a641935a123a229697cd96e455118f8325c6fc7617b3d1747e1b9a565871dd92af WHIRLPOOL 4b388f2026548ed8edf8b0f7cb0f83882b7e0e1f741e2486cd9d093e47b13a21f0b1b4251642e6d6fd803903896e4fb99c8c4c97ce7b06729ec217b1b65607ad
 MISC ChangeLog 9508 SHA256 839036f5bda78f1470c07bf37fcf866b7f9b9c98c35bfdaab33e22801c13624e SHA512 99e523f44ca39d303006f130b90851eb9a3d0bc1affd0c93f18d0c71a553da4810f3d2dded4fed2d6031ce656504f8f6a4e426fdbb9c08a42bdacf7c5f46af48 WHIRLPOOL e3454c6b42dcb68c4aa25af2d73ed38f229dbb6b1ca3996962f718241d12a2b126b8f3aaa8c1fd3748d578341ec7838eaf2324926e838028f0b33e5cc5e6e9d1
 MISC ChangeLog-2015 1586 SHA256 a40f8f52473bc0b0f9660cd650191437f9f20a1770255f9df3bcefd80a1a86b1 SHA512 d24701a2ac0ad40e745ae2b8591fd2fe9f73532bcd81ac29a0286578b8311041e027edb741f2e6463e2c490c469d5a78717a58a7f360d8d712484591e88878e0 WHIRLPOOL 043f1102fbfa4ecb838222868807bf7ef32132ee22ad58442798246e28c0256a84baaa515337f243b7e02b664d273d351bf721c12671b63bd958f1fcb372d9eb
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kpeople/kpeople-5.39.0.ebuild b/kde-frameworks/kpeople/kpeople-5.39.0.ebuild
new file mode 100644
index 000000000000..535579b77d11
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.39.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!net-libs/kpeople:5
+"
+
+src_test() {
+	# bug: 612504
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 6aff5b676b74..59e23d38306e 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,7 +1,9 @@
 DIST kplotting-5.37.0.tar.xz 29668 SHA256 fc837e0f21a6acbcff6b44d1c8b2143737bdc813839af0ea0a30550937069a4c SHA512 7556d20333834568298ce66b9ce9b6aa0f2a09650552cba1482e8c534e1fd8a591faba7d6cbe7159173bf986934a8f9d4f35d81e29e15477cec01bc2995bed99 WHIRLPOOL 0b6b019514004fb3b570505b833b15404deb6dd07bd154e9e019cb215b426b39925b67ae2d9a90de7125df32031821b79987684e82917882b88e9dd3ed8cb398
 DIST kplotting-5.38.0.tar.xz 29680 SHA256 e2d8ef624735a56f3998c88af6f06209221af5f27ef05096d65ebb124dc56ec3 SHA512 a7c09c49686c571d97c14c6017634575aba61e7e93ccd9c44442ea1953c64cf64e7d68d2606d823dae5d05832f38c7d54c8786d5906a8f8cda8d35fb58b55fcc WHIRLPOOL a7a6f6bbdbaae748c5070817ce905bb17e4dbbf47813058b1e85b086a4769f5a6ba78d3d386ee76f560facd0b568e19f057683fbef41cd7da1cd062842c789a3
+DIST kplotting-5.39.0.tar.xz 29676 SHA256 6ad90a3c774cec102dee21d63ba8b4d75b5bc95d61cf903480f11a3b840b3eb6 SHA512 a4c43260989892d913c7589036579daf74399a9743bc1bc95eead1aaab9db912531b4f764e1a0610080864aa5d0d4f998f2bc65202c27480562b225c5c8e212a WHIRLPOOL 8e877650aa10070450e7313e798db944e59ecd6ef8e458238da6c190eb0c62f55ecf4a19f1d3eff7c0f05b173584955613bc7a2de348f52943d68befb3bcc36e
 EBUILD kplotting-5.37.0.ebuild 356 SHA256 cba7de9b4d0fd6ee463e188322e054b29322d6a4d7ca4229187e87449440d01a SHA512 06a0895d2d6c8fe6df04385bba56dd7f9741bab3c911d6246c24916663ec3446484c3f55a00b9b9c8535226ad7d5f7555fbf88c7aa26aeb40c6f42b2f9292710 WHIRLPOOL c82b15266d4c3ab732e28ca2f5d6a13e531424b55dd24aae9d363dd6555c8a6d2eb895fe4d79147908e017e79f886d4b6123d943db2665265c469c60409e1311
 EBUILD kplotting-5.38.0.ebuild 358 SHA256 ef57cadfd81629b28d99c68d6c0a1be2495ab09eae6156bb3259ef7a4bb89fef SHA512 3bab18404f60acb0a05d799a64cd4cc78195a8aee1a82dc7af66bb621e6e945df2e6feac941d57cb79767095aa0731958abfd15a907036ceb3d3c7da0d854a50 WHIRLPOOL 6d5cf8d942110c2916217a8d1b0f24f58a7f66aa6cfb0c270ba6df6142ed901039a71be8172e61ba062c441ff3cc01b7fa39c965316ed0e71a936f6497b9229e
+EBUILD kplotting-5.39.0.ebuild 358 SHA256 ef57cadfd81629b28d99c68d6c0a1be2495ab09eae6156bb3259ef7a4bb89fef SHA512 3bab18404f60acb0a05d799a64cd4cc78195a8aee1a82dc7af66bb621e6e945df2e6feac941d57cb79767095aa0731958abfd15a907036ceb3d3c7da0d854a50 WHIRLPOOL 6d5cf8d942110c2916217a8d1b0f24f58a7f66aa6cfb0c270ba6df6142ed901039a71be8172e61ba062c441ff3cc01b7fa39c965316ed0e71a936f6497b9229e
 MISC ChangeLog 9235 SHA256 ca06a7fc9cc763c123eff896b5de98c16237a168b2f3fd6efdd0f9e59cd9c574 SHA512 1793de589746969fce1c00f4b8e09c73fa0518e153158b4e379e80905909f07072b7c194bae0f317b38e0d6c9706515d316fe0a662beaddd3d7db0258fe39c3f WHIRLPOOL 8a840278f281aad16aa4770a44831d21ca8476aac33c88a0a2be3b7fffc81c956d40ba503d67c63018b0992bde12efafbe2a72cd26bbb8c260141d11f87d91bf
 MISC ChangeLog-2015 2348 SHA256 3dd3a76549e2e21049098cde1027e10d2f92d1fdd21d6b0d818d1c8dbcde18a1 SHA512 26c0d968ab9b4991aabfd234f48c0a76697592f5f0dae88fe2f02e3cf1cb9b6e46250458f30be6a1a9de375069942c8d1d1d8f04d617cc382cea48774687fe4b WHIRLPOOL 40885501342d1e7263ee6d93d835cd72d12b6a1fc39884abd779473d5dc1e2c1e7ea93449a6b4245d1acae701cc3d637481f13e14865281823a5124163f39c81
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kplotting/kplotting-5.39.0.ebuild b/kde-frameworks/kplotting/kplotting-5.39.0.ebuild
new file mode 100644
index 000000000000..91c166f32494
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.39.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index e42b821892cd..77de92041bdf 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,7 +1,9 @@
 DIST kpty-5.37.0.tar.xz 58204 SHA256 aab4ff0a6025e6dab859ce74a5cbf7031c52fe8674740c7408f1311ff2386871 SHA512 8bf1d12aafb319f952c7001fd59921d15cf248f0d09daa5b00990441a1959d873e1ce6aadb0cb175637290777381f6a4b8326637fbaae46db4030210072a1ec8 WHIRLPOOL 4d16299767ca278bd4a8391577a9c6744db81c449e71c70cc7936aad075e108f97588f1a69aa7e1cb0bb40249dd3c95f3136852f5fe2d9fcb32b545c047f0046
 DIST kpty-5.38.0.tar.xz 58200 SHA256 de98c5e8c13135aee4038b53b7656d8dad88e6a652140390608fdedc2344f031 SHA512 e5619a77630d82cd8cac52e536dd982b996bba3b0ba6d8a2e25068b2d0ba735c367073e2319c2cd95930db0cba510d92763fb93b06fbd26149419899c4aecb7e WHIRLPOOL 2828e521582a77821a497d8096a22427a1fc6f9cbc836fd570a200977a54ed9b2ac044205c8e0d7d3c06d0cac426219ab93ad4c9d33af7736de36c49ea8c3f22
+DIST kpty-5.39.0.tar.xz 58304 SHA256 16d26608a7bb5feb085aba7162e6d0ed151f1aace6fbdf7c68a8ccc1c76b060a SHA512 f830b39fe073377280ee896147b6f0b504c8bdad42976b0bab8027a50f6b3540e0ab6a21012417fbd70bd1a04c8109452330f2acd90ab925ccaf061e2d99f0d9 WHIRLPOOL 54a177b8500a63f78e5467294330188192ba613d849ee4ff9545b9a5a6016f009dea95cd741403ae6d0a112f478ca715d1eb6f77e2a503de0de27a2a67d2cabd
 EBUILD kpty-5.37.0.ebuild 508 SHA256 a2a2e9e122e9b5bdd5862b07a944d8caa17440c42c809f40afc5eefc9bcd0cc6 SHA512 c056216f589f45171ecd7dc250e21cdfc6bbde30df7a9254bdd82458d4b53b8c3ed6e0b58c28a115bb9b8fc6de1bcc73ba817e5000b8c48111fd2fb6f081fc8f WHIRLPOOL 6042a17322e042cb25debe58aa83772dafbbe76cd0332df541c4e50911528bd261a4e87a226b6c42b739f07d072f016692f22d1e828b93ef286c4fe6afdcdd9a
 EBUILD kpty-5.38.0.ebuild 510 SHA256 5b5881319dcb6b452667c9818c5d2b7f25a3b46ecbe4e3a4b3a254ec51894e94 SHA512 1287a7327c32e22cbf50a223629ba070806967484b259308e8ec9690bb1f9c7b78720579e44b4713b8ee4f20ca77648a8bd63e1a0872bf755c4e2236ed6211dc WHIRLPOOL 0e25bba787968a0c46d66e7d97216db0086b8db2bc84914b30194a227a9aa0f8b5f52a2b47a45a4610919d87901dc5244d800b8ce9997d3592c9bb5763227f51
+EBUILD kpty-5.39.0.ebuild 510 SHA256 5b5881319dcb6b452667c9818c5d2b7f25a3b46ecbe4e3a4b3a254ec51894e94 SHA512 1287a7327c32e22cbf50a223629ba070806967484b259308e8ec9690bb1f9c7b78720579e44b4713b8ee4f20ca77648a8bd63e1a0872bf755c4e2236ed6211dc WHIRLPOOL 0e25bba787968a0c46d66e7d97216db0086b8db2bc84914b30194a227a9aa0f8b5f52a2b47a45a4610919d87901dc5244d800b8ce9997d3592c9bb5763227f51
 MISC ChangeLog 9263 SHA256 3648a3f4bcdad31007dc63b5b1be3bf0ab9a38e02863f9148713b7a1386c204e SHA512 2269849b8045ffd97e640f6ac26b060091c14f2bb33b5bd1f5caf30fbb2059a962f7c441f33accb43d73c20bc54b8218eb971ade487b9118ff9f95276ffa97e3 WHIRLPOOL 9a41579cfed83fffe7959844bb71c1393b5dd052a693ffe128d8f51c8d476287684e1bacedc3f65bcc5e7bc5578d704c5dbcda388955e1b0e15bca8febd4a6f7
 MISC ChangeLog-2015 2191 SHA256 6120fc0bf00f1ac5e2543b385a66c11b79fbb4e80a02c1e2a18fce3f5ac02996 SHA512 eba8159985c5281092761e21faf64179b1778e11a2882e6f042f8b998ad02f030c7513856ab0016a66216df28b85520639a7ca8dc355e0927b10160fc3ce13a9 WHIRLPOOL 2d4622d889ef5aaa6c72f6395f9acee51ef53d3359da02230507b236f849de306060bc01ed39817cc260e0dd47485f39f1da71bc6b3aacb789517acf85519505
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kpty/kpty-5.39.0.ebuild b/kde-frameworks/kpty/kpty-5.39.0.ebuild
new file mode 100644
index 000000000000..87b3dab88b62
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.39.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 59845539892f..ec6dd5da4c2f 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,7 +1,9 @@
 DIST kross-5.37.0.tar.xz 127792 SHA256 611279d67a599d86e864980e50585eece994cb9d70569d533fed0ab48d33f31a SHA512 1a8ef9512375ff4a3345d7dfb52146c47ecf35e58a4e0aacf45a69d3da431617fe3bfa10e2585562c8df42f01aaa63884f7a4601531f837642a3946fccc8c762 WHIRLPOOL 5096f6726b49cf0d979a62ffd44baf0d4c122a75716f834f8d25fbdea5102b37c77c249a7244871005f41376ef2e8b1d7576ed9e64a7ab384f5328100ebae298
 DIST kross-5.38.0.tar.xz 127820 SHA256 670dc18d258e8f821fcd64ba30c587ac3afaecbc54d968edb0fe624682788cb5 SHA512 bcef33be50db6ce31433139d631031e190d7409e941f378904fe647379770cdf781218798e032c0445562725915584110f5b7cfd62bf60a9d20df70cad735152 WHIRLPOOL c6091234453f7dee7e308b795067c6706d0a7b0548539e7c76a3410cf1d3fba5f3996720fdce9c0b580b7d46736917cd5f7228f52b29e0739c02f9c94ccdc640
+DIST kross-5.39.0.tar.xz 127908 SHA256 d06ddc6157e150ea91be0f790df35a2e14239de0179f0cd8f048ad93597c09be SHA512 4fe0aa6b5decaa795dd9dfc29d08e517494487d96f5fd46c5ca62909fc2daedea5ed3459f5103867bfd2dc87f295935054ffe074747e7c4d7e0e60737ec974ac WHIRLPOOL b979f149b7700a0ea8d9f54d42b3575dcf279a365ea23510538748641ed3f73c54c57f4d6e5d2e2971ad16383fb42f75d62ea6f8825ec1e1e7ee700713e7490a
 EBUILD kross-5.37.0.ebuild 734 SHA256 b2c7379cc0eae217ff222f0901de33dbb1d9081f66adfe66e3a9b1277d65516f SHA512 812efa7af65c4cc7ca657231924176b50b6edab6a44386fffb3472499e59fdc3fd0c8a1c8cc4e6a8a3b2bba305360dbb430acea7954ae4329c7f79e1b09c9d68 WHIRLPOOL 2adea4c353557f332a2c91b5c23eb10642538865b3411cf064d5276bc8a957bc52d54a98b30f479372700b0d1fd674bfbecc56cce497dc7f8a1faa1e90cfe061
 EBUILD kross-5.38.0.ebuild 736 SHA256 c74ea779493c1c51851e95b2a4e273c1be908b743a5721cb30bdc922cb73d896 SHA512 0338e4fd77a3fa44d5a3920497287aa68c26b82907db6adf500f07bdb1688375de487744f6b7321f07b7466c8222bf8fbbf3632eb224843af34308acfb4a0089 WHIRLPOOL 90c17188ff3865f7994dfa46b2b0fa794daf2b0d7a2203900377d987f2b65518544405534909cc5b40fc43b563df2042100a072ed84d1a259cc25509f1e5aa1d
+EBUILD kross-5.39.0.ebuild 736 SHA256 c74ea779493c1c51851e95b2a4e273c1be908b743a5721cb30bdc922cb73d896 SHA512 0338e4fd77a3fa44d5a3920497287aa68c26b82907db6adf500f07bdb1688375de487744f6b7321f07b7466c8222bf8fbbf3632eb224843af34308acfb4a0089 WHIRLPOOL 90c17188ff3865f7994dfa46b2b0fa794daf2b0d7a2203900377d987f2b65518544405534909cc5b40fc43b563df2042100a072ed84d1a259cc25509f1e5aa1d
 MISC ChangeLog 8957 SHA256 380cdf34783ff560fb33d39251732465b3f908004369d739f4ec564d36615147 SHA512 1c31d6fc43c40aca2a22701c35fe533198e7faafd08c17b04765cb37f787bbdf99c80aa59a9088d4ece71431f69e0eafcfc3b5611386f371c4a8799274fa3b21 WHIRLPOOL 7137660aab98624fb90ceefcb7c6a9f7c8d07cd0002a1a76d48a33f27f14a393ea74b0f6db16e1f93685d0ca4bebe833d860d4fcfa5c8a9af6763a6dcc1ae3fb
 MISC ChangeLog-2015 2222 SHA256 d6aea2c0abb958258ac26bfb4b1120b4b045fc1c498957cbd27fd193d4ee7b63 SHA512 de60545e919357870e3b6a004a2e26b32580f2bc82b40864d3b04031be7bb578c3c882206284d49cf434894e0bb0738c8e4e1ba77623d78eb086dd64af2f20e7 WHIRLPOOL 2f2184b5a9ff6f3a5ee76691687d74695df47ac428752b7a28c019bf527d26e3a3e91893409c08a36c8884eba02fd61d92b2f1a06a0c97344084044be3a2b149
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kross/kross-5.39.0.ebuild b/kde-frameworks/kross/kross-5.39.0.ebuild
new file mode 100644
index 000000000000..cb127dc346ea
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.39.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index ee569771ef8c..f8fcd29eca17 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,7 +1,9 @@
 DIST krunner-5.37.0.tar.xz 68020 SHA256 8d12150cf48ec7eb36ccdacc0d7de2e1481e79b98754e7d813f46b1f325c389c SHA512 68e046bd62258d8ea55598959d6a0e9aa8f3686f9e2e023cec1c848b7683a001d0f2c09bc88bd3f86283868ed90c2d984a000899ad86348f96c1dda7559677dc WHIRLPOOL e237db900ee62f70956d4404efdec6838c81eb9f7881890f63a94d2006f928ce8d2dabcc85eccdef7799e9089309f2fa7cc77afc36ccf670e4e89e4040baed88
 DIST krunner-5.38.0.tar.xz 71388 SHA256 95bd2ed35f25d369bc2c613cbad87f78083bffde6ade3ad0ec9e69547fa1d099 SHA512 609f9bc91921902987e53baa08d985f3efdc707cf164cc87821d5b96541e683eb99e49fa70d577e09e178e8cad299727cc571e74c2f2032719dce489945efc08 WHIRLPOOL 1ce706a58bdf75dcb316fe2f4adcf2d504af82e7a38e6ca9ff547a9ce918112c5f651b4d07e1e1691ce162a228187c4b17493778d423ae3ac67a161532b603d3
+DIST krunner-5.39.0.tar.xz 60668 SHA256 d43d3821b64a49fec7f06a3ad410f15412cebbe7f365c64a307a2c5ad14fba3f SHA512 2a97e4612b9aba202c143da9de11ba95b3f0f9a9d4d7696376d461427392b8ad4575d2272d684b0bfb8bb276c2648daf8dbc6453756219ec13fd1379116269c5 WHIRLPOOL b779220983c311144b56cb8fe68f0360182f880bb35e79eeb1f8c03d7e1aab86d75d43993dc12d92e9985c425533b7ded2c162b5de0ca387e19578a3f953d219
 EBUILD krunner-5.37.0.ebuild 686 SHA256 6e66741d60b14745b3075bbf5d0042f3dccc8a19a64e1fe8f2542aa08285c7e4 SHA512 268b65fd06b07a6bfa9a9b02b3e339ed56cb2ade1410264e948179f00402de3fd7743215d289c78b53524d02d02bb36de9fe4b327cf4cf571f278fa68b50848b WHIRLPOOL 26c4e01922148739d594bf32fee2e5bd47e6d339e5deb6c4298f0bc4ea6080347bb67852a3bdd3bc4b8f2b49f8db1d806744f551aad99ded31da5cd9347f8a02
 EBUILD krunner-5.38.0.ebuild 688 SHA256 5287cff55090479d9441c971bbfb8aa2124a630fd721629fd76bb583f67d1bce SHA512 76779123dabc145b0ca73f72a257ee3c76e7e553b941eb155f9e214f55112d30ea9cd4305764af82ec21ece31c8bee9b2e29e8df2e06fc67188ed644b653dcef WHIRLPOOL 6537fe48a1fc75e55b7b7b94fca0d6d56cf1e965efa623bc0c8e47180e4286a1442c4a877458713cd5842ce32f9a5395679eb8a26921320a93065baf604c7227
+EBUILD krunner-5.39.0.ebuild 688 SHA256 5287cff55090479d9441c971bbfb8aa2124a630fd721629fd76bb583f67d1bce SHA512 76779123dabc145b0ca73f72a257ee3c76e7e553b941eb155f9e214f55112d30ea9cd4305764af82ec21ece31c8bee9b2e29e8df2e06fc67188ed644b653dcef WHIRLPOOL 6537fe48a1fc75e55b7b7b94fca0d6d56cf1e965efa623bc0c8e47180e4286a1442c4a877458713cd5842ce32f9a5395679eb8a26921320a93065baf604c7227
 MISC ChangeLog 9595 SHA256 45c10683c70cfbd23c4ffed98ef4e14dc69f0f152d14aaaf9592cdc0bdc41c41 SHA512 588fd5b883cf005505d718787a6419b8582d089e96500d415b7937fa086e76472e978fb39e8d201ca4d6d8f3d42fcba113352cea884cb7f99ccf78f93c74ab4e WHIRLPOOL a13753f0a483a6e3d1b2e05fa94d83698a705e5bff2af112cf4eff1c411a0878b35762b3150b94cbdcf717a5f4abe7367b9fefb6e8bb92244ef899fd1c247509
 MISC ChangeLog-2015 2284 SHA256 d2e20e607a792fe9ae39a9d030556721f184c51351ad85d79f27d2afdf02dbf2 SHA512 f8b3f5f4d27bbe93a7f8fab00d5bc2a2d61ce5f321b99f750fb6b4542dec5facfe9bd47e2a911fa29591a05fff85edd438ebc9d57ae2f8320e9c7a5f6a9aaf87 WHIRLPOOL cbc7db356ccc2b79b9c5f6b135a80587eb239d50f258fcc8cd15e7cb45f55413eac1c1866080eb2758dbeef2900bff703cf059fba70b62e0ab15a7978d52e861
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/krunner/krunner-5.39.0.ebuild b/kde-frameworks/krunner/krunner-5.39.0.ebuild
new file mode 100644
index 000000000000..3df0990979ad
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.39.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kapptemplate-15.12.3-r1:5
+"
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 359f398fd76e..943631985a4e 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,7 +1,9 @@
 DIST kservice-5.37.0.tar.xz 249748 SHA256 196e9bdbdb28bfda75120cf1f7d49f68bc345f248cdca8f718bee6d1be2fbaff SHA512 6833e7d08a63a9c6d8e81f65625751b4febcdeb8d1095426f8a639fd1a9ac31b2a86922b740430e40e3bf9a8c9e305db1b85e84d0ab994ef80bf53452f706001 WHIRLPOOL affdf21f00997e4b151f05a64b8be3dbe60730505947f0e26f5bfb2e60b821e6d0d2c10aa6cca163a72eb0c7cee9c3d126f0c01a450c040418d6b30fb9413ec6
 DIST kservice-5.38.0.tar.xz 250000 SHA256 2d31c96d8fad235aa2bfc96258ac03d7ec064184fe6a54856f9d7407fbae4a7d SHA512 0e76294ff870e8e41c562d062c715a9a9d08fcd2a1c1eea650dd3c81e36e153fc6e9e9e38a552159cab3ddd5e30ab1f653c4065c07173e51c487060583756a0b WHIRLPOOL e3cb0a6233d228eda859bcde65fa1cd73c1f273a2866870d4ddbbdae05780624d6891ac47b32b9bff056b782b054e54cc254db5313010ba3ed82a97db1c97474
+DIST kservice-5.39.0.tar.xz 250092 SHA256 149e0320e05abe67140f88a50cbf95d48a075a2996e9b2e3c9d123e6d1417f29 SHA512 9626f866531d08def470646991dc94ab5092a03958afe84a9c45723b5a8fefced61d84f472353d74bac94128ab1748c31118aaf83fe9d4e6e51c22eeab887aae WHIRLPOOL b1e83c7471f46fae98f52ba6c5ea9281fd1c2801d93f7b741292af349f51972374d9f26eb880b1d56060dfd306a4d070b785f40a3d98e881ec146a914cc8c410
 EBUILD kservice-5.37.0.ebuild 941 SHA256 bfb6a0d69712b64659ebcc4fa869b0426ba9279570a17dbf879722629fb459ca SHA512 8aa5365b784caa3960dcca985839dc5da7055e3d569e8404be9430502070483bd66d30114f6d835afac3db479bc898897e73cc7c64afbf3a664cba0c36d9ec81 WHIRLPOOL a69c82bc5d65e6644eed779ed6df51136b234036f8e70f183d82a26451009bc25a15c8e1b6d000f06bcba9450f53bfbbbd2de0ba43befb89a7d100427fed261d
 EBUILD kservice-5.38.0.ebuild 943 SHA256 e45b18e9dc647f6155300a5249b6e4c2d984cbe1c193fdd037d9109757b853f9 SHA512 8e5d3958682047a9bb85140b584beb16162de649748cd53df5e61269874f36370efb4f3a9bfeab2857e3ede284779f948d3665f526a2b3e7339df1f0efe4e96e WHIRLPOOL 18c851744701ca3fb400b6e798d02b0146c32598993dd48757b870a639187fe88b234a45cb13205d1b938d3db175c98617c28b97708d59e8c6cf4b6e4aa9e5da
+EBUILD kservice-5.39.0.ebuild 943 SHA256 e45b18e9dc647f6155300a5249b6e4c2d984cbe1c193fdd037d9109757b853f9 SHA512 8e5d3958682047a9bb85140b584beb16162de649748cd53df5e61269874f36370efb4f3a9bfeab2857e3ede284779f948d3665f526a2b3e7339df1f0efe4e96e WHIRLPOOL 18c851744701ca3fb400b6e798d02b0146c32598993dd48757b870a639187fe88b234a45cb13205d1b938d3db175c98617c28b97708d59e8c6cf4b6e4aa9e5da
 MISC ChangeLog 10272 SHA256 60efea472c132d5a830405f5f1d41784dd0b36ab2073358c8133ebba1168a874 SHA512 c11c99169bbb5fec92cd92fa43eadfa14848db8c1cb892e3f3a77b0c03a910cbf411f6543e862f0887fcdc3b576e4099c1b7266742289e9f90a9f7f7dd5be9b2 WHIRLPOOL a34f41f2e40ed1708e927f6b0722d0180aae6ee85fba31aae658e0b38aa780001820ab6291060c90fa884570da9e8238e3fa6ea9fb73fd93c78c578deec57bcb
 MISC ChangeLog-2015 2315 SHA256 c8139f2c0a403278bf8538b1be0e262120102eb61651072a746d81e5366e3515 SHA512 02db03ac11b501a401abb75e5f71deda29c3ac6f6a4b71a8f79b2830357c899b741f2aaaa0ec3c0fab44431a8ed4ab3ea82403324b24e106ac465693dd9f4263 WHIRLPOOL f7fa4160cb7572cbf14aa05f6633134bc138775810bfc1075473cbb457aa515e134a44e6228b05ead17feb927f57742eec9ea0e0645970750cdb7272c284553d
 MISC metadata.xml 318 SHA256 43cd48f250622a102d423a68b4f54b62554fa17977f6427efb2c499539d4e2bb SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337 WHIRLPOOL 2ab5f9c798a6585ac012670edb11964a0569b647b8bd218970a95796b1fed970e5c065dd39ce288ea8ce81be2fe0e9b484e9470b82305276b06cd06f55b0f919
diff --git a/kde-frameworks/kservice/kservice-5.39.0.ebuild b/kde-frameworks/kservice/kservice-5.39.0.ebuild
new file mode 100644
index 000000000000..a30964fc8306
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.39.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Advanced plugin and service introspection"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	man? ( $(add_frameworks_dep kdoctools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# bug 596316
+	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 807da824aafc..c9a6ca1e0979 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,7 +1,9 @@
 DIST ktexteditor-5.37.0.tar.xz 2285796 SHA256 7ae65ca215a53dc4e35877069004c748d8a8b504aecbeaa3b916b8c96dd00478 SHA512 02b2ba273845deb11d9be69f4e212618d62319f30c5e5b999473d1392ee8c402d104aad0856a168b845abaf529d6d0a30e090f70e69d133bfa847ae3f6bb6b27 WHIRLPOOL be157a336f0fb49f1db22245a7d2dea008f8638aa5ab3247b65a8e04ae2d56c7de33a6a37d1cf489e124997f5420230404bde1a1587f79371b31e5bcf8b30543
 DIST ktexteditor-5.38.0.tar.xz 2288404 SHA256 31e7b3118a2cb56176d85538ef43f41842add3ef5c881786a7db7122c37ebea4 SHA512 7032eecd9e28ce744bca86c1d2bdd71aa7e44d1797f9177b01e0dcc9080ee5869a6db2cab268b43f6b7e91c944a58c32368616e5b6ca7b671f44d11ed8ca4e60 WHIRLPOOL 071abc1bfb521f8d35bb972d7c9457d9055ba83e28c0ddc9c7c83f9f644ff0b74410ae50bb1c518380813830dc24d7f74a6fd163cf052c5f77abb133845333fc
+DIST ktexteditor-5.39.0.tar.xz 2288920 SHA256 c5d9c67532ab6f3abee8ae2623ff21e6ca5280d5ea9ca5d23bdb55f937e565ae SHA512 a76828be990bd32275f7de2448e337750aa1766eed669aa7a8c199d3d7db002c9d2193d09cac789c73d7cee783b9b85a21f50563e5beff30fac484f414145f6f WHIRLPOOL 691161b943d569eb634c9c4464e4019e6391caa37b9998a4c1bc46f9fd15e0a87dc118e7b2ecf186a789c138fd18b8a4b057cfaa5823520d52a11c6d2f8d7f82
 EBUILD ktexteditor-5.37.0.ebuild 1420 SHA256 1082a12b0fc4b96a5f89a018e84d1e3b2cf948a33d8a266d53b2e5a60fb2e697 SHA512 ef59eaf8fa5ccadc5203cd001cac39524d55dad4c8984af027ab153c93afa07be775223dbe158f82a61804695ee2e5ef740a3b0d50fe62374996bfad367bcede WHIRLPOOL 64b6d7d14e145ed46c5da566ffbe66c20ea4ba3d1c005eafed9ee31bdb644b476028ef2ba1bda2b5ac34b4c68bd2e256d6f47a3029ea79be2e10a395b29b2f0c
 EBUILD ktexteditor-5.38.0.ebuild 1427 SHA256 009c31ce11608b51e9a2e16ecbcee076b28c2bff54b9a2e1580b635701504151 SHA512 083135bc4e4dfaa5b9acc2ea2a854a4400e89fd087191e98bd4379fe613f3d0b24f289bbc9635ca5eaefca0c2ff2ae58ef79fe6d1107fdd58680146fdc624d02 WHIRLPOOL 23dcbc6c26542fafb0e528de0f2fa8c26e6bad039c5e514cd0be72394aa035d2084629a8109ead90a632f86d6aebc1de687a2079585670fdb1abdfe628593bea
+EBUILD ktexteditor-5.39.0.ebuild 1427 SHA256 009c31ce11608b51e9a2e16ecbcee076b28c2bff54b9a2e1580b635701504151 SHA512 083135bc4e4dfaa5b9acc2ea2a854a4400e89fd087191e98bd4379fe613f3d0b24f289bbc9635ca5eaefca0c2ff2ae58ef79fe6d1107fdd58680146fdc624d02 WHIRLPOOL 23dcbc6c26542fafb0e528de0f2fa8c26e6bad039c5e514cd0be72394aa035d2084629a8109ead90a632f86d6aebc1de687a2079585670fdb1abdfe628593bea
 MISC ChangeLog 10114 SHA256 0586b579e155663504df1b27ecf6ce2f2a68975bccba42da9a746907a3b95640 SHA512 efd826e1c2a57e20912681a6af2987501e1317ca6923141392eeeefcc3b63e93b3d655ccd5328b947c91e0a75c44b3aff0ddc52a341edc48d03d8cbb52f09286 WHIRLPOOL 0efd04b8cc659d0ded525f99fcbf8dcb40b5ef2c7c03576a5214f636600179cd9b3136c9d8072992538fba013a9b7e79dbb1cab19dc626621cae32df201abcd7
 MISC ChangeLog-2015 2515 SHA256 b3a2f5199138502c8ecfb5650140b6675321573df702d7e6faf09d82a299dd69 SHA512 6a5f4253fb25609548ebe3562372a8d139974306018cad052a6ac800178f8d565353081fe3c8b42bf33b959f07e0922503685f43e392dc31bf47ae4574d27df1 WHIRLPOOL 9ea0b7ef0baa2d8aba454ba9b2fd1f9e36fa1b875944a67655dbb15d71516be75124cfbea846759eec4cc02e641c74c2f327f607038b544056d370f6f7f32d18
 MISC metadata.xml 351 SHA256 1b70669a4d83c16f227dde57ebd44aa81ab6dce784da250f7d82df11b7bea057 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301 WHIRLPOOL 6879cceb316c57c33e43837b41a547e0d283102c7b05c3290d7f9d4f9d87ec69677b18d5eeac6bba874731dba8af9b2fa8220d93208592ee6b6a0dfdc79f6f9c
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.39.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.39.0.ebuild
new file mode 100644
index 000000000000..ce4cdc432cf4
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.39.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 4cc14d33f382..a23416f9f933 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,7 +1,9 @@
 DIST ktextwidgets-5.37.0.tar.xz 308452 SHA256 257f4feac67db2501fe81909ffe04ddfd29db0191d9aa09ba957d9a5cbd116dd SHA512 f9004dc952705bd9e4f4859b1cbde3a9e64bea28f1578e93eda37c80e13b36c43473eb33e954365ab85b259486d929c406333c8cda59af5c3c8c119e70d0da7e WHIRLPOOL fa0d9abe834bc913e98b476de160a6e80152c6a8defaa8368a53a624d1def71ef317d738d2c7a313fa8c35335a424f267b71c5287f0679e2ad47a959680ea8a3
 DIST ktextwidgets-5.38.0.tar.xz 308460 SHA256 eef0847aa98489437784361a281a16cbd52b3ac8a1a83619c370078e96ea1288 SHA512 809372551c7562bf0c8f613d55368851649f0da75a0e9dee70872be7eb5fc248204c7bd8ca8cfe7ddc40025bfa6738a041d297015575f313e4523fcac911846e WHIRLPOOL b8c647d473081ce22ff1fbfdf2157670b3173a7e687a9ace511a8d515ed3aa5e051e2aa64fa32664a136b32d27f32b2ef65eff8fe6fc1664781e873159db4d10
+DIST ktextwidgets-5.39.0.tar.xz 308544 SHA256 5849d104e99be94d554bff229646df8fde84e3396c82e21a3e390ee08b09d05c SHA512 d5777181f82b73f2acc9ca88c683296419823218885877a2a177b103fcbd178a312210f7849a0938f6123b026111be972d01f9fde3ac0818cfc6d212965f21fd WHIRLPOOL c4e5e7e4e10fd0a53dfeff35dc928c4d230cf6ba532b0e56ef4d8971d3c964297184e94b48fe001b768ffaa65d134ad9756242a5436aee58aa71bc241a2c29eb
 EBUILD ktextwidgets-5.37.0.ebuild 899 SHA256 f8f2c4974fc6eb006068add39f8062665e54d810e9f584b79ec498d603a56f37 SHA512 7ed4f0c66b3b589f6b645f1c0af9aa5cc42d02bad9f3704f5b48c514a0489aaa7ef185759889bb6b693c079bfbe47ebe3483806e1ad23422a346031dba4875e7 WHIRLPOOL 4a3daa11eb98cba186c7baae32c7d2185b5a1ccc396ffc04654a24c47023cc137a44cd7574643e366afdd6eb607a8de89bfdce730a40a974f823aee9f23855f8
 EBUILD ktextwidgets-5.38.0.ebuild 901 SHA256 66a8c00813a8cf7a5cdd41b01ba6167043b74cd1318a680bf9596dbc3b0b9e36 SHA512 02ad3cf9e87fba352c7ed0f94d029d46affaa150052f3d371e27908ccc762fe5380e9e95414f476c0bc6b963ea5af85d19d0fc09286c58617d562108653ff760 WHIRLPOOL aa5dd5865030939eac15a93417fba71db4c884380e80719e22cf7a6cf4ff5c40f199f693157ba33344a60321b87d597f4bd21be6e7d8c5be80406d3888c47a8d
+EBUILD ktextwidgets-5.39.0.ebuild 901 SHA256 66a8c00813a8cf7a5cdd41b01ba6167043b74cd1318a680bf9596dbc3b0b9e36 SHA512 02ad3cf9e87fba352c7ed0f94d029d46affaa150052f3d371e27908ccc762fe5380e9e95414f476c0bc6b963ea5af85d19d0fc09286c58617d562108653ff760 WHIRLPOOL aa5dd5865030939eac15a93417fba71db4c884380e80719e22cf7a6cf4ff5c40f199f693157ba33344a60321b87d597f4bd21be6e7d8c5be80406d3888c47a8d
 MISC ChangeLog 9426 SHA256 4b59837267e9abdeceaf8e22198c1afbffa44acbb404cdd92b036aed5cfcd967 SHA512 db7bf78d127b5cc04c26f13907a27bfb810d1031d09d210e6e6ab247b02d6ccafcd003c571bbaf55e97f8fbb72cb64bbd2c098714a709384c1ac4de72b57945c WHIRLPOOL e15734f1c91032a045cdf5e342cb0d73420e468a78210ce6a7e1e13838177b5eb90314a69a7877a5fc4d6d7895f0fb425039dd39b085394d70177cb19de8c2e3
 MISC ChangeLog-2015 2445 SHA256 524ddb4f664451c0cd9a47b6cb0de970274dda7f2efa94266adc9c673fb4a745 SHA512 c0a0b31998fdf46f780a9d2d8db25456792066cd19e5e77dbabd3690f38648b38947d583b25a5f95e54e01473deb7d961a82a26f71f340fb837262a6b3591e6f WHIRLPOOL 85c98da6926b6cd5522727799a46eb2f9f9991451437165d43068b95c8f2341ef81c15865d60c151e4d5685749802f15d9cfa2cb5fb107ee48c0a67d7b5e3d08
 MISC metadata.xml 323 SHA256 cdfff3f40f413f66e77cc6ce06fd4798dd10f4991918b4716a6a3ca5e1a88f7f SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17 WHIRLPOOL 88c5012a03d46cab74428e1a344fc663f4783f2ac371d654c6784665a3369f44c5e1a6787fc412c73ab80b86d35e36da21b46aacd6fac36f3841b5da93cfdf6a
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.39.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.39.0.ebuild
new file mode 100644
index 000000000000..03ae3da8a20d
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.39.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="speech"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 4316ea708f02..b69147b66f5f 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,7 +1,9 @@
 DIST kunitconversion-5.37.0.tar.xz 771032 SHA256 514b768a1077ad35454859aa8897511dc4aa4ee7b297d86c91caa6bd743078e3 SHA512 50a4c6efca7d8f218756b9b15f2655bc56fa320178d11291bd3bc4be84ba625a6e8dfa9f2e6320c0c6e8b9f80e80b1125b2e0d1d8e0c86b3e0a1fb9521a4ca5e WHIRLPOOL 668dcb91d17d3fd1389b89e12ffd6d89265937417ac3f253abe219e32e090c24b105ec3add261ac3b7086614e22d57afce31f0e4b7c0831388a8b44656a1d269
 DIST kunitconversion-5.38.0.tar.xz 770796 SHA256 6c538b35e727f75e90178b6b5b17d299a3ce797bd82a6adb0af4e41096eb6082 SHA512 421dbf9e84904d14065c8f72ddbd61892ec060627c4eb3e03a98a03ff998ca1f137a133a34a8bde823538d3a7554b0fea8a72dbfe9154d79d6dcc8dcddf413c2 WHIRLPOOL 8b1d58cc7abaf5d1f3bee39ff4d100c23e4e4951e687453d6bfc52a7f9f0ed0f7d1387ef7cd4855e2a4e310dce4cb8dbd0d596d3caf2460d8479a3123b959812
+DIST kunitconversion-5.39.0.tar.xz 771012 SHA256 fb53e8d3c8997fbda4cf2b2a2e6ce71eecd44683903e039d35256ec3ac582113 SHA512 68debfe9b12862fe1e753884c701211bfa390dcf47c19edeaed3ed25003e7f72b232a00bed5e6ebdd389cf5de41395410cd8128eedacfc8515c1adfdacceb508 WHIRLPOOL 0557b81835be36094ee4f94ce3fc1476eb4f65fe1d89d12fad955238a652f49155d2a73fb421ae8b1f39e489a1adbc93dc75af59a77b300b8708de3713efb967
 EBUILD kunitconversion-5.37.0.ebuild 463 SHA256 31d3f1040f045dead7f24501590f3c0af133cef28ca661392e7335250c12802d SHA512 9d638896966588eb5f0b7fd51893cb95a02d16b45c873a64088a4150ff53e0e7c1b8f0b0a6a63521e56bdc6bc8f5485e326622469bf96192a6336d61217e7ab4 WHIRLPOOL 0ecaddd72c0d01668b818f845be5cf31f9aadae76dca4abcbd4d729ed0a185664ce68f9fbbc2a5c95fe65ecc465822b3a2ff6d24fd9f2efd5f0a899bd7b8926c
 EBUILD kunitconversion-5.38.0.ebuild 465 SHA256 426c5b2e3f8f9dd74555fa86bd2dabf0f54491a6e4e651fa6daff1e6ad4094ec SHA512 25c593ded92507fad39cdb7ba9d4ebafc563a95821c8ec1fcfc752fcf994905a4a5ca1d9a4cd9538b2822107ba50fb3658acad799331c370fc30faf2d7591e53 WHIRLPOOL 4d6cd5114c4ab4fb025f2731ca9fb9c49365d9e7733520e231c1a69f92e9d95555d1741ea5622047ba5651db7555281285cd6e2c6acecddf8b0d650455b90474
+EBUILD kunitconversion-5.39.0.ebuild 465 SHA256 426c5b2e3f8f9dd74555fa86bd2dabf0f54491a6e4e651fa6daff1e6ad4094ec SHA512 25c593ded92507fad39cdb7ba9d4ebafc563a95821c8ec1fcfc752fcf994905a4a5ca1d9a4cd9538b2822107ba50fb3658acad799331c370fc30faf2d7591e53 WHIRLPOOL 4d6cd5114c4ab4fb025f2731ca9fb9c49365d9e7733520e231c1a69f92e9d95555d1741ea5622047ba5651db7555281285cd6e2c6acecddf8b0d650455b90474
 MISC ChangeLog 9619 SHA256 a965a2d2b38ce331070a236578cb9f469a45a4e23134b9f31cbd2425d05c3155 SHA512 00c36925964dd82b3f8e28aef6ac660ff2df2be606eb3ee751a8655306fb4a1d745a7980ab3768f4f79f975f442e1aac82d6500cb2225e0c6240f17c3e066a0b WHIRLPOOL 7b2fe75659fce14070b0faceccba562c8c93e27277740af243ffc9f33b2dcbec6e3fcaea6de708a8a9217e3bb23b39cfa6d4c3884a7621484d04a46fea543a1d
 MISC ChangeLog-2015 2538 SHA256 dae47b5ecf6801cfcd99185efea75760251ebb63e1b2a7dcd5f2e9f2c8187d04 SHA512 1cde04b9e84ecc6cb40901b20762472feda3eee89f0cdbfe3946c5d05eca71fe7e06b56f34d3abbfda59f39fb37611b30a8b2343089de5d131723d958b4e1d47 WHIRLPOOL 02998255cb64a1c5fe7288ff619553fdb53ccad91d1b18e8a302a43a973cf765f156241a02382115392cb3da1e4987bc4967f53106a921f3d21ce90d4c9bf91b
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.39.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.39.0.ebuild
new file mode 100644
index 000000000000..d90be7ccf3df
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.39.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# bug 623938 - needs internet connection
+	local myctestargs=(
+		-E "(convertertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 7afa41ee6ee0..1091004a7bde 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,7 +1,9 @@
 DIST kwallet-5.37.0.tar.xz 303728 SHA256 5fc368410da498dcd9eb9d5b7119f37c87f3a6b9859bbb2ce4a2ff0cfca0f2d0 SHA512 2b15caca7459e367f07d2aad98859db08f9e6bd337348ab63abd671dc45a434bf305e18e044b469a981c12661ce4dac2407af8b2dac7c3d0588a7b6f907548af WHIRLPOOL 71b238d749faf13e22a98a6763591fd51d708c92fc5ac329b1c1ec7c550c0efa2b8c0175c6be90c145331f6d1679b1d04c1faa37bad212c5be57e505d1edcf77
 DIST kwallet-5.38.0.tar.xz 303756 SHA256 dc06fe8917cf5ea61251e42e9c7e9e5662eb223aace1bf8ee4becf6a896cdae3 SHA512 e66266015c674a7ba731fc5c37fe2bed1edf18645393793b6dfa552dcc1fb93227db73913503961f46d72c5c71b11c807d61a1bb0980f5ac1d62bab59efa72db WHIRLPOOL ef012950f779d127146f149ce8bc2c9c452583bc29b0add296fe516102ac9bd258dd794a2eacc28e794201ae6b385ff0ac2c522217893db78bc473e94c51526f
+DIST kwallet-5.39.0.tar.xz 303784 SHA256 5f83a5ca245773abfe5b31c536996ca1aee312d512181d133edcd890874f9fee SHA512 b8fef894a492a27691ae37199b9e564094bc3f2e342458ea97bac415148abd4b85018f1ec201e61bd28460909bbb719de30b7786dd1d954018a4f6f1a3ad28bf WHIRLPOOL 5682d326594f31f82dca239de12569787124046751f741bea4449f6938bcd46944f53462c201e0399f48b6cad9741b389c1faa03f5737719f5d205e9163cc47d
 EBUILD kwallet-5.37.0.ebuild 1574 SHA256 2d056007035321550769ac491c238947ddbb1037efe5209485a0479ee063e31a SHA512 21bee1a8001f9df996b093a3a05a8cfe91ed98dc4a97619cc250855ae38675af4c76e6e1e35ee84134eeebd4801d3f605cfc48384a0c9f03021971248b1e4256 WHIRLPOOL 52c34f4c4bf0afa692a3f247d55167ade9ac65eca585135945f3de0369be204ad5c39e75b5da0b99b031ac27a53f5b3d1c89bafe4043454d39d2e53c0bc69c38
 EBUILD kwallet-5.38.0.ebuild 1576 SHA256 1bee63f1751600f3ee80796d025c87d76494a1cf23986933de30287700a2e343 SHA512 576d9bfc9265758d870f15a37d556dff6c53d63c9be0d05ff9d3e849b3574a408f4d79679783d1c96d484f976926bba6c6691be465e51ec29c91ccc1c47ae08d WHIRLPOOL 81de12fd75e7b66a5b303fcb6889101b05b12fd1006fa4faa31ec9b2ce36be002e91050ca788742e0d4b3f782aad932e0ec40538dc94e6becbb3f02c04c236da
+EBUILD kwallet-5.39.0.ebuild 1576 SHA256 1bee63f1751600f3ee80796d025c87d76494a1cf23986933de30287700a2e343 SHA512 576d9bfc9265758d870f15a37d556dff6c53d63c9be0d05ff9d3e849b3574a408f4d79679783d1c96d484f976926bba6c6691be465e51ec29c91ccc1c47ae08d WHIRLPOOL 81de12fd75e7b66a5b303fcb6889101b05b12fd1006fa4faa31ec9b2ce36be002e91050ca788742e0d4b3f782aad932e0ec40538dc94e6becbb3f02c04c236da
 MISC ChangeLog 10336 SHA256 80af4482d730c65af812efa629f071977cc6ae23170f4dcc0d6b4d38938714ef SHA512 59cc545c5cb16e72e3185192fbb31b978f4e310e13a3e9461d6a0d9eff7fc336360dbfb7bc66f96971899c7a9062073ac4e0263ef4e0ac5d9ee6c3092350a85c WHIRLPOOL b43c460e8de7b9f3112255b58ac0dd88f5b664e0da85d088cc75e9ee94a6967c11f78499ecd731b61837ede1c5a780d4882580fec080843ae91bde3535fe6ce3
 MISC ChangeLog-2015 2284 SHA256 c38f91f394d894c5fce2eb6d1a77b7877667fc9d191199a9bea68c3df44ad6a5 SHA512 cbbc8cf6fcc03a3f2afb22630d14ea0e941b32ed566bacfbc30e54a48456063165fffebadcd40676ffabb1e4981071b89e25636079d309499bf98c535c7b611a WHIRLPOOL 36598e5f2bdb9bfc057853e9dddfecb213597db788be3c8db845ed24cb301990546291fd40b08f8f773eac5677f9631cbcc130f833b9a847717a606fdebcc549
 MISC metadata.xml 433 SHA256 3fda9c22340b89f87db33370ed25d9ae55b719256356e5737acbed13d8596051 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4 WHIRLPOOL 685d10760671f349a59400c5c38925cffb9c787ae1e657921d7de68a612bfc8ac77c0574d6b99e257f7feb9fbb56073c6d9f3e36512f2276f4313941748c948b
diff --git a/kde-frameworks/kwallet/kwallet-5.39.0.ebuild b/kde-frameworks/kwallet/kwallet-5.39.0.ebuild
new file mode 100644
index 000000000000..8037d189d022
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.39.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpg +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libgcrypt:0=
+	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gpg Gpgmepp)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
+		elog
+		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
+		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
+		elog
+	fi
+	if has_version "kde-apps/kwalletd"; then
+		elog "Starting with 5.34.0-r1, ${PN} is able to serve applications"
+		elog "that still require old kwalletd4. After migration has finished,"
+		elog "kde-apps/kwalletd can be removed."
+	fi
+	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 51a0e8663e41..c473b0f82308 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,6 +1,8 @@
 DIST kwayland-5.37.0.tar.xz 262412 SHA256 d9479985f50533b0578097dfc793e7617051b086c1d13fc791efa23111458c34 SHA512 764ae59472b29a7a8066bb8bae87580a5d68b2aa8f29f284999d2e77e7b32f0c2d80d318fcb820a577138785d8b302c1c6d86b36b5b34a37a13ab80c628f6fa8 WHIRLPOOL d9a62c78e676a500feb95fe0e58802df93242b0911dbb284d399d4740afa82ae9309d7e04c7a272d2ab65c7e9fad723640fc30ded41e2277c7cdee88b3ec4301
 DIST kwayland-5.38.0.tar.xz 262828 SHA256 404aaf11e144a42b2422a5a47aaf04fb629c4a468689bd8f543c0de6b745a53d SHA512 655afa2d0fd6cb36ab182247663bf0207b38c0d94fbca83ccb0add72b5fe79c2647a0f72c069eb38ed50540e31ad53e87fab6e2c9f694fcb671461429d834597 WHIRLPOOL 341f4d4090aec55848fc26e34f0852b1582b4088ccae3b348df5b40e27a0176741d8df2c6c2795074b77c6d6258f8f7f806d1e3adcf343f562a2f869b233d79d
+DIST kwayland-5.39.0.tar.xz 277428 SHA256 dd74c8edef9f28dd8f2df9e52a7f32f844d16c342e3184a69a57eb6c0f893029 SHA512 ca71d9a07d38f813f34e05c034acc626d1e5c878d05eb5174764dd695ac18b99d29a3ec8df49f0fd9807dcfb1ce85b8e884c7389eb86cc0e7310ca2b8ec4f4b4 WHIRLPOOL 32ed9cb06c6f414f5024e6eca0a5c80ff33bbe8ffda553ca2c9ac2c17770a4de3d79f90b0f6ba0c2cf5837987c1f42d1c530528a6641c470c40c718194ad3289
 EBUILD kwayland-5.37.0.ebuild 599 SHA256 36b1402f6a90a00e51eac42aa74052aa45ade4c38f1089e2c8b141675e1fcb7b SHA512 21964d0ce2d5530f48dcc00548e51e7eacd50de452832a9484542d8a4835057d8c9c2c1dd1c96d82700a5252a759e80837bc47b44221c44e8255702179d0a94a WHIRLPOOL 21a75fd3138de3be61d312d0d1751c2ae63d9ab7917ae37a4a06726fe2897162a5af72dd1be738a3a47c0b1bc41f416102b87063dccedc88c34454d9f69f6ccc
 EBUILD kwayland-5.38.0.ebuild 601 SHA256 6680610eabc5ff7c7a73a499e43abd0f091ae1b476de191b524dda1070a249e6 SHA512 62f1dbe90d2fe998e1b0f5b47ec18fd822cb769ba2ccd98a6200250b801765027fa80282a1cdaa1f94eb7a2beeb8f65689e5103aa7ccb71a717f56fe10ea8741 WHIRLPOOL 50cbf55d764f31c96b245ee8ae7d637b9fa9fe6285c11544a506f121d19f7979c514b0cc99400cc2c0895609091de5342d93a35c15bbfb0e1bf2e4d6efef2f52
+EBUILD kwayland-5.39.0.ebuild 601 SHA256 6680610eabc5ff7c7a73a499e43abd0f091ae1b476de191b524dda1070a249e6 SHA512 62f1dbe90d2fe998e1b0f5b47ec18fd822cb769ba2ccd98a6200250b801765027fa80282a1cdaa1f94eb7a2beeb8f65689e5103aa7ccb71a717f56fe10ea8741 WHIRLPOOL 50cbf55d764f31c96b245ee8ae7d637b9fa9fe6285c11544a506f121d19f7979c514b0cc99400cc2c0895609091de5342d93a35c15bbfb0e1bf2e4d6efef2f52
 MISC ChangeLog 3636 SHA256 437081234ff02066a4602f534d0d7b1e3394c9d7720328eabd47f40c6756a51c SHA512 39c7fb71b44165fe9aef2be48c332cdd6ddc1461c1b7669e7ca79eed1a46f698cf50e809b07832b4246f72f198a589187a84c8b44f2f5638c4b0911cb252bbda WHIRLPOOL 9823ccfcceb035d0bdeec41b104a3c843a8f6f5ec217e9cda6bd26563045e62fdd8b7b329324f40e27e576054f2060e4c4345d8cf6cfb782b184efe4687a2f3f
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kwayland/kwayland-5.39.0.ebuild b/kde-frameworks/kwayland/kwayland-5.39.0.ebuild
new file mode 100644
index 000000000000..dc450f62d401
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.39.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+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 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui 'egl')
+	>=dev-libs/wayland-1.7.0
+	media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtwayland 'egl(+)')
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index f87846da2afb..b2141726dee1 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,7 +1,9 @@
 DIST kwidgetsaddons-5.37.0.tar.xz 2175360 SHA256 a4c54b371a6fc748108f3e2ce2f40d422e8ef03210b243a3d091c090cf19b3ca SHA512 69faac2b489a74f2bb4fea4a5c5961bd7fe6badea6777960589ba45d1eb3457ddcd3875d8a56c0f5d15dd88411ca2e730b54e38e3ec77687a01615e45d62acc0 WHIRLPOOL d40ebf6c56009aeedeac040c295ddf6edb3dfb187e89f4e805d1734e3ed63e2e019759578a115348c463b69fd48cba5c0675eeae0fc2cc93ba932e063dd49a31
 DIST kwidgetsaddons-5.38.0.tar.xz 2175700 SHA256 45ee4f81cd91e61e82306f757a06849644fde73e09650e0498797cdc3a4604fa SHA512 b1f7845662ef8248aaa4824e84eb622886379ab73dccaefa8a007cba22f0e64e215ae6e9061304bf902f90462a709c358e163fea2a6390e9994640c6485457ef WHIRLPOOL db9df5fb95f25d720b1a941f60444d220c36c0faa690d754bffe49485f3de82a784825f83a3c69beb653c767ce1461d2c6b26659e93e3cdcf9e22eb3308ddb44
+DIST kwidgetsaddons-5.39.0.tar.xz 2177988 SHA256 abb9556d3716beff74460bfea9a33e6470386cb1a68601263b7997a09f1a0db4 SHA512 020f5e0e352743e1adb8f09ca419c886819a855c983db8cd114c949f869deb56dbc9cc93d3605d14c6f18503c983dda00f8e79d2225e45bbeab0228bf2de8186 WHIRLPOOL c7bc0f90afbff9f18a014058da0cf93a724463721997719f77ae142aaa4221ce1ae209613e08b23a3b30a034908dd94c252209e57b46fbc365c6deb50933be95
 EBUILD kwidgetsaddons-5.37.0.ebuild 405 SHA256 f1969d853d13b4bdf614399f7a762308fca71e6d9c872b62d7ec7db84cc67ee0 SHA512 146334cc51cdfce91d148bbdeec8c331c390fa21919436eaf738400cd60f45478a4f0d5f2bb923eece4d48cfff0d4f1c3cc4c5716832c3b654abf68a35b277dc WHIRLPOOL 84f82ad01bbbaa4160f398f43cf79ed5558f6ee90be8e2372fc8ad4326ac3a176d3091ca7efd2bbe26482e2e3010b8574074f3ebf4f3c8ef85340443a473b070
 EBUILD kwidgetsaddons-5.38.0.ebuild 407 SHA256 5e08b23d522169e406f4e020433c91b4b6ea7118baa4999cb0cab0900c5d2141 SHA512 802c180271fb091420a48d5db94cd4edd3b734b5fedcc6ced792e638d6dea4433d536d50781ec5defa56a78db920a8d728e3202a0228103fd90f28f0c6d515e2 WHIRLPOOL 292aeadf2fe5167dce74a0a9823bc4bab1f49f51bcd728fa8a47495a936f8d62f5c1b648e9bb51490b05d02d8d0bb2b331c15ed811c6cf7f7162267f8250aba4
+EBUILD kwidgetsaddons-5.39.0.ebuild 407 SHA256 5e08b23d522169e406f4e020433c91b4b6ea7118baa4999cb0cab0900c5d2141 SHA512 802c180271fb091420a48d5db94cd4edd3b734b5fedcc6ced792e638d6dea4433d536d50781ec5defa56a78db920a8d728e3202a0228103fd90f28f0c6d515e2 WHIRLPOOL 292aeadf2fe5167dce74a0a9823bc4bab1f49f51bcd728fa8a47495a936f8d62f5c1b648e9bb51490b05d02d8d0bb2b331c15ed811c6cf7f7162267f8250aba4
 MISC ChangeLog 9534 SHA256 caf33c7fcaad15ea2f27a70041cd854668633a00c1087dad9f89cda52e92c2d4 SHA512 b19ed4bc10da54e470c0bf68aaafca917e2cfc4540604ad6bee40d4dbc7e677f33c164ca703b9d4962afd45ba36886e382c0943211a2225004917962116967c3 WHIRLPOOL 4b595d745889e31e20b6e133d09c3f2a0de2318e66ed66f474449e08f71c5cf1b4dc671c61d980124278a656856598dd790bb20451c0ca35949753fdba45961c
 MISC ChangeLog-2015 2642 SHA256 834e8e6759c82615ebbfe56e9a612c8a74209bda894f1fe347176e2ba6a96dfe SHA512 f8fc4909f5da27599b37caf7124651751d869715ecb3f4a6179c149da34c1f1ab584ce90c291c8c323ccb146de789744e4fb05ab955917922b7ba517d52a6043 WHIRLPOOL aa5fab8b8f0dcbfe59baa7a2323ee40783dd03fefbaff9ef01d4eee5eb4bb1897df6aa1c15f3cc7e1181f92dbe11aed7313efa470851cb656e42b40b88aa77a8
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.39.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.39.0.ebuild
new file mode 100644
index 000000000000..9b683c48b86e
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.39.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index c6ef1b263403..2455d3eefaf3 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,7 +1,9 @@
 DIST kwindowsystem-5.37.0.tar.xz 167936 SHA256 628a1e6512e89ef1eec2b0c50ea879e340656bbc8c57e2f8e961b75b24b0a25d SHA512 136b772820e8f8b7cd4e0e5e04b4f61495fe6adb56fc5e025efd60dc0293c88632ece19fcdcda4cffcb8c04e3515aca5fbcc80309e6f01d727e56a45c81dc744 WHIRLPOOL ec948aa715c1e864387aa1fc4312fb07b471e944703be17139203e543a1f95434c54e98720ef1cf394486da9e82dbe901e9d0bcf669634a2004ef5ce7fc7a674
 DIST kwindowsystem-5.38.0.tar.xz 168852 SHA256 2c16eb635714ff122b9348c0cc880be60d08c817c98026029f78434d918db90b SHA512 9d04b618491cb6675016038168d01a43b1023a65439132b5290080f30997034823c5af536e7f86ccc0be1bbc1e7a73c309bfa3a8eb6f1a4ef7c2ce392c8d5624 WHIRLPOOL fd3236b102440a30a4ca78db30297f8d488ba77574f4bb39d1c6cff3886e4f47014e0567f5718abc1e694a09f3e32b131b0792f0df318c5391b473699da80b31
+DIST kwindowsystem-5.39.0.tar.xz 168924 SHA256 17771aa0acf93b32329633aac9b07e72448edee2a2ecfe7a8f0040a23638dab7 SHA512 723157c663ed4d9025fe0966c66031f5b2083ddc0cdc5cdbdcc6a4cb3b100ebc72d03356d118683bda666f1cd162004d3782604a29ac0f7a4a7f6ce2b0b74994 WHIRLPOOL c38058b17b748505cbe8303038d6c46a52702f399ca835a75bb1d467148cff89bef4c289d90932832c64054f0f1cbc803037730783939014742093f2cf02aa17
 EBUILD kwindowsystem-5.37.0.ebuild 756 SHA256 ac49b6dc66752b537cf2e53154626a412d64c69fed4b10af42619273852691b0 SHA512 37f6b666fd723252aca41f90edf4399b4172b3781ce18bdb1950f8202310fe3f6776af09032552819c6710c9116e984de8bcac26f869ea919c4a106a74bd675f WHIRLPOOL f1164408c144713d1c56a3095e27b5b8540a02f988dfa7704e7ee1cb18d61af3d952273056e9cd73581c03db8396ce85198a56dfdb17996e6704519647d80ab4
 EBUILD kwindowsystem-5.38.0.ebuild 758 SHA256 1717093bf16e470a31f6da2478465f39483a3b3ed72fa6db5b30ad4d4bfa2b10 SHA512 ca0c4b96b89f18802ba0978e53b2ec462cf257ccfcc7bc90c5b64bc9eb81f471ef3a09cd7213f3c6a984ef889d93069859adc1ce5853870495258fb2307b2782 WHIRLPOOL 99c00fa054621c28e3c2dbb0dccf35404ca912092dbc2cbdab65cb802fdafbd035174dfaa57fb53e5a0ba6865587c4a86844ea66b5bd287a27cf8fca1fb51213
+EBUILD kwindowsystem-5.39.0.ebuild 758 SHA256 1717093bf16e470a31f6da2478465f39483a3b3ed72fa6db5b30ad4d4bfa2b10 SHA512 ca0c4b96b89f18802ba0978e53b2ec462cf257ccfcc7bc90c5b64bc9eb81f471ef3a09cd7213f3c6a984ef889d93069859adc1ce5853870495258fb2307b2782 WHIRLPOOL 99c00fa054621c28e3c2dbb0dccf35404ca912092dbc2cbdab65cb802fdafbd035174dfaa57fb53e5a0ba6865587c4a86844ea66b5bd287a27cf8fca1fb51213
 MISC ChangeLog 9319 SHA256 93440915c240b15a8721108f9865fb7f222bb182e5ba7da5d5427e2f9dec830e SHA512 038612b232c3b00493372f83f778adaad1172f2c981a37a6a4aa2274ab4504cece713b291f62537ea5f68b69fdda0acd43dae64bf960ce2a076abdc789c76ba5 WHIRLPOOL cea15ae4c92d1df75df1aeaf5a4561e4d69a2d2f2a8a4f0eb88d171ac22ff4501cdd2908d61c95da927687a89902f2c75f93bede137af541a6d6ca019f0c1bac
 MISC ChangeLog-2015 2815 SHA256 8d25a2be58ef0cfb46c1d708f7a85ffb7648fcb54d4601cfecb1caa456578354 SHA512 b7f52a2fe3a3addc9cefeca61efc56900747008e8d3eba4c2e8309eed665c4f5fd5ddc6c9334d5029bcb5bb965e9576d3ad8a4cc6c3e87fc747e7d467ca404ca WHIRLPOOL 025ca1e2273b43acb362f0a07532c2357c20903802db6c069dc11d81416b61a5077ebf440cad8d8cd96cd2998273bbe29021258f429795b74a77235920da3007
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.39.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.39.0.ebuild
new file mode 100644
index 000000000000..e487d4f75b73
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.39.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT+=" test"
+
+DOCS=( "docs/README.kstartupinfo" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 4fb9cee9383a..efdd8b8341bb 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,7 +1,9 @@
 DIST kxmlgui-5.37.0.tar.xz 883920 SHA256 e235367a31a38c1c114032123b13e7954a93a8e1423eb1829176a6373b953b4b SHA512 71eff51eb697674e7e9554a8912fda0fe2068cd6beea05ab5bd6f44b2b5ff87f07b8443daad6732cb8d268128cb3fdb8614939ae469d1d7cec7948d62c414f53 WHIRLPOOL c021a13f9f0abf965bac41e4425414932718da65dd0535990abf7bd8241577a4351d6e41128b85dd56a048f232c2be365ffdaa7d38faa0eb9b9ee4e92002a6bc
 DIST kxmlgui-5.38.0.tar.xz 884112 SHA256 64f73ada0b1e08c97db00cfe2967b0d8354b338cd85e76644f79da022af49589 SHA512 b49a217df51d7b9c56e2d034b2329c0506cc9487474ba05070a8988753a647adb6fc692a14239d0e2e3e0c4160bd66406ec1198bb78aee6ba4bdf72910eaf6c2 WHIRLPOOL cdb22bc659e6cf60fb7055877f029c3d0b0fe059b1f7df8224aae8e97850b014fd548403f3aef8b170fe90d8977f1548b7c3f3f80b9ee699cf2dfa45ebe6bc83
+DIST kxmlgui-5.39.0.tar.xz 882768 SHA256 2584cf5b39414b4bf76817d5f09dcdf5cd2e1554ac424386a0f0fa0173089e7f SHA512 6ddb408b452a6687e71fdc8770999361d8c764750779f7afaf222b92ff6faa41a2727fcee4769dc38d9a5433373d8d5ae7126179650e186001658f782ceb64c6 WHIRLPOOL 231ef0bfd55bbf68c6459b377972feed2109888e40a881bb3fd3d435c4ae5f1d7fea8f8a924cc5172a446451bbbe044a5be29b3cb5d7b5653f7a92884992c9c6
 EBUILD kxmlgui-5.37.0.ebuild 992 SHA256 ce02709ae923e85ea16d084bf533ef53c38090f58e8fb0523fbabf1f95ca1e20 SHA512 7c80deda380933c538d4c78c401c07f2cf909caa5a894d1df6239ded9ea6e0810b3bd6b418e05ff3e5e0e93460d915ec4ef113a627dcbc61772cef55249317eb WHIRLPOOL 2828046ec91b215aba89a93f7fed5b7a9dc2128fab215199097b2426053c64c1c5152fa70a7d80c51749971e746923e912768c6fc2f8d36b18802417e4e18482
 EBUILD kxmlgui-5.38.0.ebuild 994 SHA256 d73b018bc5ed4d1378a4a7c14d3580c7ea8c5901bb0cf7ca8380357ebcc1f67e SHA512 39301a13e0089012e1e8e90630a540bc74a539120db5288fd43a81ccbafa922de576c83e1c33142c04deafeb5a2824eb42f193ee83631509368d96f2de74b488 WHIRLPOOL f59ee943f6b8e82f93c05816317589b984d6cf0c2379a1ab429c8aaf685b33b0b0b6e16b4dcccf6c1257f3ab648b2bbe46ef5737577b12835eea55688bfc483c
+EBUILD kxmlgui-5.39.0.ebuild 994 SHA256 d73b018bc5ed4d1378a4a7c14d3580c7ea8c5901bb0cf7ca8380357ebcc1f67e SHA512 39301a13e0089012e1e8e90630a540bc74a539120db5288fd43a81ccbafa922de576c83e1c33142c04deafeb5a2824eb42f193ee83631509368d96f2de74b488 WHIRLPOOL f59ee943f6b8e82f93c05816317589b984d6cf0c2379a1ab429c8aaf685b33b0b0b6e16b4dcccf6c1257f3ab648b2bbe46ef5737577b12835eea55688bfc483c
 MISC ChangeLog 9454 SHA256 358d93ceb9fc43497553b18f6f1daa2993e4b80ba85b785e59e550f48a96c874 SHA512 1ef56380a2d516c940376a694fece3b10ec01498239e9ad71ac486da415238e291c20d109963137062c93ff561252580de84e3e4f71525de9a27c5dac4505772 WHIRLPOOL 4f8897034efaa5f481e1db44da7eba47f82e2bd5921a74ec70a20d51447b3967d73f032416d73abb3f17d362c52b8eecdc8e380f27c0d966e8aa37aae18e8483
 MISC ChangeLog-2015 2437 SHA256 7d85e8f9c6def44e8765bfa2e2c1fb7fc36b042e8099976fa4b7609d1af4a14e SHA512 dc50678998ea2dd6bae932fad07f6aab40a587200736e2e0d081143fc5eb6869b08677f448cee15571c20674ef323d230d202a62d863e2cc9e9c6bb802d32b25 WHIRLPOOL 1a7de4e3b33f6980eabf6cf6c809b09946617c7b58ee86cce0642abf9592a1e5c19c8050f05b2ffda20eecbc7ae23cb18a9f9f54d6396dea4525090c35694814
 MISC metadata.xml 345 SHA256 5b15eef4baaa4b6557c2a3033aff1db9ba91f3db4ef3df3fba970bcf62d00d2e SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4 WHIRLPOOL 68fad898e8a9a37b122b2807b039066db87b1a2686dcd8c1c1b599e729f314eb8331e11381714a437d9226517cb4990cecb0d2c6497d3e31e916574db9c859c9
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.39.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.39.0.ebuild
new file mode 100644
index 000000000000..5e1cc3ab58bc
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.39.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 30c8d43229f9..8e54086ad502 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,7 +1,9 @@
 DIST kxmlrpcclient-5.37.0.tar.xz 29076 SHA256 78bfc409af7d71f0387973cabe8b520627f5eca5e66ad6181ea4bbdb0cdac9ca SHA512 5bf9569a1bad444898c8616171ef2b0c72cebbd43ec758ff8f705b0b16cafbd0993c76f79baa772c57338139ddc89193b250d9f83a4914a69507bbbfae800bd5 WHIRLPOOL 4f6e6da6ed6852e05d547ce9b2e7c45b303a1e68613f60dc313473b4660b27b09d64660bc423e8f9dc41c09ccf1db9a99ba75a8a36d94cf03cb0fb3faf47bdab
 DIST kxmlrpcclient-5.38.0.tar.xz 29276 SHA256 4a79382406f247bd9ace01859cb92948e74e48c7abb94b9e47066f0453812a3d SHA512 c8ee2bbe1547ee153197742b1069ca1113c591bd9d9560618e7083fba8af60d1877e8c822923158dc14789ed95a903486e5d5b291862948acc796b29a4764b49 WHIRLPOOL 2c086dc194492c29a8e31cbd9f509d9bd7f0a222e8d276a0669f1e4d6ad29e1121e801dcbf574c83156f9254383bedcada1a742b7906a488235bee96d0208651
+DIST kxmlrpcclient-5.39.0.tar.xz 29308 SHA256 faa3e3af7b85c3bf679fc991d5ff2ef3c4f068a7e516885215c6d2e6870d8ac8 SHA512 d0ee59a250b1c3599c90689ea43169a2c032d104e50519ccfedbf19e8ba323dc1b3d293dbebbe25ed8c9ec3d2b51b72dbfcb359d9e2ca7de0b23368d749a37cc WHIRLPOOL 9b09811cdfb6d928b90fa24c5abf9e9d513644bf9b303ff844ecf405c911ceeb35bc4c6c554a03a431cbc031d9f11fd289c1fcf028ebc5544e03a890606d26c9
 EBUILD kxmlrpcclient-5.37.0.ebuild 426 SHA256 c1267bdc465794bb8a2f964d64b3eed1716e6e1d2c9890925b2982f09c04a63e SHA512 f43eb7a40d230af7c71eef9ddc7c32f11ee234f63561c47e5939875526b8c93774e2702463e88a3966d713123a95886341c4674252d7b2a5c007a0efd7c6ef97 WHIRLPOOL 2b78cd9cecee197bbd297be5232fefee54b7c592808130265ef1c959a4df5857e8b369412d5f086abcc0508cb91f047181baadbf7f79ab5639ed61f7246cb8e6
 EBUILD kxmlrpcclient-5.38.0.ebuild 428 SHA256 cd234c86895c45eac522772cfa328c70fefe7f62482670b0e20d7d6a9bc47df1 SHA512 7170490395f1443bd307bbb007d37c582e8c3fc1173a897c355cef874979e8947faf8979bcd6e126400d3127bd783af767097a4c1c52ac11e65c66dd41f57a02 WHIRLPOOL 69f4fec438dcc6d94fd5c054cdcdbe77c99a63b37e6c4823fba7e10d34439984b11d44f0faa6a5d3b56e29a1fd28eac37ff09c17bb2d3a273b2922fa3141644d
+EBUILD kxmlrpcclient-5.39.0.ebuild 428 SHA256 cd234c86895c45eac522772cfa328c70fefe7f62482670b0e20d7d6a9bc47df1 SHA512 7170490395f1443bd307bbb007d37c582e8c3fc1173a897c355cef874979e8947faf8979bcd6e126400d3127bd783af767097a4c1c52ac11e65c66dd41f57a02 WHIRLPOOL 69f4fec438dcc6d94fd5c054cdcdbe77c99a63b37e6c4823fba7e10d34439984b11d44f0faa6a5d3b56e29a1fd28eac37ff09c17bb2d3a273b2922fa3141644d
 MISC ChangeLog 9685 SHA256 c0d53a3b4b3f9c208b2de8698d8b3844b7840004c3e5fcf46e83f6d58b173ed4 SHA512 68763f697a1b769ec3cd8c986d5b0ee9f7b44fda1d321e1e63907675826ec31a145d088c05db20b54e42516313950a3ac32334c27cb5afe956ca26e41be1d79a WHIRLPOOL 8207eaf02783771deb96b1abb45cc287a28fdc3a6741fee3ddac3642651189d16311190bb4cc40f8350fef2f4933e47e9d79f26774ea687f71943185fa555d22
 MISC ChangeLog-2015 1665 SHA256 96650f9b1b69f3804d941809495251bc9a608a822012c67be6566189c1ef83e6 SHA512 93879def9af995d9ba65c778b682bf3752456ce374e8bcd009a5207aebd6d8c60accc9e6e32b02c1de2c7f75474624fe99d205ba88d6e4aa5cb362f6f3cbd666 WHIRLPOOL d0249c620884d6993642de4ef6a0317b8f7223f352c3e5941eccc33d517f56d342ca82c4d06f466eb17b78198f05d9bd2d81cea8282bc9b821b1bd97cbf93018
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.39.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.39.0.ebuild
new file mode 100644
index 000000000000..87998183ce16
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.39.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index fac51250e2aa..ac1d3fee12ec 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,7 +1,9 @@
 DIST modemmanager-qt-5.37.0.tar.xz 98328 SHA256 5805fc31f99120a304e45ed0aaca789bf901b581abbb451bab6107b9e7200ebb SHA512 110d186478cd656f00abcd71b48b4e09aad6f2c31bdcd5ea24dd96c1e8c39f68d0591025dabfe5b834a49fedfe7d349c47cea09e7314a6c8468caa8df1811227 WHIRLPOOL 6555499c0ace9d9e870f0510aa4e92699dadc03f0570d947835b02808a03a43369c05f81ed00b3ef0a0f800a67b8b95fed4abae51e50dbeeca9d3a748fd72c84
 DIST modemmanager-qt-5.38.0.tar.xz 98344 SHA256 3c214a46b257fd8798ccbf38f9b099c5172dcf108958320ce39eae9e29aa0aa2 SHA512 5717f8da780c1ea5aca8afd2ed7ed91a2e4564edc414e05ac2446071692fe255e8676486de24ac9f5b37ed7dd098c42868cd236a08eeb127d3479a75e610472c WHIRLPOOL 2fe1dfffe2f0afe1ebb2dfa355f86b6343e51c3879d80b7c8831f514a6a00ab4af8cec93cae86b0f3a1386511f9625059e2da74da3242998e920e371e6a442fd
+DIST modemmanager-qt-5.39.0.tar.xz 98308 SHA256 67fe53c0069dfafacfdbee167db762c49f9dcb97c75b29f0724cfa1340b8ba3d SHA512 5c83e80a128a98a92c2b10fd12dc63ef3186a994f814e7872b12a9ae5e2f443adf5e66f924cf27a233372530965db2515ecd4bc38e940a5f1bb1faf5577c462f WHIRLPOOL 4e9d6fef749efd9d6fb6a057b9301407427c36e5dff7b69312a64f86999d03f1a054609c523baa65da32af835e56d93b9cd55723e1fcc97bd6c532f7bb8a9474
 EBUILD modemmanager-qt-5.37.0.ebuild 393 SHA256 fe5e90b4eb2c61f46ae23740c16a644aeabef91bac37681ad74f2880021049e5 SHA512 a523fcecfc853a6c6df45b2451dfd08debc9f9dda21ca1c36ed07c37eefdeb8cf9ae865a32080984156dc24922fd36b161b014c0864a7491b1a2452b6fe7291d WHIRLPOOL 655baba2400b7afafd748d230514dfb0af66d3858fa6ff1ab30ea4c4c4c3d86494e5aa8707d8e1deaaf032a28b4db03422dd1193a3f6dded01c8e70a1d8a7a21
 EBUILD modemmanager-qt-5.38.0.ebuild 395 SHA256 8396408e0beeb27b00f3f4f4b748cbc5542505367fca759b9ae9aea685d374ab SHA512 d117750df940932dbdb7684a3736f0647d7d9256e32f93c640690a073eff929ad10d5468a3dcbe3538d52b96b301f522ec30b5bc8f3d4d2ae6f7bc73e7b7831f WHIRLPOOL 019907b927c7fc6c73a9a093940b2b0deaafd45be7e4d7cbbadef92efd6bc557e9b0fbad3f4d718b236fb43be30390901abcdc219aefe56775a6925c9c19e836
+EBUILD modemmanager-qt-5.39.0.ebuild 395 SHA256 8396408e0beeb27b00f3f4f4b748cbc5542505367fca759b9ae9aea685d374ab SHA512 d117750df940932dbdb7684a3736f0647d7d9256e32f93c640690a073eff929ad10d5468a3dcbe3538d52b96b301f522ec30b5bc8f3d4d2ae6f7bc73e7b7831f WHIRLPOOL 019907b927c7fc6c73a9a093940b2b0deaafd45be7e4d7cbbadef92efd6bc557e9b0fbad3f4d718b236fb43be30390901abcdc219aefe56775a6925c9c19e836
 MISC ChangeLog 9619 SHA256 3bfd195689c91d5010f8dee8f0ff2f312daf71434b8cd37753b21fb4dfe9cc30 SHA512 5375631340928b30f4187aec99a87dad84b5905ca511592d73b9a2ef1389f001e6eedf6c8afd7eb91fca8b19dd15a224606d12242a38086bf2c4da3d43583d07 WHIRLPOOL 11a831e76f89d1b53f827ebcd1ac81b4699d686e3db37ed72f18fbc4685d49f141f4186dc73a8a204b10f0c6f406f819e67bdae54d90fb35ebc03ec88552b38a
 MISC ChangeLog-2015 1263 SHA256 14dabf4526c1b99f2020da8ed65b43c7f2332349ba6fc5abed38fe4007c9e2a2 SHA512 67d51ff49a35628d7c603d5c059e25e5912542600a1bcf662471a9e8a3bc6554b0d909566edc9e3e7bcb2a88dcd2b20f0af1d8a6c25854d76aaffd01cb5e6daf WHIRLPOOL e73ba93430f6eb5616031b63b78ead0e831113cc42f339a27b7c55705052a8145d9a764cf068e8ae44c00dc0499bcbd0db3f1d93c1cdb869af582c6c08046399
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.39.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.39.0.ebuild
new file mode 100644
index 000000000000..0795a82a5e2d
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.39.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+	net-misc/modemmanager
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# requires running environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 13e513ca7a5f..7d827846f753 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,7 +1,9 @@
 DIST networkmanager-qt-5.37.0.tar.xz 163316 SHA256 a1c994326d65659125470f2211537ff9ba34633b33dc369ef37efb77924dfd06 SHA512 6a6cd1382cb6483928bb9eac7590c2984751f47fe0f71d7c05723509dc1bb4bda4bf6854f3b662c9ddcaa7d6c1f6d7001e459a0bd335a24f2c14d00d3878bc75 WHIRLPOOL 52f22b5f5e9fc3e11419f4a0df191f18f87d1a8579a5417ba871b5aba55735524da2b6610014e0f6ad776b69e22c9c373e2c84d0742b485bd7f32d447c67a8c8
 DIST networkmanager-qt-5.38.0.tar.xz 163288 SHA256 c8adcd1bb9f50c4a1455bfc99684632a1812779e50607e1375b5de3bb345a281 SHA512 3ae13d6beea266684195267be7992b6743158828f112b4ddf37605f8e01a12d0dee493bb3da6119d7da3d603fba897403031842b44116b447fc7f0577a3274b0 WHIRLPOOL 7f85a98e54120e339fe52752d02589215dc541b8ae4023ba40179e359cbdaa46c75ac27be9aae2aa6aee5ad0d76636aedddd3d08997d047548bfdcdc83f103fb
+DIST networkmanager-qt-5.39.0.tar.xz 163308 SHA256 01651f491a5540a4f22f7b10ae24cbccd037787722d5e0448b79d6a63fd87aca SHA512 84236fa7d5b4d32aac9baf3c46571b5b4919c158348db891f3e30f291ce8fe7044e0f1f7c5ab7e951961d5719adac1da1c5aee36fc330bc35a208a3fe603c616 WHIRLPOOL 43978e6137a3b4ed0566451335fbd05443f3c550f10723362653254dec9a847065980400532aa465919c86f7e158a1daf1367df9e5310b71be60a1be97ce76c2
 EBUILD networkmanager-qt-5.37.0.ebuild 687 SHA256 7e4e0d499cae6511900838ba66cec4e0dafe6e6286edc1e5d57566fc5b334f8f SHA512 dfbb706b1ca4dd91ac1fcdc7b6c59775de2e1b85eb3453f5c433106e29729a149c345e36333d5245d860b6078e308b4e234027953837d0b40e73282994673226 WHIRLPOOL 200afd4d7d99baa07a1c6615cde3c2d25c5f893220292bc838028ad9cb9b0ee48d2a734d56c1efd10f12dfbb59285001598166863cab2be9859b9fd922e7d0bd
 EBUILD networkmanager-qt-5.38.0.ebuild 689 SHA256 ae6eca4629d541d59300f9a92ee0395c2960473bcccb334fa46b4097cb608b23 SHA512 f40a92f9a0ea91278a18fbbecbe6e62b177f932df333dd5b9c20202d3671ea0b7d0ffca5ede98f9d39a97d514676917686fd15da490f65224d338e46b67b517a WHIRLPOOL 26d55caabfe6d37f8fc05d175c4be967e48e330b93b0ba8eb5aaa20002f7937c2f6b09a6bcf99ccd180c038c9de10890edeab41b28d1f4e0a1d674ae195876d8
+EBUILD networkmanager-qt-5.39.0.ebuild 689 SHA256 ae6eca4629d541d59300f9a92ee0395c2960473bcccb334fa46b4097cb608b23 SHA512 f40a92f9a0ea91278a18fbbecbe6e62b177f932df333dd5b9c20202d3671ea0b7d0ffca5ede98f9d39a97d514676917686fd15da490f65224d338e46b67b517a WHIRLPOOL 26d55caabfe6d37f8fc05d175c4be967e48e330b93b0ba8eb5aaa20002f7937c2f6b09a6bcf99ccd180c038c9de10890edeab41b28d1f4e0a1d674ae195876d8
 MISC ChangeLog 11008 SHA256 9c60c83d0ec6e9af47fc0452bd776ec5bdd61b7098f7d3185203e49f4d10f69c SHA512 716bfa24b88ecff435b92335bdaa439e4020dbc2bffc844dc7b79577f759575d465ffe8c3b95f178d641465cad85e3160d610e774b783e1869f496d70b88dd78 WHIRLPOOL 72337340464303229710c5bcd3afe6b32383970654cd2623a07790aa89c4ab6fa478841c6f5b569f1f8a789e68893f9c463a95f5fe15d338a3af469979f86686
 MISC ChangeLog-2015 1951 SHA256 6edef22cea1b60cac9c2c3232fb640e283149f0584f0655a17f5bd7ed899f554 SHA512 f18a745c055691bb71234a8e97ed610bc3544d1bb813eba539fa58d2d8486db2bf2fa158056c03092370e8e4221fa2392f21ea7ad787435cda786475eadbd95d WHIRLPOOL 56b08966127a13ab7292c523202696a23a9fb70d5afa0c046a6ea3da02f175e862b3bd9654d3e987d1e70aba932b36a6feae9fff29227b00b210dafb5f7c78ff
 MISC metadata.xml 321 SHA256 b5b763cbcff012bee0945cb6ca89c341338297bc915ab4aa2b15c8828e84c644 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa WHIRLPOOL fc4f20c5bee4794b2c03974b66298d46af05b55baa21c8927e0bbb6850666b801b7a9a86aca1bd4c0664c9f18a0ffc17bedb89bcc61248f19ced6d3c4c71ab69
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.39.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.39.0.ebuild
new file mode 100644
index 000000000000..9b11c8f8e368
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.39.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="teamd"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtnetwork)
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnm-qt:5
+"
+
+src_test() {
+	# bug: 625276
+	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index b266192a4161..42009349b65a 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -2,8 +2,10 @@ DIST oxygen-icons-4.14.3.repacked.tar.xz 29341916 SHA256 1d076233882108f16424e09
 DIST oxygen-icons-4.14.3.tar.xz 229823240 SHA256 9b222399c8c188feb3af342b0744fde12d58cdb4e5b88ee2b056ea082a9392db SHA512 193a51d96df9adbec55624d576f63afc8139ffc157c6e9be49cdb2f8611631728690a06cb49fc53441dbe37b5c66ff87ab33f186db82c659da3b7164fa86dcaa WHIRLPOOL ea156f02e1a0cce4445129c5d0ec103f84e38ffc6b69c9ee30130192ed58ec930ae724236623e609c2079dd2681e1f206f3b15f133da90ee2b44814f1f39770a
 DIST oxygen-icons5-5.37.0.tar.xz 234411868 SHA256 9004435ec6ba3be0313b25ab9230601b027f902ff9a81070b9782037923ddae6 SHA512 2af09f05e29efc8ab5bb8255627b6fc4b004c3be735d8bb61251973e4a8a0bb9cb0c4a32e370e3c5bc7203bcac467f85d29a31990135179fe89b486d4574c90a WHIRLPOOL 9e914d68abb7c06f85df571d4df1dfb5dfd739b4b8f23d3c1ee9fe15041d0d7d4a5589a76a28653a90b02e0c74bfdd7b4a29a82a7242a70d76221ef7a7964d78
 DIST oxygen-icons5-5.38.0.tar.xz 234409056 SHA256 2dc6c1a481b1877739328aebc27661bdaa090b3de653e5ecc5be96bc463e693a SHA512 9931b5792a0468eeebee70012946618cdb9d1d082aabd38ffcec175d1f84144d018e0ce451fa3b9140f9949ea59c2aa7bf24af4185efa15d9197486dea9a392d WHIRLPOOL f63ee47ef710eb509f70557a5c9553d7d9edd9d727909fb6622eb99e71780b20050bba7cc6fbf628fd4a640140c1ede1bb324e9ff70d06c7961afb033e3c22fd
+DIST oxygen-icons5-5.39.0.tar.xz 234408696 SHA256 28e9243820e380b965a2f85b1290ad98158438cb1498c79d75fb95ef80b639cc SHA512 c0be62b29a838b5a86e2a8830c67a57234fd83907661472574fb194e0e0619cecac334cc8c94d25611bb7e297394dfc68da4713c660f4ecb08667e4866bcf9ce WHIRLPOOL 8e876c018673a79f10f9687058cd1cc73e4c9413c0b9dfaf71160d92a09ad52435324132b401c0d1948265820ef90d70da54b338100f2e4d1e4cc0c3c3ccbcf4
 EBUILD oxygen-icons-4.14.3.ebuild 597 SHA256 5ad55fa128d105cea0acf87784586f28b07c7c8efd5a795401ad6d99e020c76e SHA512 259231f7b44534bbd4e5d856d7b442ea2905eda681d83df141dd6047e4475135ebaebce43346ac5ee57bb26fb9a8744fd1b0cd1493fd16545c133385a38d0a72 WHIRLPOOL 6c835502ca968f774def949df555afcc696d9750e959a5f6c49dee8e5412db68326242a046f0dfebce919ec3a057627e7aa9ad11550d121158c3abe8c836144f
 EBUILD oxygen-icons-5.37.0.ebuild 502 SHA256 8343f5c810c0dd1eff7df00c08135e6135fce48f6b63c62066dc969c6b9435d5 SHA512 738e9b5629d2d2111e9060b208ecde57394c51d08f0b405dc049af7ed46c58f89fc3cead26b64178309def517e8031fd94d7d688d49fdfc99b821a1acba5d17f WHIRLPOOL d9e816a396f64081dd07952909ecb5b8cedfa350d45145e558de5c356068905848f610334db4cf1bd77f93022b0c81200e39f10a7024aa77bd303d54b7d34b27
 EBUILD oxygen-icons-5.38.0.ebuild 504 SHA256 b9fbcf359909d5a3d2424a3b3b5d34d01be6542223a925f2823038e3801cf4d2 SHA512 75a34b84133ef1530fa8465cebe317679ac9fde0137ce6107670de0cdb4fd137ad976ce5aa78f3d90af2aaa0d9fb57aaecc510692285cc079fc288125ca7ff8c WHIRLPOOL 9da3e03d9eed20afde2747e6d12dcc0b00b68e7b92df71d1882a38c7cc14a7b2363bc1ff0be66da8974ea97480d9b727b8d5c6ce0e821b9e2529e03e0f29c6a6
+EBUILD oxygen-icons-5.39.0.ebuild 523 SHA256 6f8456f50b7d0c8911e2ca90022cb72597ded79825701b00f180fb19020cc250 SHA512 1b079577d64038039bf4632c97538d9865f701c16c9e0d1267896d77d229928447721dda002654f36949d39489586e7d47ff3f450ee79a882b619194294663db WHIRLPOOL c891db05c0b186ec5cbdb63c83cd9fd6b03e4b5f4f2c9d2dc1bb5e90eee6de806316d13d31c727b500848b44c29f3a9e51f769316ba5eed63ae9b6a8423a9a7d
 MISC ChangeLog 7074 SHA256 d074c0fca733ab0742d38c74603739cc203ca6ba9256c579036b907b16227903 SHA512 bba7ae9e67dc9af47f61c64b13e7cb0b788076725e47911b5d5329bca43850876062693cfa6d5ecbfc3f0ba5b4ca0b482df901a16ea52f1e7066ecd34332dc89 WHIRLPOOL 14ae9fcada006c4b3448fdfb2fb23e1a7eff60e7cebc7de8a534665b08b1a69d1e1e123e2e65d48c4b620003bd52988b508935f24665bfdf042706ccd3a96c5d
 MISC metadata.xml 379 SHA256 654c3bef0f86fa14f2fc741f3c081329ad8a2f30aa20db0b3e6a6f51030bf09d SHA512 25cbda51ca09ad6f13fa63267e5ab60461facf744d5a0a47625b77c2e5bbfa76926fa6e1a65f34e83ec3ed8ff5ac0f5cf780c235989953ed4ae0abd010cefe0c WHIRLPOOL 1dc0d133d4529433df37c414a77b4654ce757e416a1626919ade9640077b277fa760aff7671ec858df1b9adc9a1d1ecb434ed6962a5dbfa5f48303c0e79c685d
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.39.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.39.0.ebuild
new file mode 100644
index 000000000000..03780d0282ed
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.39.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="true"
+KMNAME="oxygen-icons5"
+inherit kde5
+
+DESCRIPTION="Oxygen SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND="
+	!kde-apps/kdepim-icons:4
+	!kde-frameworks/oxygen-icons:4
+"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 42eaac474b10..7a6ccbc229ca 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,9 @@
 DIST plasma-framework-5.37.0.tar.xz 4606020 SHA256 7099b0cbccf59b6be0f85f515e9e4c1f324c1910735c06acaea3affc5ddf554d SHA512 35210f11a06b12ae45ec80d11b251883c1fd993c5a7bd8604f115a3d8ca8d13c269a88c37d0336b79baab402d070017286efa1e918c6768dcc7c9e7831a366cc WHIRLPOOL dd337536690b9854ca3fa699be89b1472cb42ec6d539752dd4894993015d2c5d117e4756fdd72beb96d5d470d26a3d067b3e7efc6268a7b3edc716f7403f3ac1
 DIST plasma-framework-5.38.0.tar.xz 4606372 SHA256 4f23f37de0c404dc07809538fd531fa557780e99c854203980846c32a2c370b7 SHA512 5daec7431e70b6a94001608992b8930445d3b936830980fb9a6bbe501cb0f660cb9d192089c2401d1699c92448d4d9043ec12a42f0dd517fcd505127cb58e37b WHIRLPOOL 532ca09fc64862c197360de43fd91e7276e2248e104c2057bcd0afe4116ed5f96201ca6267d2b6fb376cebeacd886bd9a4f0f9561b3af53924862bbb74f9431a
+DIST plasma-framework-5.39.0.tar.xz 4606860 SHA256 a38f92df010d063a934a04d181c30bcac40df5f0494cfc1268d453fe6b9a5dbd SHA512 f24183f54016a6c33f1204cdc23a5737a2b1358b09e5ca260acfe036fc8b31bf4999ebcbd8c3f3207546649b9bce5b82c9be6d7f884fa93646352f11f07e120a WHIRLPOOL 7412bdc0ab6337a6b607b0c2c66c44a07161ebb5a69c23baa424dd7dbcb9a9a416ddbb97a61fa0a8966bdddfc82788a23be008b99b751c0b175bc3fae177a70c
 EBUILD plasma-5.37.0.ebuild 1578 SHA256 b30ddabb10afcfc0f793ecd102b51960230d07cc7cc3481fb475c3413034a4f2 SHA512 5ae6151da4a05fea2fc96bfc5ea600b2c471b9edd16eb039c04c3049ddc96591fe6c67827fbe5c2ba7555de4632aa3e62789c38db8f12f15735bc46bb6320589 WHIRLPOOL 232edb21c0bc7928bd6f325a18fc419c413de6332a1311b3ab7c6434b906a855d9fae5b64120f9864863e6a960bfcee0906a83c15ba53187d910586bf76098fb
 EBUILD plasma-5.38.0.ebuild 1580 SHA256 7193020461842c5593cf61c7238a0599e6e8b135cf27a8629d4e3ca3b060b8b8 SHA512 0c995d50dedbe45be04fd0989f44eeeeea83fad8af6b8894720851ca83d5e7654e11af86bb919929e8171c17b4b88b63b852539d6eac7d3b3e020ed1af93a4d2 WHIRLPOOL f09910e97b09f5d0e44cea0dffbadc42b07492acfd583c58d61b4c99aba162e471d1f2268d8b00f75b3e69fa14c03cf33a0ec1a278ea49608ced5b60ca45e3ec
+EBUILD plasma-5.39.0.ebuild 1654 SHA256 a072a0100e369aa97f534e693d23a26e1e217523a1e4c91b3aa382a7208d14f4 SHA512 50798d29379057dce2144f20bbb22d640afb3dd7788b96cc4bd53b9a79e343fc4d705d8c1ea317ca4ed23bd1b8e8a4e9c48ad4cef244b6f16aba681da1758bd8 WHIRLPOOL 52677cce1be93c5eb54ac3bfc406c164cd5966533a7422a98bf42a58425592907b9e84d27c4bce0a69f66d66640b7523e55ba51b0aa0696cd1047e2c7cb62656
 MISC ChangeLog 10643 SHA256 8ee782540bda876a0ee0a5a31e01efe8c2738a1f48d2d866e9ba84eccb66489e SHA512 e37f42580117d17a4e5f1d7371a3872e4ba296c61ffe4ed7ee68c15fab42f6fc9bbcc4281be574b2968ebfa01e33c7235c81ce1747b20aee7153f46b160794c0 WHIRLPOOL 230945228af18babfde4fe1e61ff041ed9d2fedd23e00b0d1ac7977e2d61220e80626895eac765c25e53488aab94211222a6de83f87a9bcad6d9c59e2ae18382
 MISC ChangeLog-2015 2579 SHA256 eb7cdf3102cbd83df12ab213dc66ae68f90232adbfc051bef8abea64b82a5e34 SHA512 cbf00da7d84dbcdcedb6ef225f863cb726a1191fc61caa7447af32d924e02bf4bbd2ab3b625fc22b75bf1853211a83453ecdf9629659a68290fe8f73db9412ef WHIRLPOOL 0f18b21231a583778db68191825029b98ec604ca4fc75629d2c5e22ef7d01607111d4fa80f59278d3bfb2eb65c7a72c3c2f8363b8ce17edd5dc930f7c7a8649a
 MISC metadata.xml 337 SHA256 de975095893a3f13832839f65d0e1b000e92c090070927b7391134308d2e9f27 SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797 WHIRLPOOL 8a46e48650686a2903b4207e4c7aed38ae2ad186db0fec8f54a84c27c73ce272f3c9474e06dcd47e6c2336c989e586ae3b959e0e6a11c589fa558a9125c21ce4
diff --git a/kde-frameworks/plasma/plasma-5.39.0.ebuild b/kde-frameworks/plasma/plasma-5.39.0.ebuild
new file mode 100644
index 000000000000..caceebd1fc79
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.39.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gles2 wayland X"
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.9.0
+RDEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative '' '' '5=')
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	!gles2? ( virtual/opengl )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	X? ( x11-proto/xproto )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index e6c16d613b3e..255e50f0abbc 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,6 +1,8 @@
 DIST prison-5.37.0.tar.xz 13880 SHA256 67f1e0520670a57f39939c3a09a10a48c38fd5b94fbcd45165fa1fe8788e9ac5 SHA512 b4c1a159b04337f6012998c3cc5ec16b1ae2bee64ad675a57d739e20675af9103c140b7c00e5afdacfa7ec077d34a315f183407ab40fc2cd4781d37babaf2ec9 WHIRLPOOL e24bd936db8afb65df0de1beea222dde6e8a5c09af84bd2b800500e0b5fffc7a2f2fbafbef05975d882cd768b76daae15b2b834ffb6348235ee389e2a7501b5c
 DIST prison-5.38.0.tar.xz 13860 SHA256 95bc65c9164b8ed8cace08be7dfdf12cc9a398a42e2b4c66852faaa1cd1f325f SHA512 26ed107c2971ca1932a7b75994f1b313989aee4ff7d84037afb7b5d45a1a52858bb72b1ede947bf01d87eb7a292f7a17f0475d53ad47d59af09e7c9fefe7099c WHIRLPOOL ed3a8bd097b37795e0f15aff47a9017948d803b51fd9505a4d5dff06b295a861351773c21fd21169f820e5d3d549e6902f16da91fe464bbd69c910d1be605391
+DIST prison-5.39.0.tar.xz 13868 SHA256 db06431d8b8679643faedd7787495ef43154a71599949f42cb55b11ec88812ac SHA512 e93eb3fbf8c516faa6debf02471c23e92c45dd7a51938104b4d828129f23ab307355bc2e3c224b3be531ac712fd2c8d28e8aa0f66937c6823e6897ee28e67078 WHIRLPOOL 5640c706f458acc570e47dc639e3048559b254043f2e7dce382577311d02120dcd74677a24db98b85de5a9e68cec0c29263529d8f21c08de559eabbc9fbf59a7
 EBUILD prison-5.37.0.ebuild 377 SHA256 a2b7419d628dd15c46b54830f692589e70dfaade64f8a63f49bac3aa3ab98062 SHA512 ee924feb72cdd07a9cfea0540539704c71c7c4c397a221a3e46933922b1bebec1324579ee33b8e355bd6b2f9c40012bbcb8ceee870d8565ea1b0d01ea69f0fd0 WHIRLPOOL 7e8b01169e2dae41ce95131f5b95e56d6d88c937a0f325475924e42dfd91f81a4810fdc79e42f15590e61901fc5e1b63057b5288aeefff2d95043fd6c955537e
 EBUILD prison-5.38.0.ebuild 381 SHA256 a947af99f007105b303d2b5106c353348b19cb3d8a77c2313ae3b6497a1368ec SHA512 a01fc5f9b131c6664d16ddc0a9d50df8db4df1ee9eb747ee77f48c10ae418c1bf076bbb84a99ec3457a970551847aab82f11a264c25ba9a3cda88ee1ae3e317f WHIRLPOOL 1489a0c3d95fc704fb5d7325af0fd73d0db8fca3c3f3153e8d22a23ec98f984108a04086f4ab1d6b90790bfa18a94d882b5c31bf579fa5aa850646af01b4ec5a
+EBUILD prison-5.39.0.ebuild 381 SHA256 a947af99f007105b303d2b5106c353348b19cb3d8a77c2313ae3b6497a1368ec SHA512 a01fc5f9b131c6664d16ddc0a9d50df8db4df1ee9eb747ee77f48c10ae418c1bf076bbb84a99ec3457a970551847aab82f11a264c25ba9a3cda88ee1ae3e317f WHIRLPOOL 1489a0c3d95fc704fb5d7325af0fd73d0db8fca3c3f3153e8d22a23ec98f984108a04086f4ab1d6b90790bfa18a94d882b5c31bf579fa5aa850646af01b4ec5a
 MISC ChangeLog 614 SHA256 5d007c2230208ef8dd67c49affa9292563cf21bdb6b5ee5471d6cc8a3b77bbd0 SHA512 06138604bdd8b0d217076f57ca4b7fea9b54ff2c9d87f946285b9c00b963d70d62bee7c29e9a7838a96f8726a2ab4d698822d43e912593a9cf43504a829010e9 WHIRLPOOL b8cc4c98f804a07fe36722cbef691af54252485ae170c4f49f0d069d6aca75f139970b6f2f129fbb7e759e77dc09b8e0bb6f7d94db3c160d46f2e999a0815fc7
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/prison/prison-5.39.0.ebuild b/kde-frameworks/prison/prison-5.39.0.ebuild
new file mode 100644
index 000000000000..c58970ce3531
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.39.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://cgit.kde.org/prison.git"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 41f0af56ac27..4c3db3748720 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,3 +1,3 @@
-DIST qqc2-desktop-style-5.10.95.tar.xz 32520 SHA256 bafa0600f096826ba371a1e1366e04b6c9a47c7de81cb403df1caec5d809d82f SHA512 0d9b7580a0e84ac13910ca8e706d86382a7f26eeca7010b330d9dadb704640e9d8a078cd2a1b0a603688c9b6015de1f196c1e2c8ff006d5f39ae787cbfed1202 WHIRLPOOL ccf1e4b4482cc1c33682e0b1e2fe7136e6a16873d6b88b0bcefdf20db590087526d47f85ab122a13bc3b7a3accfce9dc081c72f14782fc91d9a22ac321daaaca
-EBUILD qqc2-desktop-style-5.10.95.ebuild 579 SHA256 76a7c5b2517967fa282434bb15affaaaf44854cad478247a33e1a0f11bfe6e26 SHA512 a156407e738085062977ea98399a68156d48750c57952390cd10aee2c06a05963e5757ba99e6dca81a42d9c7db6de00bb57d38b312b9478ea7861aebbef49122 WHIRLPOOL fe1180043e7d306c13771ca487c6894a65e9c24ec856cd96b1dd9584674a4441b7daa51f6003367d52302e1c2a070a8cadb38ab75d5552fa4b1a2234456ba2b0
+DIST qqc2-desktop-style-5.39.0.tar.xz 34996 SHA256 fb8818b22dbc1f47c38bef488543f025ec5da810e84f5ed732b08969338411e1 SHA512 4be8bf81ccab01e1b80db5fe08a21f52e621474326456a17ec105a0d4e4b10e1e7dfdcdedb491aea9816170d4e6354ccb4e5dc95cf77442f07f9a568eda82a95 WHIRLPOOL 3d4365544fa0614da518dfc2e1784fe840bd3f269083aa93537854b46fda44852fccd0bc23cd5fa2cac3ccc459f0ea71968b0319db696f7b3d50b9151f7b6a9b
+EBUILD qqc2-desktop-style-5.39.0.ebuild 633 SHA256 2f63a68cea9bcbe64690e3f017a16d5f236b2514dec52ebd23dca0c8d960e31b SHA512 a6a6779fbb124be4e837dbd75bbf56593942f4253f569243513ec7af266b37231b332826b1bb3a17930227915ecba047ab496a97fcbe414f0b8e6f05b9e88cc9 WHIRLPOOL e5a0269e45e4d7bf40a0135f4a18d5d02dcd84d43c518399b6006f8c8cd76cb1bf69a62abb2426f10bdf536fb96ad6c211bd478b4057837d7673b882093aa648
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.10.95.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.39.0.ebuild
index f1ddd6e92fe4..eb1e7f927162 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.10.95.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.39.0.ebuild
@@ -6,14 +6,15 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
-
 KEYWORDS="~amd64 ~arm ~x86"
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
 IUSE=""
 
 # drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
 DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kirigami)
 	$(add_qt_dep qtdeclarative '' '' '5=')
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 145dd49616f5..9f07ef3bc44e 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,7 +1,9 @@
 DIST solid-5.37.0.tar.xz 248120 SHA256 14bd7b814f3fb87ea7d26338a05966380b1703d6679d44972a380415ae7d69bd SHA512 11cebe83b19f488804fc2608c1dd5c8a3da8ba63f10ccfe445f3c9ca19de2252857791c520f55d08edc87dfc9459d340ea81fc598b10fea2b1080cb03a24d18d WHIRLPOOL dd9120455df4883248447346db980d1293b6d02eca22bde013ebf95e075adaea15d2662c940f049f6bf853399b1e0446a5ffd42781684eb544f5bc9d8ddd104e
 DIST solid-5.38.0.tar.xz 248172 SHA256 1052830aaed16391563dc35fe0e01bba2813acf2e0c70fa2223d54d2732b6cac SHA512 1b6c755c242f04aed776dda3aba4e0377636230ff616374bf87d0f50d47846a252817e9a08df5ec08b8a30844dc799fcc9450a2288a1ceed30ca5b326c0e3fa7 WHIRLPOOL b6258c93139f6a4d5ceaeeb73557081e08dcc65e8981a982b3dcb6311bf2ce37b98fc54ecb084c50293d78359bf93074153faa827d4ab67539614b84ce948e68
+DIST solid-5.39.0.tar.xz 247684 SHA256 d98c1bc67a8483d42d76d0369bab3255b30420a5bd41bc4730cabbf03e3c74a5 SHA512 ab6775dbe0cf0f06e3049c4d54552d7231c3ce55176e9d3912c729613e2554be4a750356fe681d4d8f0cf1f4647f42a4076442357a59bd2800a6576199ac9352 WHIRLPOOL a16334e02df2a2a25c458cb24b348f27e02b5a6d273bafd2913641cdb7eacc74a87798fe14dd359f29e0cca36c83c7a12ff8d2fe3ec7de144bae095923fcff81
 EBUILD solid-5.37.0.ebuild 721 SHA256 b9c7ee2f7dbfbe58cebb15870baf6c55f427c4fafaa0cd8832c6ed65a6ba4bc9 SHA512 a2d4c1e4a65dacff05253cda3559ec04ec70ea83a7789f95dbe7d75c313e8f53cceb504b4985177d9976ad85696140e6a9ff4ba51763c96ce84d98d33fa89e44 WHIRLPOOL a28ad59ee1a95a208faa9dfc96cc15930ce5681112cc18c40b9e1e5540021857dc7597618b15ebc358e1e4b85787a917c08f12ca2f5a0aae16a0d55ec15b76f8
 EBUILD solid-5.38.0.ebuild 723 SHA256 2ac2138d4ae7c917608451656d02ff8da25439fd7037bb9011a20391d3c0b397 SHA512 132d1d5d65e153344ad00f22395035ed7f33fce21c893fa700759fffe1e85cd435e1d9dacc2eeae195a866b89dc9a11e4dce2d51866c6a078f9f79e55e4d5f4d WHIRLPOOL 8c947a809439550db4f39ab1c8a3aebda75e63dcc7525b134d141a0689400fb3e1225219fd6a01d9687421032322d874f4ae96a91cd482042681d6d7869744d4
+EBUILD solid-5.39.0.ebuild 723 SHA256 2ac2138d4ae7c917608451656d02ff8da25439fd7037bb9011a20391d3c0b397 SHA512 132d1d5d65e153344ad00f22395035ed7f33fce21c893fa700759fffe1e85cd435e1d9dacc2eeae195a866b89dc9a11e4dce2d51866c6a078f9f79e55e4d5f4d WHIRLPOOL 8c947a809439550db4f39ab1c8a3aebda75e63dcc7525b134d141a0689400fb3e1225219fd6a01d9687421032322d874f4ae96a91cd482042681d6d7869744d4
 MISC ChangeLog 8957 SHA256 62f7ec4036a88c5daefd1f30c69191678ec5e99a542c9c2aff11c874dead97c7 SHA512 2f470a9a481a848eb56e4255757ca1e28974a6207f349c2311c1f30e420ac2733c9d8fffadb998561ef598277a67bef3ac8925d0216105bcd676fa6ac2e73567 WHIRLPOOL f83e2ca7afd32e7c6aa56708a36e37506345f4e439bd32599a9b496e878414b499e438d9b9e7ca174b01cc4c72e37936f2eeb025098a4d177faf18c9e51dc828
 MISC ChangeLog-2015 2222 SHA256 7c6217019bfa2dc4c145544c45fe68d919c27c9e3f4b2b1a37ed94d2c31975a3 SHA512 71cd867bbcf08035ce3c6a160492107be9131158259438847379de263dc8e53a7994e60a4b09a6e52e81f58f83c3b7bc0dec90aada20191d64356f9b4ff9ef98 WHIRLPOOL c75dc0d9d1fb38752a6a20b69d6af9646a12bd2ebaa2088b8bfce62a930a8ad80ef4ec381e67ce20c804916b61daba98f7ad403a4a6e7ae79647f1d6459a2d2e
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/solid/solid-5.39.0.ebuild b/kde-frameworks/solid/solid-5.39.0.ebuild
new file mode 100644
index 000000000000..66e0b008185b
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.39.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-fs/udisks:2
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "app-misc/media-player-info" ; then
+		einfo "For media player support, install app-misc/media-player-info"
+	fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index ac47c2169c2b..4c24419edb52 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,7 +1,9 @@
 DIST sonnet-5.37.0.tar.xz 285036 SHA256 60cee18889475a20327c3b7fad431579ab6efc06d28e83c57a4dc54c0c896669 SHA512 bd22671f2c9edff553df80db050393dfb88b14dd6bc869957bfbe70dd30c9ee17e90ac9d88d45e700ffc014708b7703ef8cfacbff6bcdc51ecffa7e45e83aa3d WHIRLPOOL d808975200a6b00ed30750bf944d23b7271f63c1d00eac340e40d181ab86b00e5becac3da67ee7cc34fe5b064fe17af15fd70ec753a61c95b7b4930995522d8f
 DIST sonnet-5.38.0.tar.xz 284256 SHA256 aa73bb8a599f7b2ed14c043726ffe2d6399f1fd9a3daa51f12685aae11baa58c SHA512 c2cd812815c0fe7ed9e4dbf046d4b0da2aec08703d93631df0eec8c05caaaf6e69d763bfabd88c5efc78661045816125ae3979bef959794552f11637932c9fc5 WHIRLPOOL c0752c7d5666e0e0cc5392023a1025394778cbdf1fb3d73fa493a18f6dc3c4c70cfd81f886e965c8a67a74a6c19b78f9ea3fa4b4164e0e10911a0a708252e955
+DIST sonnet-5.39.0.tar.xz 285128 SHA256 819f2bf8c95758106deaf800f3c4ec18d3f42d845a90996462839a759774abac SHA512 4d1a06578812a77febabba8d99fe902108e52ea03fe20a065e900bc47b1254cc78940927307b27b6039f1dd79ccb3bf734a6cbc916ef47a9603c165342be8a1d WHIRLPOOL 017de7c82bc66d5452a845ceb42296f41f815141de73c97fdd627d896e3f6113c82d0fe42fd6361e5efda50ae4fc31b7b9949ca4203e828b0c00ec633c77acd2
 EBUILD sonnet-5.37.0.ebuild 661 SHA256 654a95d9a7b03998c27ccc425dab7db0f06fd72560e2e26d562246a9ec824af3 SHA512 79dc51cf9bdc1ffa630cce457a4e61dcee703ce7d74ceb324929aa395f97e3bed9da12bd4a8bcbeea5c83ef05dd178ab4d78e6a66b89402d71b46abeb719e991 WHIRLPOOL 629dd8f69fc8cbd7a2c68bc51f6c1e5d09c934c61a745533c34df340bfff67e80c5d36b9ddea341b365457187a7c7be12289844b02e7e44b5156362d2bf5aaf2
 EBUILD sonnet-5.38.0.ebuild 663 SHA256 377136ec8a2e808877a34d08a06cf8e5bd7805501a520417db4ea0ad44e56f2d SHA512 8ba9b13ac6cb73b5f2e6c1ca1a918faf06c94990ac913a51faf27252be24079effb53ffc7fac4acb3069158394fc5e4f1e3b7d6c8a46738a1f7d1044d9aa257e WHIRLPOOL cad46082436a10968d8b01ad1ad4d4ab0009b23ef302b4456935af404b5ddee2371a865416a355048dbbc9a31409f14855a4e43aa7a1a3a03741a1f7d52fce22
+EBUILD sonnet-5.39.0.ebuild 663 SHA256 377136ec8a2e808877a34d08a06cf8e5bd7805501a520417db4ea0ad44e56f2d SHA512 8ba9b13ac6cb73b5f2e6c1ca1a918faf06c94990ac913a51faf27252be24079effb53ffc7fac4acb3069158394fc5e4f1e3b7d6c8a46738a1f7d1044d9aa257e WHIRLPOOL cad46082436a10968d8b01ad1ad4d4ab0009b23ef302b4456935af404b5ddee2371a865416a355048dbbc9a31409f14855a4e43aa7a1a3a03741a1f7d52fce22
 MISC ChangeLog 9626 SHA256 ea8352631bd7c9e6ae8a1385f9113557ff69df83a3be54386edbd4a4ef5bdab1 SHA512 5075bc80e03a485105e631420b42fad05330c3ccf334076a27e01dec916419dae2a442bfd10dbfe22ab59fba7bac95ed2fc81037524f36195421903356cecf14 WHIRLPOOL b6225026189fa380d03b425016a3a8d469c309d11b89c9aabac429379b31ada00e72e520becdee5b56207187b02465d5dfaffa97198e980794e901490c83aae8
 MISC ChangeLog-2015 2392 SHA256 2c1c998d5a647027c73d5baf195361cf74716deaa7c2c079c8e916c5fa6168b3 SHA512 3b53ddef0e1b7e3c728b01b92b210aac6b717af2d2ef517ad8697943cafadf41701593df8f70681f20611df2e61321d35f28d3f3e731de1df9fc6345910632a8 WHIRLPOOL 198f8ce5c03d780a86754aaf806489433e559e0f7e57a377e012de1f5376d5ea1e5615ea32df8a9f29c6b8f52cdc76cbeed0f984658a30493f6a6eed2b8892d0
 MISC metadata.xml 426 SHA256 3fef89e91f852b9c09227cff6b9f8cb622c19627d12618caa9b16cf6fa7b024c SHA512 d429dde1039230ff5cc0611f0373c22511fe7b9b6b5ece823591b8972a876f3d10b4bf658bffc061f8433b8cf8cacc224db97791f2008c47d9d5e41e0deef8a5 WHIRLPOOL 6a33e2bd662a4ea3b2e6d6735750d2d60fe5d794753f85b0960b0621280318d0a8bebc7779dbaa51fe87a1e742051ef33f060636d49636a7c737d762e4db8d90
diff --git a/kde-frameworks/sonnet/sonnet-5.39.0.ebuild b/kde-frameworks/sonnet/sonnet-5.39.0.ebuild
new file mode 100644
index 000000000000..f55dd0abe50d
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.39.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="aspell +hunspell nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aspell ASPELL)
+		$(cmake-utils_use_find_package hunspell HUNSPELL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index ca371d82b800..9b901ebbe395 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -2,7 +2,9 @@ AUX syntax-highlighting-5.37.0-powershell.patch 1174 SHA256 6c1e8543376ea46022ad
 AUX syntax-highlighting-5.37.0-regexp.patch 4729 SHA256 062768c8aaafcfa67898f1861780c869cc38e6386cec0e1686106795ad744fd2 SHA512 228faab9af63806eb763e93c903ee3ea7bc9b16e72588de28e86e4c172ededa2c69b6f70c19f74b0d71339b4af459382b5aa427f3c9c78395f09d22a2aa72101 WHIRLPOOL d9aef682c1a95f3316856fb68a17959022accf61e4741c8b15ee7ce127ecbf8f2693005e2f119470acf4e33622b9b8353630c5a1fc6ca898c77253789378dc7e
 DIST syntax-highlighting-5.37.0.tar.xz 1050660 SHA256 e2d075482bc5409646db40374c6caa0b055276e1a5cd8e30065e9f4fd0baa6d0 SHA512 d49f62934283c07c1b6e8fad11b9fa469b21bb55f35ddbc6c28ab29bd79b7cba67a93d0b46abb8b3d86ee7ba7a90ea50a98553aac7bdfe396bc2b010611c24c2 WHIRLPOOL a2cf1c91e69bf028c5b96e4d6121e532d40cca0ba61be7fd5cf16858fde87437fc145aab6ae2c5eedc1559157bd9443f2cd2f4d6cb814adc1e195033bb2013b5
 DIST syntax-highlighting-5.38.0.tar.xz 1090228 SHA256 d4b887e2b4c0bb0d0c723325b11897d1ab38a644e3276d57eae8393928783680 SHA512 1ca56399cd78e593644b3d474b4eff979762300d6d27f19a57e1e66954342ec0c6de28b4309f284d7c3c3d1f71d1ea6ca108cee0c5bb8ca1803aed5f0c69076c WHIRLPOOL 68a96115ecffddafea1ebb7b185b9c07dea077a74d639edc3a060d126ba91e08d91bdbe932dcf1041d04d122da8ad8678670e74b5484fbccd2d58cfdfbacef44
+DIST syntax-highlighting-5.39.0.tar.xz 1108408 SHA256 acfd79f8d53269bae1d4876c737605f0e20c31d9453444fa98b8e296e06c1a2d SHA512 d7b011950541754b840fe87b82139f3c36b2f582db53ff0b7e2b44c31f6111b5063c77e822dbd4f216761e4e9d556257f7d8954d507541475073bad1fdb3e976 WHIRLPOOL 387367a7ced9a5ce6a4b52d1ebc4bac4405da0266616080fcf914e093da96b7cee00601d0cc6ad4b72db3f42d9fe75ce0a0b46152bcaea09172b4a446f1eb55c
 EBUILD syntax-highlighting-5.37.0-r1.ebuild 616 SHA256 de310bce47624a32ce73c5b35a95a13fa20362d3196cec51c3f3e2b5f85093cd SHA512 fee2713fe0af6bd51af88b73409a8b5abcb54d75dfc98339472c710256dd0a744bb23361b587e41c25681e006639acbbdbc97abb62fef2420d6c993ea5a75014 WHIRLPOOL f4766a4fb91e1eab741368270c4a8d384d6930e7aba6a3728eb3735ee62a7340fafc02df9a21d38d409fd5588dfc8a0f24b568493a365ae8abedb439b5d78f8f
 EBUILD syntax-highlighting-5.38.0.ebuild 527 SHA256 7f1478a69f147e1ad7b367a6bb139f9b23fa4a4f4cd964240a253a520144a5b3 SHA512 4d70f7d6d9bf1e07e87775dcb20500c54a145765e18a54e357440acf27edaffe371bc4ea062aa60ce9421b2b58cf471aeb545bd4973c2d146afdc98dc23b75ef WHIRLPOOL 946d1366a30ac62d78d061f7d330df82ab4e301959c1a760a58f9fd801316a6db78ceaf1cb37f004958a3205d32de9bc224baf6d6b274f7430ea86f61dcbfc89
+EBUILD syntax-highlighting-5.39.0.ebuild 527 SHA256 7f1478a69f147e1ad7b367a6bb139f9b23fa4a4f4cd964240a253a520144a5b3 SHA512 4d70f7d6d9bf1e07e87775dcb20500c54a145765e18a54e357440acf27edaffe371bc4ea062aa60ce9421b2b58cf471aeb545bd4973c2d146afdc98dc23b75ef WHIRLPOOL 946d1366a30ac62d78d061f7d330df82ab4e301959c1a760a58f9fd801316a6db78ceaf1cb37f004958a3205d32de9bc224baf6d6b274f7430ea86f61dcbfc89
 MISC ChangeLog 764 SHA256 24f77995f793d18d6d2d52f848c4b057a33bda3db0e55f4e4ede318ba1b53311 SHA512 1bd9ed57a4d52d477f0ef72d250f5efbffb80bdd6d092c4b5545650285bd775d996ff5ddff0f516c5116f8a28281e977b668f854fa2f6513eb76dbd667b03af4 WHIRLPOOL f9981f9fdc2f9b9bf9c5bb110ae3e48a359b499e9ee7d3f0abc5bbe811ba0205c5a7c765c6b71c5b512b74882fd7d08f27ab01516b22805213852110aca9526b
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.39.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.39.0.ebuild
new file mode 100644
index 000000000000..a4de123cab8b
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.39.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxmlpatterns)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_install() {
+	kde5_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 52b93d316f0c..e5883c81dae3 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,7 +1,9 @@
 DIST threadweaver-5.37.0.tar.xz 1409680 SHA256 a4f79b937020f4a7b44e8fc1a6339828cccea6d306a11084f46bfd90833863c1 SHA512 8679a65b59a787884c3aed01d7fb06dbb9e91a6f60ff4db952e1cba50022db430f3bb3f3411d7ecdf0f47b469be0d2d32b4d4a7879a976c96ac4c0efe688efd7 WHIRLPOOL fc53dac0bf13f1067830ab41faba0b2a416b3b9ae9e67234bbd54a33ffd0bcb0f824d55f0885a9b3313180743c69be4581c1ca32e349462328a209f214aa687c
 DIST threadweaver-5.38.0.tar.xz 1409464 SHA256 db6dca72315a376fa8852f0059113a5880a002e311e5f4591138303b69a209b5 SHA512 be6702c755b597ff6dd485809d4f48bcbc5e4ffdac5222fb9478dffaef942557e6cc405bc421a47266b2e0d0ac10e81a26ebb7277d03c0cca182f565471031de WHIRLPOOL 836c04a6efc52da59b426e16ab95f147b6411af6ab1082d7c15cd53b7565feea3fe80d0557886532a60d127ce1a77afbf5e64f7072e09f8553f1266df504661d
+DIST threadweaver-5.39.0.tar.xz 1409556 SHA256 5c116d93f2ca7bdc75db8d59a4b4852d2c7db48073ad3de21e4bfbf6339a2b80 SHA512 3c307c53829d59d370175da05355d1ca3950feafab22a53ae8f36c03545e1b69afaf4947a2325830b33d928868c5b5a645447ddbeb6f76963141077e5a271ad2 WHIRLPOOL 1beb15ebb1142391a63b29dc69c125cedae4f3e0d7590cde13118a63bf9920389ddf0a57bc43853ea141bdb00c1c35e53c6e96d3832c970c0fc87ab828cf975f
 EBUILD threadweaver-5.37.0.ebuild 351 SHA256 228d1ed7746d9b763bb1927ba86cc4e5d917562eab3adae8f651afbfbfa0d886 SHA512 744662547235cec4a872fff5fbb96a7c3c82fc55acae7e033569e82acba4211fd6c88c7605cd9fce0a5240c0f64caef990656d8b6b04840b967345bc4f4d8d62 WHIRLPOOL 012fa9c007ce882286b91fa6b093175c1900755ec27a01e8e7a45d6fcd7ca1e1a42dde1b844629860fbf140e7ba551ef6ba3e254c7b57eac37655c1f495e3687
 EBUILD threadweaver-5.38.0.ebuild 353 SHA256 6141aa2fb10fb7caf32cb45175a87b04d508ea9eed5d31d4da207b33b7c48e2c SHA512 712d04ee29bfa1b4eda6da8a260384dde36710b65987b0af1b6e93949486ba117d56443a63db2838e09bd5164fd8ad0699cf7679b5a6d25848702efaf6266424 WHIRLPOOL a805fb4e379e856178d1c3f84c1ae0081be5cb3fae1e980c109e2e22f1b3a996e56e928e6fee4a95cc3cf5e4fa80e96e76e603268da84b225f52bc104c1615aa
+EBUILD threadweaver-5.39.0.ebuild 353 SHA256 6141aa2fb10fb7caf32cb45175a87b04d508ea9eed5d31d4da207b33b7c48e2c SHA512 712d04ee29bfa1b4eda6da8a260384dde36710b65987b0af1b6e93949486ba117d56443a63db2838e09bd5164fd8ad0699cf7679b5a6d25848702efaf6266424 WHIRLPOOL a805fb4e379e856178d1c3f84c1ae0081be5cb3fae1e980c109e2e22f1b3a996e56e928e6fee4a95cc3cf5e4fa80e96e76e603268da84b225f52bc104c1615aa
 MISC ChangeLog 9412 SHA256 9b0702b2e25736a6d13ed8592f3bfd986425c4c3bfcad2cf08412456dded8f90 SHA512 0316a6837c724088d2aabc3273e1b16b81f902ce3eb7d57caa6c8967175b31a304c5257cf0bada0c066af7a87a732c165d1ecdbf776c302d4f6912847d59413a WHIRLPOOL 2cd15215666c5edd2025addd6b0755a18c2d810040703275e1a4c1bc851348d7ea8907be6ef34e068c39d17c07742db8043ce5ea5f310a29fa290542ca514023
 MISC ChangeLog-2015 2566 SHA256 748afc5bd80fa21e815da958d901e126e784105c05a520a22a113401d78d4e8d SHA512 2a8088050c3715b919bab9bae5b918fc3d0335a83a0a41ee15643dbf5780c2f62feca07fd799d5b4c2f703d335b2873ca9c806f92b4c8633248f3b2633b8bc2b WHIRLPOOL 7c1037f67f2fd5ce6ab70b07569b6fb6bd99c0f789a806ca7cddb9baebd3b4bac73562b3b9ae7121b2c96d09d6e40cbf4f1ad6843aae62c02796404aacef3a7a
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/threadweaver/threadweaver-5.39.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.39.0.ebuild
new file mode 100644
index 000000000000..d8403c75b940
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.39.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	kde5_src_prepare
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index d5a934213119..40e6bc16dfd3 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-desktop-5.10.5.tar.xz 6076092 SHA256 15bfd43b9589654f1c8c56601fc392a1a16f07b2979ae1d92d4f9570c514beeb SHA512 992564270216f7bd96dff59bbe35ecb78ceb25b99d5eb3c7c9e1241003aaafafdfb4fd728889b8b95f9252a9a397de95abb9dfa64dcf876c8d713cbd8e1951c4 WHIRLPOOL c6ddda99ee103557ad9591c662d76ea6e7e8a1a4838da58d3070461288b2dc18220a0c552471ab55ec94ce873267c357f372d165bd0b5ffccdb5ecc2df5fc119
 DIST plasma-desktop-5.11.0.tar.xz 8386604 SHA256 6696dd44045ed8e4940eda19a7f04077346792da90cd31b26f3e1bc5640546ed SHA512 26b6824565f6af3af1aa09e7120ae2a5292603c29026a2ad03580c35d947b4b311efa55900eb6f7bf8fde38a9347483a49b7c109163e70958223d9437be20061 WHIRLPOOL f53e93aa1bb00843de2af40ea7c9fce06bcc240ff1be2efca79fbc41eab2f4490c2bd1830b9ff2f2618a9513db3753cf8b2569c5a6e3f25ea67911e5356dc65d
 EBUILD plasma-desktop-5.10.5.ebuild 4276 SHA256 77717e90aceb4c44a2dfe105c6e869a1e61139ba274e06b5ad38e79b7442eaf3 SHA512 d1dcd30d8f8243d13058098d521e4a18640ababa3c78145f9fe9069ce40722b94003b9dead7699de87e9810630f8f67bdf3690867b9757a471ad2b439c18a672 WHIRLPOOL 9a93d3751de4ac3b76bda094ccc6ff34fb8f6ec192f2eba87e01b8f24130379fef5426a03daa7961fa0f377499ddfd717ad63d5d851fc64275c19063a116778d
-EBUILD plasma-desktop-5.11.0.ebuild 4279 SHA256 c7326e10f0a0daa0ef77f2b36ce946a5a58553715bdfd4dbe3633c7d8afffc46 SHA512 17c33586d6a1cfa90ba1b5b4802c586d092aab4b825b595b30a4a75c4597699d59819ce968b7851075fd17f6855b2867c4578b404205ce090015f1a5d2380225 WHIRLPOOL ee723b1ae4199dc29e5af5d8bd70e07f3d821f8309604c1e0f8852eaacf08939f66f344b1c4daeac1b85affd425064433fa65afd89b6a174788784d1004458aa
+EBUILD plasma-desktop-5.11.0.ebuild 4387 SHA256 d7317a4ad849dcb50c602a7a6c2550005a15da15c9d4114f37f86131d9dad8f0 SHA512 fa9a22b77b617dc70b835a17edc30b77a87b699accfc3e177879f28708231ba8a37583035e97330d6efe9851e9ae58a9d4845f12a389b4bf0906056e10e337b8 WHIRLPOOL 822b0ace03ac00a2d2651fcc07973502da9c46ed349817de5f06e1a320e7332677c7be29a20656de049c749904f2352fa89d634903267175e15c981982706cb3
 MISC ChangeLog 15915 SHA256 a51aaa3e1bb4757bffee181853a50200a9435067831c2a6c62f6b00b995c6c07 SHA512 a62ea3ed92e7800ec596b4ab99b3a8317a597f657329d849ecfd6aa0af2ef497aae2b4b43898d03785549c326fc22b25c6d2c7fd20e1551cb624daab230f696f WHIRLPOOL 0f356c3c740f6048ed82060cd16b5b3e6f630efd22c0df310716ba9692e71bbea560d71b8b54f9cba73f23a3bd51b35c36fe0edebbacc335021d0b2b9356d2d5
 MISC ChangeLog-2015 1003 SHA256 2d8838369a5b9507a87184045c7c5bb097a62ff2d55e873d66cb762cc8179f87 SHA512 721e4e83154e4a24876b2b1db0e9d8722e492e8c46fbf57fca10e3c69e5cb5f7190d314754e5108deed94f72e06b3ca0ee4e3cfe187f759c6400b1fb84bf21fe WHIRLPOOL 771d186b1cc6ef7b1905089c57b63f861642f1d53a3e09a4ccdec4adcb328348d12356a9191dbf3f0126a7c7f2fd2c4c650b04b14f3334063a0aa544443aeb83
 MISC metadata.xml 936 SHA256 c756aa13b3134f8a31ebacd7739d0fa3fcd4f2a5aca7e24521a3301639352061 SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8 WHIRLPOOL 7a91f0f4f52f38a3202c3dcfc8b690d8a1378b7d596690a384a6d3c4ef8275236d14866884f2f6d4e4c57151f93e2920e0c57f7ea05985e728ef2025c876773d
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.11.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.11.0.ebuild
index e41da9d684fe..91c3516fa4e9 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.11.0.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.11.0.ebuild
@@ -151,3 +151,12 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_test() {
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-E "(test_kio_fonts)"
+	)
+
+	kde5_src_test
+}
diff --git a/licenses/warsow b/licenses/warsow
deleted file mode 100644
index afc889b83cf1..000000000000
--- a/licenses/warsow
+++ /dev/null
@@ -1,26 +0,0 @@
-Warsow Content License
-
-Assets that are property of Chasseur de bots, use the following Warsow Content License.
-
-TERMS AND CONDITIONS FOR USAGE, COPYING, DISTRIBUTION AND MODIFICATION
-
-   1. This License applies to any material or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this Warsow Content License.
-
-   2. Terms defined in this Article, and parenthetically elsewhere, shall throughout this License have the meanings here and there provided. Defined terms may be used in the singular or plural. Definitions:
-
-      The "Material", below, refers to any such material or work, and a "work based on the Material" means either the Material or any Derivative Work under copyright law.
-
-      "Derivative Work" shall mean a work containing the Material or a portion of it, such as a revision, modification, enhancement, adaptation, translation (including compilation or recompilation by computer), abridgement, condensation, expansion, or any other form in which such preexisting works may be recast, transformed, or adapted, and that, if prepared without authorization of the owner of the copyright in such preexisting work, would constitute a copyright infringement.
-
-      Each licensee is addressed as "you".
-
-   3. You may not copy, modify, publish, transmit, sell, participate in the transfer or sale or reproduce, create Derivative Works from, distribute, perform, display or in any way exploit any of the Material released under this License unless expressly permitted by the Chasseur de bots team.
-
-   4. You may freely distribute the Warsow archive/installer unmodified on any media. You may re-compress using different archival formats suitable for your OS (i.e. zip/tgz/rpm/deb/dmg), any changes beyond that require explicit permission of the Chasseur de bots association.
-
-   5. THERE IS NO WARRANTY FOR THE MATERIAL PROVIDED, TO THE EXTENT PERMITTED BY APPLICABLE LAW. THE MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE MATERIAL IS WITH YOU.
-
-   6. IN NO EVENT SHALL Chasseur de bots BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE MATERIAL.
-
-
-END OF TERMS AND CONDITIONS
diff --git a/licenses/zoo b/licenses/zoo
deleted file mode 100644
index 69d66e2fda5d..000000000000
--- a/licenses/zoo
+++ /dev/null
@@ -1,51 +0,0 @@
-                            COPYRIGHT
-
-
-Certain rules apply to the distribution of the Zoo archiver.
-
-The following rules apply only to the zoo archiver itself.
-Currently, all extract-only programs, and all supporting utili-
-ties, are fully in the public domain and are expected to remain so
-for the forseeable future.
-
-"This program" refers to version 1.50 and separately to each sub-
-sequent version of the Zoo archiver and to all derivative works
-thereof.  "Distribution right" refers to any copyright, compila-
-tion copyright, license, or other right to control distribution or
-copying.  "Compiled code" refers to software that can be executed
-by a computer system.
-
-This program is copyrighted but its distribution for noncommercial
-purposes is permitted, with the following restrictions.
-
-   - You are prohibited from distributing this program as part of
-     any package over which you claim a distribution right.  This
-     restriction does not apply if any distribution right is
-     claimed only over individual items that you own or for which
-     the distribution right has been explicitly assigned to you,
-     and not over the package as a collection.
-
-   - You are prohibited from making this program available for
-     downloading via telecommunications if you charge a total of
-     more than $7.00 per hour at 1200 bps.
-
-   - You are prohibited from distributing this program as compiled
-     code unless you also distribute the source code from which
-     the compiled code was derived.  This restriction does not
-     apply if the compiled code was created by me.
-
-   - You are prohibited from creating, from this program, any
-     derivative work over which you claim a distribution right.
-
-The above restrictions may be relaxed by special agreement;
-please contact me for details.
-
-                              -- Rahul Dhesi 1987/07/12
-                                 UUCP:    iuvax!bsu-cs!dhesi or
-                                          pur-ee!bsu-cs!dhesi
-                                 GEnie:   DHESI
-                                 Plink:   OLS806
-                                 Phone:   +1 317 285 8641 daytime EST
-                                 US mail: 720 W. Centennial Ave #15,
-                                          Muncie, Indiana 47303
-
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 28462d214207..59fd90229efb 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -4,10 +4,11 @@ AUX exiv2-0.25-fix-without-zlib.patch 662 SHA256 66618de00ba07ec660675e2dff99138
 AUX exiv2-0.25-fvisibility-hidden.patch 700 SHA256 2d0eb374e3df7dd58a513b616786e9421f63e575c2812d0b3980e0af29d03d96 SHA512 7dd251fa6e09ecc0493899fdc24431f636e56bf86d33fd4cf4b46fc27b14ce7a68cb4021a3799260398f48b256f403e00b86d143a012d3871e0de5bf57db9205 WHIRLPOOL af10468fad08e51f16141e70409e5ec718d5d669db8203df6a09de2fd824eb46376f87195cf1e744c60c567943c24d54afe388d54eeb5c240f876ebbcbd59514
 AUX exiv2-0.25-hide-symbols.patch 4098 SHA256 b6fe63951717360caad547275c3810c42803ef2d8dea25c75e02b45b9d7add9e SHA512 aed6746329b12769d8084ca79a99eccd6b52449b80c0b3d1c1d6b22294c2b62398366f0715efa207e2ace0ed52740a8eb81af58d17322d42a4674336fd24e725 WHIRLPOOL ac8e900303ac0b19f24b5eff13791dd42459395763d4c8795ff978c1f2c05431b3f3586dedd2b7df375452d3826d7356fc190c4ba3bc8fc4713792bc9d31d033
 AUX exiv2-0.25-tools-optional.patch 1332 SHA256 6c9a3ed5c2b9acff10c3b2f2dd2ca639936beaf6263526b9d85ede579a1d67e1 SHA512 14a8703b86dc4a7a1f210e26bd6532c529f850dd1b25ef116c703a576c389a120e3f8b1087e289cd8b44073071ac88a97503dc2c0cf72f21d32094b2cabbc58c WHIRLPOOL dc7efa7ddcaf1be665cd79aff0b36a0f2b135a87a3a93f9cb6091105b965b4b009e569c447d54d602482410ec59d674d99a71bee2699e8007575b8e2cc727998
+AUX exiv2-0.26_p20171013-cmake.patch 1633 SHA256 1e1d09e876b78e77b4fccccda19cbf3ed4ca782b06805cb4f43a0c6c83af0961 SHA512 7b168242c6524107bafb13b7675d74cb87e20205568e80259d99c46d7328d8c48295977a2f08cc5195bbbaf865ff1e751a22dc7ba0dadbe32d1dbba7b908f9b7 WHIRLPOOL db047f78aaf48cb6d1963175441f0641f5ee29df15312df3726b3b8f306b3f16c3fb3ee75b4c752243e98f1936182337cea786444b2c13d2878cfd53ab5499b3
 DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
 DIST exiv2-0.26_p20171013.tar.gz 25801252 SHA256 137178f0dfc2734b174ba71b8b18d5852fcd5c6f7835eeb1b58f42b93eed7317 SHA512 4e8b10b8593a80615f5deb9fed3420f118338f1161b99c0b86456686fe8d511bb5df956ee25ed5edf990b34bab9efda64be5c80f6efbd78e6e497cb85e2a3ad5 WHIRLPOOL e32b9d98fa5be77bbf50bf275a95db8e9d15b0d40d762bdf512cb8d02f009fc452921df194121cd32d9780de1c83afd0da5cd75ef653a9ba1459f18884f71ffe
 EBUILD exiv2-0.25-r2.ebuild 3067 SHA256 74c21aab30f50186256977871d495681c93e41c8044adc052c518a49b42e1fdd SHA512 30a8a1afbb91ec8b226ea16621cacbd9726f31cd9ebddfda4c7771786a4902123b5674ac9221c990b99464eb0d471f694bf57eebc7e3a22d65ad5e61f4805dfc WHIRLPOOL fc5b37699ba112488230aa7fdd8913318e7527c772cb214b87ecd612775f3fffd6686b8db1baee3dc949fbf8ce856607205776aaea50cf67634b6bb7c74f2b0f
-EBUILD exiv2-0.26_p20171013.ebuild 2876 SHA256 0fe91c6c9b7c4a03cbcc2c881a6f1b0f6f8a03ba674a96a2eb8162ce3aa2c3c4 SHA512 aba123a1b099598d17471dc83270b4ce6ce8a0aaad88828e1219fcaa4fcb2a2de68b4f06c54f410fdf049fa8b271373913477177e9b75074894a7e16d092d225 WHIRLPOOL 4fd455619f90432886daed16441bfd06d4842048bbeafb0a556386c67a708cd6e377876695b2251394437be4e5a11f15929936bcb10dbb6673d9935dabb3b807
+EBUILD exiv2-0.26_p20171013.ebuild 2920 SHA256 266ed17819513603bf24cf76a361fa1e829ecf846d7418ede626e9bde2b20267 SHA512 695478c1a0c2ef7b352ecae022118852c5ab34d4b4761ecd6fdd72c118febc59cfbe8916c344f926794ad3cf2524b639feccd3c746be57796628c1e3a210fe56 WHIRLPOOL 1558a607e90e3396cbf272b730c57ac1726e42e7a19546b4da0a75579b1046ddb745ccf1e76d3a148bab9a5c6d671c043bab8df1f60e6fa372bdbab692869f05
 MISC ChangeLog 6407 SHA256 169192c62c5737f3e30c0f97815a85216ef6c50714d94759089db57cc60468c4 SHA512 dbadbe62c5c985e88553f788bf6b22c98f9c4001d53882d8cff3a0e7fd23aa49dbc9e9dc72854578e711f5041f2f0182226d236946042f349a9ebc015b2a89fb WHIRLPOOL eb2926f593eb897554b5e4c77d4287f7718134e5d88b56ba4c48161d04834a8cd706989b456ba1c707303d6603270ae4cfb6d358c8c2f91bc8f3209caa9e2947
 MISC ChangeLog-2015 18145 SHA256 5a973e551b2244f4f36a767d98cf41bc8bb61789fc40a7809cc5a98ebe80097d SHA512 3d54f43d175e49db9e5d727eadd616fbae08e2fd1017ea6382b818bf6ec300b782d62eb037b4859b190996e63fb963da4eb7862c00c5f24fee7da05a875d69f2 WHIRLPOOL 2ed9a6717cf228be16bd1aaf6cf4820b02afbd77952685c4d8fe7cb49707c61f504c05053bcb5223626ce9b0ea22ea9e7d308b35a7a80a0c15676b9f8ca5af8c
 MISC metadata.xml 612 SHA256 2700f3a6eb0fea03635790e9e55611f58a19dace74c70d0e0106bd70ef825c60 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 WHIRLPOOL 0996d01f595fe4ab40a65fcc19d2eced4dc31a1c8efddddca353828447ff3ca974499dcc81482d47a3470d9530a1886abde9acfaa2ac75df0e845f1a70402056
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
index 92035195fe46..9aa6302ffd0d 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
new file mode 100644
index 000000000000..c10f125415b2
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
@@ -0,0 +1,47 @@
+From 57883ee664260f5a1b382575e7477ad34c86ce7d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Fri, 13 Oct 2017 18:54:11 +0200
+Subject: [PATCH] Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF
+
+---
+ src/CMakeLists.txt | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index fe49a0a6..f75cbf1b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -291,21 +291,28 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
+     if ( BUILD_SHARED_LIBS )
+         target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL )
+     endif()
++    # modify source lists to suit environment
++
++    # TODO This should not be needed here! we need to fix the previous TODO
++    target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
++
++    if(NOT EXV_HAVE_TIMEGM )
++        target_sources(exiv2    PRIVATE localtime.c)
++    endif()
++
++    if (MSVC)
++        target_sources(exiv2    PRIVATE getopt_win32.c)
++    endif()
+     install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+-# TODO This should not be needed here! we need to fix the previous TODO
+-target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+-
+ # modify source lists to suit environment
+ if(NOT EXV_HAVE_TIMEGM )
+     target_sources(exiv2lib PRIVATE localtime.c)
+-    target_sources(exiv2    PRIVATE localtime.c)
+ endif()
+ 
+ if (MSVC)
+     target_sources(exiv2lib PRIVATE getopt_win32.c)
+-    target_sources(exiv2    PRIVATE getopt_win32.c)
+ endif()
+ 
+ # ******************************************************************************
diff --git a/media-gfx/icc_examin/Manifest b/media-gfx/icc_examin/Manifest
index 8b35e56de25b..346a8579dcc7 100644
--- a/media-gfx/icc_examin/Manifest
+++ b/media-gfx/icc_examin/Manifest
@@ -1,7 +1,7 @@
-AUX icc_examin-0.55-fix-xrandr-test.patch 896 SHA256 1b8e840dd1e4f9183e8a2110af6413c3a4aeebc926bfdf4f586c315ef67bab05 SHA512 a7226ece057eb4ef215852a99437efc57f8173021dffc82e1e7f480832a4cd8fb5f8a76a0eedf450dca42b1346c9871e63b83d24e02c43ae8721c403e85b2379 WHIRLPOOL 8d11b3e9ba57a85b67f699ca2d901a39dd637e7be7c67c42ef3768c39c022f39705e89c652c25e0192225fb2ab8c2c3414bc2806dfa8dc165421a741a6d778c5
-DIST icc_examin-0.55.tar.gz 692711 SHA256 6a6036e4724845368c2ade86c3d29e9cf0e09801f704d02f45ed2b2481924bab SHA512 503d932890c747b9111167df360e9deedd985a4cd434610a6c0de42d4d36ff22907c1441485731349661ddab85d39268fcfc69c035601c1066ec9b63566f491a WHIRLPOOL b6014338eb79e3ac2bdbbb7e4f817a49cca0d34e6dc3b10fe74f6bc4cc1c85d57d7b76d53574aebdcb7dff599a1f0ade1f809006ada01977361d59a64ca8d413
-EBUILD icc_examin-0.55-r1.ebuild 976 SHA256 995cff1cb94c465e28f04c6bf14429f84ab76858aa77cf16bd3c00fb7003d302 SHA512 ce29066e0b6d7d91486de60dc3f09495924e4b090d7d60020b0e7cc75f2cce4e5e037a16ec198df18f9e5dad6d4e0cfa21bf66d47410f02b1aed6dd0f003b6d6 WHIRLPOOL 9df97471442c8b0e2f03cf2cc19f9b663d5a648115545c94a58c97b2c70b7782b12e718619312ea3a5f394a4f52fe5ce9e7dfcf92a75c328168a1be19124cf69
-EBUILD icc_examin-9999.ebuild 921 SHA256 f76cb47ac872189f02bebff881686d4003ecec34e0ec194d707bd0f4d75729cb SHA512 2f04f522df9bf49bbd8d676fadf9d5414ef94f9396591efa8eb425f270c1d51110b80036a759afbc7bd20a35a7d36a102e866a232078109e92c23bd6643898cd WHIRLPOOL d7f87cb4242753acf067f5a0ff1612a12f75f735305401aaaa04745c420572084df810b3aeb5a33ecb87ec357b3b9da5c8628f22e32f45f368c523bef99414e8
+AUX icc-examin-0.56-fltk.patch 754 SHA256 a8d92211bbb2dd67607c291ffabac47de84972926ee04ebf46540a7e5b7e6601 SHA512 ae8bb21951107f9424abafe81015fba13556b2eaaf49f16a6694ce68e7f86ea4cff1d977364dd7c3c3fd5c7163739860a0f0ec74b28200c7d0f0ad2c43711f0c WHIRLPOOL ab01a5b6e9240cf1106408e674ba4d6c4548b86c75ece6e46017b814259de9004a6a1dcdb1c9e7f147f0dd9fe09850011be37fa33a6c8d30f1d383fd9e0af55b
+DIST icc-examin-0.56_p20171007.tar.gz 724698 SHA256 1a7acd84a9891284d84f025baa37b97823fa6708e4b5b26be5f58d52381d12aa SHA512 79d4e42c0ae389128ee6514892d0019b0cec17466e8d8e47efbc0a5114c0d365732e26a9abb442a3bca3c2e83ede4dca407cad3bf250492a36832f8bdebeb2b6 WHIRLPOOL ef06562d25b172ee9aaef143422e0403a89dd0731a9d33a56fd6a60ac560e6f3e66b1bba14c9980feb6a288b4cff1dc2daf9458ca1034ab1c63140bf24b5ea80
+EBUILD icc_examin-0.56_p20171007.ebuild 1117 SHA256 ae5e3a2c5941ab3575d586d91638f0279a7fa7d4ccbe21eaa4d614b6752f9de8 SHA512 678456e641ed9ef1a91401dac6c3a80ba66c145885521b1d3ec3d68c4e3ac83fa938351876e6b0fb698686261185605bac7d0bcdffd0f7692873cb4170896da9 WHIRLPOOL 5b01aa58dca3e9c27a673f5740b683eefb4af352dcb4c2a45fbe2065a24ee4045d41a499e66b18d95804418560c20563b6afcef0283645ea7f8c2f72577c210b
+EBUILD icc_examin-9999.ebuild 1000 SHA256 6c3a1ef649e395dc076c3d45eee288fecc8719d62f4ee978fbb41ca6b6c35908 SHA512 1a068527b8785ace85775815d5d3296ea4d9e19bcd1caac8ae5a066e547db75aaaa82b1e280b6be939bad351052d0a79dc87f78d5608b4f439fec26c698088ce WHIRLPOOL 8adc0bfc82c8c20e87e03caef56428c4e2e3054983cd45c50acca46eadb0d7d1216b29812e8d90aaf7a9a460fdec3858fbcb1bb5350ad53c3a5b315da62c7a01
 MISC ChangeLog 3200 SHA256 f6c0aead1cf65cb3e260a517e7bfaf2e7776945ce54aed6a0ab9fd2f50f113e4 SHA512 1b911e869e7c1c59eace132e2a67491c911da8f79b5ef1b0c45e41f513038ca7429ad69749f996666c40083b19fc85166d32b715e9fa8c8bb3eb719add7d8c93 WHIRLPOOL 35f21a77e9893bbe286718c17f4cc67fcc492397d92c30e8fd57ea852922e8fd37681bd64f9f43f8e81fed1bb5c31610222f04d9f913092a29d32c847260d183
 MISC ChangeLog-2015 1796 SHA256 0bc367d031970d60d3c0b0cdb5be9ef821880e395ed48d66ae0a744f82db5755 SHA512 8ab752449e672fa12661b15e2faa661dc86f75462fdfb9cbde53f007657acd1c0ad0c4c5d141ece2a206f8a6fedd13c0824ae4ca3338e10575bd233eaaa189fe WHIRLPOOL f4c5e6604b60f4aac5df7c6a3709ddfbf10d0ac809cf2d7a499ad069d13aea333e0ccbdbe787d15abae3f16b4c81c70ac263641780ccf3c060e72cc06a1f7961
 MISC metadata.xml 382 SHA256 32192873b2fe6313f1382602937b93d69869936bf5de03c3ea88278d281a6333 SHA512 7a5dc10551b676b47699b1a41a1016528efd794de47216fbf68eea9645cb4db32179eacf87fb4b986308b9a64c0cfd36406ed8326859e5247c8f9eb6083be8be WHIRLPOOL 47ac441ea4d3cfe460c4a71981980ba2c9cc670ece3ea47efedfe5a0852af154c739123839a2dbb523cca52dfb338bc93f12edda93bb54cdc16da45728bc3649
diff --git a/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch
new file mode 100644
index 000000000000..5e4645a8b0ef
--- /dev/null
+++ b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch
@@ -0,0 +1,27 @@
+From 172889b358d0801da8d2c15196129cd911e3afc1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 14 Oct 2017 18:59:20 +0200
+Subject: [PATCH] Fix FLTK include and libs
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 60ee08a..41f7c61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,8 +103,8 @@ IF(FLTK_FOUND)
+     SET( FLTK_ADD_LIBS "fltk_jpeg" )
+   ENDIF( NOT JPEG_FOUND )
+ ENDIF(FLTK_FOUND)
+-INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
+-LINK_DIRECTORIES( ${FLTK_LIBRARY_DIRS} )
++INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR} )
++LINK_DIRECTORIES( ${FLTK_LIBRARIES} )
+ 
+ FIND_PACKAGE( OpenGL )
+ IF(OPENGL_FOUND)
+-- 
+2.14.2
+
diff --git a/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch b/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch
deleted file mode 100644
index b9acf4c2d049..000000000000
--- a/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream as https://sourceforge.net/p/oyranos/patches/6/
-
-Michael Weber
-
---- icc_examin-0.55/configure_tests.sh
-+++ icc_examin-0.55/configure_tests.sh
-@@ -689,7 +689,8 @@
-     if [ -z "$found" ]; then
-       pkg-config  --atleast-version=1.2 $pc_package
-       if [ $? = 0 ]; then
--        found=`pkg-config --cflags $pc_package`
-+	found="yes"
-+        cflags=`pkg-config --cflags $pc_package`
-         version=`pkg-config --modversion $pc_package`
-       fi
-     fi
-@@ -703,7 +704,7 @@
-       if [ -n "$MAKEFILE_DIR" ]; then
-         for i in $MAKEFILE_DIR; do
-           test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR = 1" >> "$i/makefile"
--          test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR_INC = $found" >> "$i/makefile"
-+          test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR_INC = $cflags" >> "$i/makefile"
-         done
-       fi
-     elif [ $OSUNAME = "Linux" ]; then
diff --git a/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild b/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild
deleted file mode 100644
index bceddcfdbc66..000000000000
--- a/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin"
-SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/elektra
-	media-libs/ftgl
-	media-libs/libXcm
-	=media-libs/oyranos-0.9.5*
-	media-libs/tiff:0
-	x11-libs/fltk
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch
-
-	sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \
-		-i makefile.in
-}
-
-src_configure() {
-	tc-export CC CXX
-	econf --enable-verbose \
-		--disable-static
-}
diff --git a/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild
new file mode 100644
index 000000000000..fd9e3b7ee0e5
--- /dev/null
+++ b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=ee9e8cd013766b0df2c5e3b4416f985322b22966
+inherit cmake-utils flag-o-matic vcs-snapshot xdg-utils
+
+DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
+HOMEPAGE="http://www.oyranos.org/icc-examin/"
+SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/tarball/${COMMIT} -> ${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/elektra
+	media-libs/freetype
+	media-libs/ftgl
+	media-libs/libXcm[X]
+	media-libs/oyranos
+	media-libs/tiff:0
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/fltk[opengl]
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/libintl
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	append-cxxflags -fpermissive
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/icc_examin/icc_examin-9999.ebuild b/media-gfx/icc_examin/icc_examin-9999.ebuild
index 045fa7a82065..ceb2821c90c8 100644
--- a/media-gfx/icc_examin/icc_examin-9999.ebuild
+++ b/media-gfx/icc_examin/icc_examin-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs git-r3
+inherit cmake-utils flag-o-matic git-r3 xdg-utils
 
-DESCRIPTION="Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin"
+DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
+HOMEPAGE="http://www.oyranos.org/icc-examin/"
 EGIT_REPO_URI="https://github.com/oyranos-cms/${PN/_/-}.git"
 
 LICENSE="GPL-2"
@@ -14,30 +14,39 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="app-admin/elektra
+RDEPEND="
+	app-admin/elektra
+	media-libs/freetype
 	media-libs/ftgl
-	media-libs/libXcm
-	=media-libs/oyranos-9999
+	media-libs/libXcm[X]
+	media-libs/oyranos
 	media-libs/tiff:0
-	x11-libs/fltk
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/fltk[opengl]
 	x11-libs/libX11
 	x11-libs/libXinerama
 	x11-libs/libXpm
 	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-
+	x11-libs/libXxf86vm
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	sys-devel/gettext
+	virtual/libintl
+	virtual/pkgconfig
+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch
+PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
 
-	sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \
-		-i makefile.in
+src_configure() {
+	append-cxxflags -fpermissive
+	cmake-utils_src_configure
 }
 
-src_configure() {
-	tc-export CC CXX
-	econf --enable-verbose \
-		--disable-static
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
 }
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index 400ca5ba927e..508fe3b215b1 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -2,7 +2,8 @@ AUX Makefile.shaders 192 SHA256 c69be93547d8afda3526fbca5fc3e654b7a66f4d0be6f21c
 AUX pixie-2.2.6-autotools.patch 680 SHA256 c9010ced0371bc3355af70369418d4d86570267169902eb2b3fde40f89ae2263 SHA512 7212c644118af829c3bdc87998eb009b9235fc608054a1ebd1bc0f00c2e6a00f3959c2176db3ad451276351678008d312ecefbf4736eaf63989965c55eb1ac92 WHIRLPOOL cc6542055bb221cb250f44127f7e1fb4ee1109f478ea133ff98187b6c07506bc0b11c4bf71d65108190f313c32e0c5aa9f138552d83f0466d660045875363a23
 AUX pixie-2.2.6-zlib-1.2.5.2.patch 2064 SHA256 493d0af97b30e4e07714ffa14da2434018fd35a7afd67a9ae760fd3756152ff3 SHA512 f0cc7956117dc09cae574d5042a897c0f5ef9b26040c75d4c7b2ceef317c89431cceb7d32f61b5b5151efdc043e8968ac9129e1d1d6a7ac9720f9056e6db05d3 WHIRLPOOL 03bdf376dd0d6ce58e1e812dcbfe137f465b74ab8d5f971aa5e3ca185204fd1f189253848b9da6df099153783246d46f36253c9e576991dbe0cbe1028e14cdf9
 DIST Pixie-src-2.2.6.tgz 9993504 SHA256 ffbbc404265aff3d4c0303ec91549708ffba8edefc0368ac119ae2e588f35037 SHA512 9b5256f5028d6091da293557e5385e53d8bdb2b3bfc7a89228b436b75424d7bd400d04e95cc04b71526aff026085f2bc2bd49e1ac0c54d3055f827fd5d05cc95 WHIRLPOOL 68599850df3ab0207d75e0c9944cce605002d550070062f83b440d0baf86386651d812f583e8831abeea2cbaf60e5f8160f7fc141eb7bf9e1712355914a27b37
-EBUILD pixie-2.2.6-r1.ebuild 2751 SHA256 563981ccc3455d5c6542a3ab6228224924a5b9b2da41c8ef22c79bd8a082a1ba SHA512 529cf7cec81dd0f773bb7acbab64d70c64ea0c9a31117aee310958593a9d5335bb4cd7520960eaf4fcb92f427ef8dad93d2ccea220516bd413e9581562cbe4f8 WHIRLPOOL 9a313c0dfd69dec8aa4bad95c6a0b0890a9141fea992f1f9914d97ff7f9793c6f2fb3b83eabd9f1ca34b03214fbe15ee3e33e6436a5327352888a8bc7316208a
+DIST pixie-2.2.6-gcc6.patch.gz 16661 SHA256 4ee7442697b07c37255a1491fadcd2005efc5510d98d015114b7ebaa7632b0d0 SHA512 2cada11c95df1dde44119b97b44ab8550608427a2351540117655055d98a5ca142bc1fc78e8fc5ab25b8bb33385a7914114796a88cf83a232480e5b84bec57fb WHIRLPOOL d09cee22410ada1d3c2ade6140bcc3047af96ccaa7f35420e02ebb01a7c14dd1edff036257c9fc1b7fbe343b740f518e7ed32982673ebfbaa7c53ca532e5ee74
+EBUILD pixie-2.2.6-r1.ebuild 2872 SHA256 05ce3818336b591310b65cfa320d1d8703244b1fe5f0705b59f0c7ffe49ccc4e SHA512 a7498b2c86f34763d8905bfc79866b1aac48d16314cc3ea94dea72edbedc0c277c65305da8cfe960dadede701a477e1eadb9487d335c44707413b3d39c6fb48d WHIRLPOOL 6b82f95aaf92d6291227b2fe47edcb49685241f4765bbf006bf60235ee832ce4a5f0358e322436e9b0d503a106cf5b415fb44662ed2f43646bd3231b9d41cf7d
 MISC ChangeLog 2981 SHA256 c316eca3eb3a5dd124aea6ffba6aaf6626c1bec59943543fd829fd97159da0e9 SHA512 f8e7ab6fa2b7a21d4a6bd06c74ad12d0b0bafd8a4270304efe1a6335e047de00a8ac4fc219da653e6a4e4592f2002ac5465dfef64f985c68c5db446ab124934f WHIRLPOOL 382a748ca5d4c96fe5d33ffa44f67a80c3b929f112f3fa7340ee4de0c8dbae737facb1cb54fe7e55b4de53e4a716946eb4f1823e0afc44221d3182d8826445ae
 MISC ChangeLog-2015 10382 SHA256 4c006af23b8ec95a6b3961c97461c478e1be50c0f187df58e6af90f2de24d1d8 SHA512 bd4125433c961dc9c09a67094aaf038db43c45566e11ae145d8b5975c3b7fdc5f1c80c5e490ec28294c0e806951eace65806110851472a0149e8fa57db580caf WHIRLPOOL 1fc7c8962f13e8752cb292549cc0f2110316bb9250aa9e3e1c0ac88b54ba2c23cb87a43b57eed4993108e1bde6fb35048d2937982804bac249f37b873861f0dd
 MISC metadata.xml 544 SHA256 9b565484c85fba59fbb5f75a547390f2efa0957244ae7aab5e89a3e405027c3d SHA512 961588ff38565e8a709b30f704d099676d73f0d1cbe5b266cc26542d511648a740ca430ef845b290c4ad0bc2ffdbe15706534b1f6421d975e66eedf6b6853c89 WHIRLPOOL 93259831d532a3180cfff14f72db922abd46b73d13aaf6b5592496b7c41666f2fd8962366d90ec1f0db61d8359afc328d7a8a1d00367433fbaeafba2a92c9f27
diff --git a/media-gfx/pixie/pixie-2.2.6-r1.ebuild b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
index faa1c54ca862..5a71b52b4754 100644
--- a/media-gfx/pixie/pixie-2.2.6-r1.ebuild
+++ b/media-gfx/pixie/pixie-2.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_PN}"
 
 DESCRIPTION="RenderMan like photorealistic renderer"
 HOMEPAGE="http://pixie.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz"
 
 LICENSE="GPL-2"
 IUSE="X static-libs"
@@ -47,6 +47,8 @@ src_prepare() {
 	# FIX: missing @includedir@
 	# https://sf.net/tracker/?func=detail&aid=2923415&group_id=59462&atid=491094
 	epatch "${FILESDIR}"/${P}-autotools.patch
+	# bug 594354
+	epatch "${WORKDIR}"/${P}-gcc6.patch
 	eautoreconf
 
 	# FIX: removing pre-compiled shaders
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 54f788f105d4..e0b531b46f2b 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -2,7 +2,7 @@ DIST libmtp-1.1.12.tar.gz 776555 SHA256 cdf59e816c6cda3e908a876c7fb42943f40b8566
 DIST libmtp-1.1.13.tar.gz 801519 SHA256 494ee02fbfbc316aad75b93263dac00f02a4899f28cfda1decbbd6e26fda6d40 SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77 WHIRLPOOL ce0e63f07a60b7dd71e7d413d4ddafd215c78a4bf9782ce1f74777871d751f302f37da1a09a05c454c865dfcee7c4559a85f9602f95a7e0401af50a119b42c16
 DIST libmtp-1.1.14.tar.gz 804354 SHA256 3817d3e296be8f1bc527385585780e70984e8e0d6a0d00349240d67e3df412e8 SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1 WHIRLPOOL 52f67b1425979d37404ddbc0c14098849c66e2e21003b956094f629bba1f5f5ea3de4eca8e89bfebfd4c7d2347f8ac804a44f838776f542cc225e998b980ee91
 EBUILD libmtp-1.1.12.ebuild 1589 SHA256 62e5b863cc8780ecfd3b7af83a71bd01a390e1564644fbbed2f285b5b171f7a7 SHA512 878072bb351d6d5e0de55c534d495f7536d44af5b8c01644cecac86948f951d4801e84477e8ef5bd45bedb3de33b3115933bc5f808cd147821730416c03b1915 WHIRLPOOL 878ec4460a202c428cc75f2286728b6e35d24926232df197d4dd4b03a3783c8e72ef591828fe2b471b64cf0c93ee2baf957665b55b0c377f85be38ece74550cf
-EBUILD libmtp-1.1.13.ebuild 1597 SHA256 a23322cab933b452d90bdff89823c5c8a584a7f715706a89cfcaf653603495bb SHA512 cf11b08abd537b59f1e72b9086afa08bf6b742839a3ed8a77dbd068b7cb243b74e0bbe806b24e2a5623610decc226ed3744ed812c073561681af9d9269640fa7 WHIRLPOOL 2245fb6915e5de28c8df275efa0eeeb7b39fe13254739179f1d82a04523a07980f58e7cff9c4fe55455cd6a6840e28a839a9bf22add57d4d5228ce0d7bd85b66
+EBUILD libmtp-1.1.13.ebuild 1596 SHA256 dcbb05bebbed88a55866b9d9b9051fc7ac7ac5004c8253cb1f700b98f7410211 SHA512 fc4452159dd8d8d7285002ea14f8ed64739cacf00551dd0408450f8370480de0388ee27b27ef617e239c24aef63e239d22265e8b75e97af49bd875a71f55df8b WHIRLPOOL 824200c105378fb4f886a6b93769ad1001dad210e85410bcb8c4dc1414c30d89a7daa22a3f9feb54353a83b3fde2a9d82e3adf67966fee6bed2a2770e44f6893
 EBUILD libmtp-1.1.14.ebuild 1603 SHA256 9097a31a9573ebf98db3ca14de70d8d67b5dded382b45aff956dc6bfcb443044 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a WHIRLPOOL 8a7c58813173b7ab3e2c37a18abe1e24dd84ddac21080ee9ff7250bcf8e65ceabb11e673aebfc47b593edaf49b33df91b350b640d8b10601e13be25b49cecdca
 EBUILD libmtp-9999.ebuild 1603 SHA256 9097a31a9573ebf98db3ca14de70d8d67b5dded382b45aff956dc6bfcb443044 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a WHIRLPOOL 8a7c58813173b7ab3e2c37a18abe1e24dd84ddac21080ee9ff7250bcf8e65ceabb11e673aebfc47b593edaf49b33df91b350b640d8b10601e13be25b49cecdca
 MISC ChangeLog 5382 SHA256 2c9491576cb228e2773bbc7324c84a335ce77fd9475fc4ba188ae7e7e7dfd3f3 SHA512 debda09dc43c72bdc2136f461e502cda2a5ad2ca4a3624b7e95e03140a4f9c1ce9339e43bba108b375e3548712d6dca07c725365dcd96f72ddefef0db8be768a WHIRLPOOL 55e156830ddea5dab42bfd8a06d053033ad152390b304ea576028e01039174812f4dfa2c2f5568167d8bbaa4dd3a8c7d369b7e776b450f2a75e9a55a6424f3d4
diff --git a/media-libs/libmtp/libmtp-1.1.13.ebuild b/media-libs/libmtp/libmtp-1.1.13.ebuild
index 43aab98b44c8..515e227cee7d 100644
--- a/media-libs/libmtp/libmtp-1.1.13.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.13.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 7ca82c29019f..f2bceee8963c 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,7 +3,7 @@ AUX libprojectm-2.1.0-multilib.patch 1245 SHA256 26466ef3983e7491b1cc49ca21edede
 AUX libprojectm-2.1.0-path.patch 593 SHA256 887ef4d5ef8c37dbbee6ef375f47e031c4ed7a95ab506b8bc8ee376069984631 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3 WHIRLPOOL 1965eb4fc9121f273ee2902d4b18ab05721246415286f4082a757013290d23238205526414dbb18a779c77d75bd42178e6abe7ddcafc56a6d21cf67a4a5a41ad
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972
 EBUILD libprojectm-2.1.0-r1.ebuild 1487 SHA256 b3f652811648f9f98633ac7fba6cced100f67e41ccc223d0e620d14b69d8e557 SHA512 c193f1203dfc28da59eb4d953f172c5f47efaaa661d9d25401e83c9ef9c68c0a3740ee86bd533cbc71b19b0ddf2c62fc1cb02f1169e4c5d73e74de7d9e48df55 WHIRLPOOL 2ed1dd241c47562df31eb1020b00aa53d1e98bbbbcc7729466fb85bdeac1d64ee088a89075f1cfc4b07dde878bea69f4992afc6d8a8256c72de81635ad2eb853
-EBUILD libprojectm-2.1.0-r2.ebuild 1500 SHA256 c1030e5b61f5fd9ddd529eb61b2ac61894c0e58be351c2f66bbc979ffea530ac SHA512 96acaeafb588137a924ac7c3336ed7d6a5414644c0c737383a4b1095ecc405a86068739167a50f9aead2aa872dc1261215868bf2c119f9fc0388d3b1c10e7084 WHIRLPOOL 338ac5139ae6c7aaecb153e2c2475e3555897c2be1a8a669cfdc27c4c2d51a089b21da56a9f37f8cd214274d3f2b227275f83fccdbd12ae0dcbd2f67c687ea55
+EBUILD libprojectm-2.1.0-r2.ebuild 1498 SHA256 51c9aacb31be2a198c5a1d246e71d250badbc4d4ae5116cd4dcecdbd6de4d23a SHA512 e6b5b573b8e6536c8ae2076501ae6b50b30be2e26e69608ad85cd42510933b7661888a6c02413cd0db143861652d8541a8a8974afa7403cb00e18e2e1e78b902 WHIRLPOOL 690dce622fdc126343e141c24554ce7df12165d76ea7a89d1f1232628455f6b01f2e0fcc061c990115c096bbd12d12b8099eb04030b7530c94e244c3e2608807
 MISC ChangeLog 3306 SHA256 de2e37250d05afafe9dc7140acb819626d8097157529d375687f8cdf657ad3ac SHA512 88a66209f27a1b84a0c343b9d1191d83f412ab1a8afd9d071ef945ab3cf005f63dc60b5e0bbeeac0d5eba440dc45724c10986b1c4cd64e80eeeb7077393818b6 WHIRLPOOL 12f14de7ceae134005203b3047afbb235f45dce9e3b4c11131498db27d9c773b4711253f8c122c0f441d9958d5436fea031768b7e79479e82f4a6f18482fe1b6
 MISC ChangeLog-2015 8622 SHA256 78cd5658f1b616e8b74a9363b0316a9de9292dd1b841a3bc43dbfed51a69f8c5 SHA512 f72fc69541b07f8d832268350f3aa534c8d3916ec11a503d1a39841a312ce062848413132a2d0e6374f61259c30f909532f92cecdb8e5fec87000e3bd9b4089e WHIRLPOOL ff27c28a08dbaf3fabf131444473e80d680de96e75381b2511afc5304b85b79ef7df341a058b2ff340c90f36223bc88c205da6435c617324c27e993fec623a2e
 MISC metadata.xml 331 SHA256 7980d09ed08ac1b06efd12fa6022b052f892c81eb21e0af43115341b4bdfd1ff SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740 WHIRLPOOL 364e9e4036552c4311c7ea3f7ec078fc120ce2f2cb3c8476ffabf4cd18cae4dd49f8cb7335a32d0e75a5da5c81573b9bf581855fce96c987136400bb8fdc14f8
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 528900f6c3e7..4fa683b4edf4 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 977d76505a5f..602946b8dce3 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -2,6 +2,7 @@ AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 SHA256 edea4de6720b9
 AUX libsamplerate-0.1.8-lm.patch 215 SHA256 e630a4aca5f8fbea177dd2dde5ca646d4c01540c6d857293796810ebff7a7025 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a WHIRLPOOL 69b5762a048b4ce1ff269be504af3912f72e143f3969117d2cfdb7c5f8e2f0f743cf7b537d1fcd085676a0c546ff8e9226b82e4dc590f69d7618b466512ef8a7
 DIST libsamplerate-0.1.9.tar.gz 4336641 SHA256 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728 WHIRLPOOL 3591f08cd64f731a8bdd02daabec6b7bc6bcd9f6806bab4f687f3c120481d4cfbcf5fd7752052a6147358b7471549c99d963615bda89b9679b1e091b636e7b8e
 EBUILD libsamplerate-0.1.9.ebuild 1547 SHA256 351e344b36e99df811448cd3bd45d3d0b9bbebd7c7a0354efec16f53be322436 SHA512 35da5b5fcb387d32ee2dbaf09fc68a4bc6cfe3561fc2f2e363cd5eca4ae640bc7f2789c9bf5ae13ca8003b1ef70ac0532ee61943fec710b55d06f31d12264d34 WHIRLPOOL a2da718639a02766be835b0d4e6e462669e12408bfae05bcbf86971ff4c0d8bf3c9708349f78f84089e7b6c25c655206b6ca3c193724ea1009f708722d06578a
+EBUILD libsamplerate-9999.ebuild 1328 SHA256 4ea9c1270cb70b5f7ed7dff54d2b72be07caa2a81dc7b6952d69262fca818937 SHA512 e1628a69023daae1bd4a50fbc1b4b63e8438dcb56a7c2ca1a991fd5c3e0388d0d3e4ea68df3c9788f21ac2b2afa48053767810fb0098da58be832900e1be8f24 WHIRLPOOL 39a2434fb3635e0af45ae13b889a8f8aa21ba59195bb619f5d08fd6aa8a7a102583ff512384f7f7c2c6e7ce8ea678fc927584383840276c82a5dcf5e77834d5c
 MISC ChangeLog 2723 SHA256 047a7ab7ebbdfc3b79074fbc2ea2cae8975cf41bd2f693128a204d90c43a41d4 SHA512 646e5f4da0e337f72dcd18392766222be5e541640ab28e34a48bea8dc8f37ab6634f05b55d862c8a82538bd244dec098a0e9534f88d38e074b59e4925665fcaf WHIRLPOOL d4374da55d6e7c8536b866f32f1aef2344f646e9412c9910cc9fe119341ab67c6ef52b8f5c31fca4124a99970ed0bb162d1bf6b81e70f296fd229e829bed7927
 MISC ChangeLog-2015 12116 SHA256 c836ce2b3f9f8d49a6f5f8c4dc2b93548917566ca89d3e188448545abde9d6ae SHA512 5e356946bb6795d1e8b0f8d2599448eedb5702f4fef29a98496ddd64f6cf629ac24a718e2c10bcf4f268ae7f03915aad9f6d56bd2951f4e23d6065fd6106af10 WHIRLPOOL bb2763cd89cbb34a2f16e109c04c1fca8bca29236fb539302adc17b2dd4aeb7f51d829e14b26210b92d7b2f3d589a35b91367fb804c9825016ff57b6430e6886
 MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
new file mode 100644
index 000000000000..e92848835512
--- /dev/null
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
+HOMEPAGE="http://www.mega-nerd.com/SRC/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
+else
+	SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="sndfile static-libs test"
+REQUIRED_USE="test? ( sndfile )"
+
+RDEPEND="
+	sndfile? (
+		media-libs/libsndfile:=[${MULTILIB_USEDEP}]
+	)"
+# Alsa/FFTW are only consumed
+# by tests, not by the main library.
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable sndfile) \
+		$(use_enable static-libs static) \
+		$(use_enable test alsa) \
+		$(use_enable test fftw)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index af214132ace1..6d838affc580 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,6 +8,7 @@ DIST libsndfile-1.0.28.tar.gz 1202833 SHA256 1ff33929f042fa333aed1e8923aa628c3ee
 EBUILD libsndfile-1.0.26.ebuild 2692 SHA256 ef280ea735df622463f0bc6f903259f17e3787a8e0c6d9d5e374113878fc7b94 SHA512 94cd99345b65b581616bbf44a6218359c9e10ed2378b651616b240e05dbfce60cddd53cbbbdf369b70d54e4f90480e97d6b858836a21f130c82e51f7340e73d9 WHIRLPOOL aa5c4a6f2cfb3d706e9871bde49c7e714e9ebb0ebc6b3711b552767d76aba32fe0b68dece177463a1de7197341e4bb0c9a1afafe11629df0eec199338989d590
 EBUILD libsndfile-1.0.27-r1.ebuild 1912 SHA256 4bcaf142b5ffc70de136bd314ac6ad07130d2d00c9db347cacfa60d539795d3f SHA512 67f8f3d757dad12c5a087cc49a54b6b6d93be7d89fad9ef5e9fe7c89fb013d3f11688517574c08e258a50cade576dae82b1ca9b996243c84d97ae85987706f00 WHIRLPOOL 9b59c050d342a660601ae7c7b45c07bac9791a212342c50fdfe98c562e57d6c9ff6b7df3904f9ec97a50e4b4ac682839bcb44e09a2999756fe99dd197eea9ae8
 EBUILD libsndfile-1.0.28-r1.ebuild 1664 SHA256 254e40bf34d5a0b00e205af0f08bf5412c5433f994929c8defb1ce791b8385e5 SHA512 49446be5c9f84afa4ffaae7b1dade1140bb98de0e91fc88d0ffe2cd1e782cc56b9f879f00a255b2b109cab77280ad99acb5c12a9b564ce56f0b57acca119e2bd WHIRLPOOL 558187e2fa1f51d507c4c1bd7a650f94ec175d9c638d828c59cf856bda7a55280b23f0d9610fb0b9e183375ff6c4d1559e91ef7effe0af4ae056368f6be8a00e
+EBUILD libsndfile-9999.ebuild 1745 SHA256 df117ff9c07b7de0e81341680362d4b660dacf6d1a2c12602b20d2851d3bbce2 SHA512 37a4087046ba8fe41abd09bc16f485e8ca9ce1938021281ff09a5b2b953ed88f935389d13a9b1f6286bd3d35ebf727b4708cb117c7510ef4067f6fb39758adc7 WHIRLPOOL 3bdcdecff0580e96c9bec4f4a590c407243831fa4c9dc8fbaf03a38eac3f73784db824b49f81c615e6d82554451438ba1f0ed64f5fdcdd30778d2b9766df2a25
 MISC ChangeLog 5750 SHA256 9d1d7328d23be213d42365977269e84f81041297c5776063d1864cb0af9a7327 SHA512 a0f8be5c80ab861bcd5defb11ad32c90c64f9679af0476322d979aaa8bd4f088deb985e298e8c5640e6fc75cf68c2a229062c77d558fc6d685b36458146d5a32 WHIRLPOOL 1aff80e5eeb64493716cf32bd5e058db706a501124d3dad23ac0e3ca6e864986dca6a882d41c76f3e0caf561aa37a942c4ce1924d5a07703ae792748ae3f8ef3
 MISC ChangeLog-2015 22119 SHA256 fa4675ddab48c3377fd1292e3abfb2ec820857a4a14844748fe2f63352c82370 SHA512 9c8978c4608e8b7c042050e6eda234db8541c246168670b6247c8f9a946967bc34b68cbc8abfe10046aca483f5faa1b7cdd28988a350d6782b730d8e2802dea7 WHIRLPOOL b314308b8409737eca0adfd7e255983ec4db1e3c64850165a56c7f2ca56eccf8a74dd7a7cda30b3346b22af0e2c5d2b9acd8e1bed4272ef45da074494e0e7da0
 MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
new file mode 100644
index 000000000000..eb28af81fd55
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="A C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
+
+	DEPEND="
+		${PYTHON_DEPS}
+		sys-devel/autogen"
+else
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa minimal sqlite static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+DEPEND="
+	${DEPEND}
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	if use test || [[ ${PV} == *9999 ]]; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		$(use_enable static-libs static) \
+		$(use_enable !minimal external-libs) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite) \
+		PYTHON="${EPYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 1a3b4b80dcea..5b012828dacb 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -11,7 +11,7 @@ EBUILD openjpeg-1.5.2.ebuild 1974 SHA256 01988d07b71b18f2885c9b6f09f85e1cdb41b63
 EBUILD openjpeg-2.1.1_p20160922.ebuild 4088 SHA256 ac71ea606718abdb2b6af8a5afbfabc9994a87fe1dada0f800f5442cf485f14b SHA512 47b2f5438a3cf8faeb541abe3f635bb2292543417dda4329e2628a187d9644a2330542f6d6477af2f86f3396240954e4dec5201cfe7a0869e7ab6fbef22e722f WHIRLPOOL dc8edf8a299c3ed7075b3ffc0ade49c537e2cde7124ee0e5dc6a327f410939a1e15274e3e3c862825bae2c0003c2faaf687ee575ffc490427dff90dc35c346ae
 EBUILD openjpeg-2.1.2.ebuild 3997 SHA256 5eb3069223fcc3c3f7d9b83cc3df3a5110480bbd86c7c9d84170c7bfdc03a02d SHA512 565340cbb50143209c30ed3296784d9f42ea48c821abf6bf15045d0b906f08793cb7f0027192279f0e868758f093cf4fcaefcc5528d45f044c345fa1ad892491 WHIRLPOOL 2c58b6d1064eb2097f8274f5d7a9d8c8a2d5fc2a5c9b6fe9616e37f6370a964ae6cf6a47c2e59df0b99b1e551f740da4654b3c2685155c84fae7524f26e8362c
 EBUILD openjpeg-2.2.0.ebuild 3992 SHA256 06f5d4020f9a99839ce9322e22bc2e4fbcec64ec2c898e40dfab338f9db8d2fc SHA512 b11dca2fc9fa15236f0e4b8489d5ae3ea4bc72a536f438e22da5b5e65f79946798b90392acd8a435bc1c74c4da4bedc0851cbbd868da00ded31a636328cba693 WHIRLPOOL 5ebbf9cc48307885f8d0936c2454ccedba814a388c9a36e26dab122eb3c048652a7324603c33ffc2c9188ab5ef5febea742e440d02e40bc39157c006d64d1172
-EBUILD openjpeg-2.3.0.ebuild 4110 SHA256 d1fb80f46fe6ed096085be8150a8be375dcb39f13c224a00d3f47069a46b05c0 SHA512 5f5fdde101b30b024067d3d4e11cf3df2f39b2afc4616382443a98f0963edb82e96b1216c811a3785f349f48f698c34b10577b51328d8fc1979792858fdf0256 WHIRLPOOL 55ab2b9916473fa1fcb766a888acd15dc220b7b14219129c8d3a90640c4f23cb45030941649280a0fb7d569ef21a22a637d877a833e4f295bf44815eaee509bd
+EBUILD openjpeg-2.3.0.ebuild 4109 SHA256 bcdf514d9a2fcd31ddd826e500e64021a8140d5f03f607d5e340731582808754 SHA512 a1690159509251189d26e2c738d801e3c6093dac998fcb167e2628b2f6b2c7efeab45c4e997f7c1ae7045f78f05cc68df9c5bd448598c5b8c0bf24aaa523f75e WHIRLPOOL b07ab26aaa221c19e10af78880eaec0a956bc3ca1957ac59a70553a6d662201f2fe231882a9094eaa63f0e6fd243d38067df197bf72915356c3ad6bae60a2cc0
 MISC ChangeLog 7107 SHA256 ab91aa79e988c8ada9fdcd3eb581d62b34f06a4d104898fe6a0692b3822a4841 SHA512 34c554fb7c5b542c4a18b851f5aa9ccdcc47f41ca9815d8a5ebfef6fae9ae65b7265de897980c5adf7a57b1b6fcf7bd6ac0a37b945861a317a578b22b2869e7c WHIRLPOOL 75abb312e47fdf966b704d3dafafa73601a44d32930d243a32e50af0013bb9e286d08777abd2b6a0ba965749d39c94d61a8dd29751fd5d49a14b58446985359b
 MISC ChangeLog-2015 16632 SHA256 16e64b73b25390f6136c6685474f98e28e09511117c2cfd3e80199cadb59e362 SHA512 73cc1e6014a2a2bb5941d794d5b8b8f295ce8a207ecf532d67504ef219eb28ecb722d2fc913de8543abbd94dbeca89193bbb68d9dfb9a1dd774c1018efa0c37d WHIRLPOOL 4297848b013d0c4d5e65238759d36e610010e7e3ea7c4467d5e495fd3c88ce989d78170ff17b2ff69cb991fdb2d1a5772cdb32af952e694691e2a079e0da39a7
 MISC metadata.xml 455 SHA256 b4fd557d0fea3afd283e339e0c37bfa73e89d3e9b5714b218c610c1a50db0fa4 SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d WHIRLPOOL a020c98df36a2844fcd319067e6778dc07558368421706da6220a591ad8c21bedc4e572ae959e09a7e48d4adf4dd26a0f6bfedfe1e763068882ef8ec871a03c2
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 75a932201b83..704ebbed817d 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 6737950888f4..db2c23e585bd 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,7 +1,5 @@
-DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
 DIST oyranos-0.9.6-patches.tar.xz 11680 SHA256 f4db721a57f9b05c843e2f0739b3b699914240ac9ef985d58131fbf4d5950854 SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 WHIRLPOOL 6f9361e87a07130d4af1c4f53f5626cdb36c3764edf82b68b1cfd716f713cb14de73baf3444a0b4c4a99eecffd6217d12d8b9044117a0d4f09b26a615481d29d
 DIST oyranos-0.9.6.tar.gz 2247841 SHA256 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 WHIRLPOOL cd1c1143f02be89d8a45a98e98cbc6ee9cb54036ec7526f3987f141618cb4bb498720b315b891eaa54e081e2c7067fcded063487d9b248d87354618f51ec959d
-EBUILD oyranos-0.9.5-r1.ebuild 3074 SHA256 7bde1215d9bcc28ac02f490f122bb06f79e7fffe5090dd187cc08bd09e4494f2 SHA512 fded025785efed89cb066877e3c7724b04a5e93225da4b2563abab0db72541c867cdd53a1aa5a33eb458602dee3704faf46390b62ccd19f45c4f904e5b70c79a WHIRLPOOL eb7a292cd6b81c34d9784c032ab8a140aaa3c6018f205c4cb44d5f946601a911ea91370c6bc969f965bf7d6a33a15bc8e89199c317bb1cf80d218dfe7eeb79bc
 EBUILD oyranos-0.9.6.ebuild 3443 SHA256 693e59d5a3636d213f7bced34a3906e96dbbac89b0d6ca8c75b9a2e97c474882 SHA512 ec59c4e2b25da6772e49ab6f8c20001e1a182e8fadc5c4266b02fadd23045c6ea1e44dca96e2a2d33ef7f22c9bc54efd0f7e90bc46dad3ba6829192c7c0b0c28 WHIRLPOOL 01526ce600a8809d39b039b627d523ad70823ae57a715db03758fc01b8f7330d81c8e8c52e45a4915debb67e9dd955a8db9b99f8dfadd3141314ca4cc2774b1c
 EBUILD oyranos-9999.ebuild 3346 SHA256 032bbac4d1dc421113617374ea23fb6e2e11df59fbd1aec3ce2d94ce6ed3b354 SHA512 dc2d59a795b8def1cba06826fa56391092c1ec9315b172abe3b62949d96e9f3ee5ab75b1a04c197e8580f044f408a4a67d3e52407f69e6f103250988beff7936 WHIRLPOOL c1d8d418130b651e069db3ec19dde5af512d9f88f0c7bfc04cc83f5c51be439974257c33267a8ddb9ddcde4424de5253e32ae0a16cc39a6cb0976de779a3f011
 MISC ChangeLog 6333 SHA256 c2da21f3df29063fc8664281487950e6407464813034f3b6b01e54008d262f03 SHA512 d27edba60e4bac2518c94407ab0f4d2afb6adc2d975ff027a1b6cb2ec051e9faab43f176e6acb7f3d56e8f85ec16118db65a0b754fae76484dfd4d86b0709eb4 WHIRLPOOL dc50825132e1ce84cd6a94ab137b4cd303e54c5fcb5bc2a931d02348ede486158a0320ea4dd51aeb27f2c89da7633a5be6340b75a5b69dfc57642b45a1b80340
diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
deleted file mode 100644
index 4b23bcc6606b..000000000000
--- a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib
-
-DESCRIPTION="Colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
-
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
-COMMON_DEPEND="
-	>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
-	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
-	exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] )
-	fltk? ( x11-libs/fltk:1 )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-	)
-	!qt5? (
-		qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	)
-	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-openicc"
-
-DOCS=( AUTHORS ChangeLog README )
-RESTRICT="test"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/oyranos-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/oyranos/oyranos_version.h
-)
-
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf elektra* yajl || die
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-config --cxxflags)
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DUSE_SYSTEM_ELEKTRA=YES
-		-DUSE_SYSTEM_YAJL=YES
-		-DUSE_Qt4=$(usex '!qt5')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
-		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index a6896f122c17..65ff220fea67 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -6,10 +6,7 @@ AUX taglib-1.9.1-bytevector-simpler.patch 3685 SHA256 89992db2dd7201bfe1862c1cd1
 AUX taglib-1.9.1-missing-deletes.patch 1194 SHA256 263fbfce5accbcb635b42ae5b7af988a0a8a8d0f2dfdbb6dfd96ebf39421b3fc SHA512 1cc2796401dc1291b19245bd9a6bde9d77549d7ddab96b99b8e0f95c331a1ba7296f7107bd99f6f789cd04dd412d6e330db099ab49344c4dd1a10ccfef203fd1 WHIRLPOOL 8cced81a118f56e36943b1e45aadb234dcd20aa58378bbb5d30a97943b6f0ca4e37ea8381a02d77f8c3f4058fd2598cf450122574420e4627d1b9cedf08b343d
 AUX taglib-1.9.1-order-big-endian.patch 884 SHA256 cc3bd7acfb1c1bbbe0f8299107112bdf572bd716aa3623605f26e4312856ff2f SHA512 4f2c751f03e976da64fc1480e369443d724c420198600ae1a5e9e9cab3172289c73d15b66ec0c95165da30e52dff1d956314fd71fb067e10a11c350566671bd3 WHIRLPOOL dce49ba2b65b4f71a0867104ac81ac3e10cb09e48bf866306d813b03b472e758bc8339dd6135c18b6232a9f6b36369a44c7a6c10a513df537f75f43764fcdc48
 DIST taglib-1.11.1.tar.gz 1261620 SHA256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98 WHIRLPOOL 243cafaf238303eb2dcdca415ced4dbfb49d4890ba4ad5baec25aff9175bc33e3a20835518d461be946805b7b438c50c86d3999dc98fa648d177ac32a4a0b062
-DIST taglib-1.9.1.tar.gz 654074 SHA256 d4da9aaaddf590ff15273b9b2c4622b6ce8377de0f40bab40155d471ede9c585 SHA512 17523b7ebdd089520289ae817b07f291be93fd0b9d3b2891eb4860a24e45943e94d25b99250c1ac477de5e51b08c39887ca13fdcc2dce17867eb60d1edb26154 WHIRLPOOL 962ec0508d8256a54ea686d4fb8d366f23f82bf10df6406c8012295ceda8416a5f23db6e450551b685798d628623eb5247e6ab7b658f955d897b86340baa5e8e
 EBUILD taglib-1.11.1-r1.ebuild 1394 SHA256 f9b549f00463a60e0194619241b1ecfc4e5360120644db541af8b4b90b957ed1 SHA512 6dc269c47c6f869eb5f0e3e547e6d90f77fd7f81f7170bafe59824a4c1d75d6fab5e4c4fcfa22cea96fb6d8ddbf6da8e9acfe8a2089034484b0215f7f0cdcbac WHIRLPOOL a65fbc88d4e79bdff9b2eb8721b8651735590ebc54ab7c10ad95a003e4f41093f7f1986127a84a44f066470975903bf54bf667838c069170e64935edf2107d00
-EBUILD taglib-1.11.1.ebuild 1360 SHA256 4fa0caebd13d0ef1bb93f0caaf8e7999d674ba9f4dda93358d5441494311a9ae SHA512 8c7dd2aa123e56a94b2799fdea76bca1ee02534c770b3e367317eed4594f40a5ab3a38f13e53e35b9284fd5d80e3db27ff5feadf6262bdfda28d1fc9637f26d6 WHIRLPOOL 69d2d704893a3ecf49a1ccd9677f0be7acd60dd9c1a0da3237834fec6a50f8c4008758357ab63d49d9850731c5d79d3c8e5c4c2f9bbfa23f72e861abf47995fc
-EBUILD taglib-1.9.1-r2.ebuild 1847 SHA256 16a7e7a708a28bc819fb358afbba2757c741705c40b7802c9e4f690336674b2a SHA512 d62e4500fdfd5a4ed713e5c9dcfb6a70b04d658df844a548220e63ebc7fde771c34934a44bd9109c519cbc2374e5b81200ddf5695194ffe53c65e803ed7abd49 WHIRLPOOL ee5b34ba07be0fe160992da2b555867f69d9c64a78d18eb8bc98ca7f232f7664175e4e73bf69d293293eab878ede67b5bec5f422bb01829c2a1811927ac4b7d5
 MISC ChangeLog 3798 SHA256 2d9609463502b43ce4d9cc52606aacfb6b41b10dc8efe8d0db6dfc32b0d211f3 SHA512 8720c7e6d323d656ca8c9862b14285682792d4eb87bfa31d78f6c8ee8acac4fb7b5fbf82ec145a76e41dac68cdb5e8c48987e343f985c1123763bd44e745b57f WHIRLPOOL c17222811035b3d57e691d3fbee7049bf960721c22bc6e33dac0039f73983bbeb7745984b0914d1511ac4c4c4e338bbec17fcb2c4e6362883f30c88205265a41
 MISC ChangeLog-2015 19514 SHA256 669deb727b8b32ccde8fc5de4c54fdb49f02c89077217eedb66571577f7e0cfe SHA512 4ede1ed611e1df9a71e9550888183ace3a7eee4ec443e68a4c7ff3a8db88b93583eafedd0b1f3d3aa06a64cf548614da666f61257a95b680052bc019e5a88689 WHIRLPOOL 23ea9a5a684a9c895245c99c2c4a74e26764d98ebc6ea67c1b23fdf51dd4727a313b3d94fc264f67cd66849aaaac3a64b904ccc43eb0d179b204676277513949
-MISC metadata.xml 526 SHA256 d0fbdcdc8ffb2c1aeabc9f35307a2f2564502bd66603bdc9d25dd85e22c3280f SHA512 2441e8b6de28b8e3c098732e411b0ac0cfe8db518b920f1a247855f0759e36a4d47889c04e9ef8f5e9bb82d00d2cd4b6b7f91efcc51971644fa3284b13e56a1a WHIRLPOOL 5e44172d6ee0b73c88751fd99bdd2fc0d1c903c2407b8ee4a0595748c397839e300cd43f0ef1ae289d3f177e742fb56ceba5465d8a140c9fb38fd4c7f547f054
+MISC metadata.xml 425 SHA256 02f90e390da8a3bf142f71e90b5ee45d9114fc2755e4b0f92dc4cd80e33cdb03 SHA512 31bd061f371cc8f300a22c150b86ef163f0cdd1d5e6b1c0ef0652038a2a1a5372a2910e201df28a70cb57f87945636b1ad352858f75714f3889068f94391c4d0 WHIRLPOOL 709b214bdef1438e1d08c25a642a8d245a9526ada7f47d64ef586a3e1d2b38f9467bd5575fa034b67c2892e4770b9505fd71e7c089a1e477174c92f30c798063
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index 6322822c7534..cabb8e8cf5a6 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="asf">Provide support for Microsoft's 'advanced systems format' media container.</flag>
 		<flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag>
 	</use>
 	<upstream>
diff --git a/media-libs/taglib/taglib-1.11.1.ebuild b/media-libs/taglib/taglib-1.11.1.ebuild
deleted file mode 100644
index d064b14e30f0..000000000000
--- a/media-libs/taglib/taglib-1.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="boost debug examples test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11-install-examples.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
-		-i CMakeLists.txt \
-		-i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		$(cmake-utils_use_find_package boost Boost)
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
diff --git a/media-libs/taglib/taglib-1.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild
deleted file mode 100644
index 807331a20de0..000000000000
--- a/media-libs/taglib/taglib-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="+asf debug examples +mp4 test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-install-examples.patch
-	"${FILESDIR}"/${P}-missing-deletes.patch
-	"${FILESDIR}"/${P}-order-big-endian.patch
-	"${FILESDIR}"/${P}-abi-breakage.patch
-	"${FILESDIR}"/${P}-bytevector-simpler.patch
-)
-
-DOCS=( AUTHORS NEWS )
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-multilib_src_configure() {
-	mycmakeargs=(
-		$(multilib_is_native_abi && cmake-utils_use_build examples)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_with asf)
-		$(cmake-utils_use_with mp4)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
-
-pkg_postinst() {
-	if ! use asf; then
-		elog "You've chosen to disable the asf use flag, thus taglib won't include"
-		elog "support for Microsoft's 'advanced systems format' media container"
-	fi
-	if ! use mp4; then
-		elog "You've chosen to disable the mp4 use flag, thus taglib won't include"
-		elog "support for the MPEG-4 part 14 / MP4 media container"
-	fi
-}
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 4be01f357e63..0f1e224f1254 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,9 +1,5 @@
-DIST qmmp-plugin-pack-0.10.2.tar.bz2 83334 SHA256 393ceebc10542af6aa437f1b1b2acbf02c3c141d700a79dbde7f2dae60f7a535 SHA512 c27c050d808bab5704a8303a04780b4ff9c9dc75c438964e46d7de2cffdc341879e0cd2388cc6e0201bc15a3399b83d381bd9fd9dcbba73ebcc4b31a7608a2e1 WHIRLPOOL 363adffaafebc2ebf374530e9394375eac82e8aee95c14fdf25fa29c4d4ee4f757c96ee6c47d822605572f8ff2b02d9a3ebebc6db4a305c2d5daaf2d2d1db106
-DIST qmmp-plugin-pack-0.10.3.tar.bz2 84299 SHA256 366f904c277dfe5e637b88be56fde6b46879dcb19d6f3eb6c363252f4e507b86 SHA512 146e973505fbb554fdcf4a1f0fab64a46a8f89cbec36016dbf02910c1ce925679ce640947d64b5bafc88c6a8905c57e8530bfb790543b6f35f50433501d13b75 WHIRLPOOL cefe3ebf59a85cc59bd78d0203f429c29980049d3bb4e982b52510b50e4baf85834a15d1ed56cc4107e72896d1994ed908977aada4c5a78b3752c1d699d66a4d
 DIST qmmp-plugin-pack-1.1.3.tar.bz2 83314 SHA256 e049920ec6cb7adf296b603c4268f615203e6c1cd0c9de2440b5b141e2e88377 SHA512 05d412da4b0c892b415c7e6a8248c90196da5544be027fac32a051c2e3a187f089e57086ca6858d7591bc7b81838e2ac5e4019d418c95ff3bfb4f7a100f8ecae WHIRLPOOL 460b5f7bf81278ad729929e38b4eb345759c918b41ce5e36ec746d25d9d5c267607dc9401f873d15747e1a3100bfda5cbf02bc7fc085d41ec77d5289f8a3b359
 DIST qmmp-plugin-pack-1.1.4.tar.bz2 84240 SHA256 029fba40353f6b883e0d662c65fdcbf9a23a8f081c1a9438f2ba6772b40d4ff5 SHA512 a7179f87b55279965107bc70f28c1f842a2eb249bd1897ee171b5a638eafebe3cd74da68ed512652e17c41abb7395e8c4ba1585c08d499fbf5d016522c60ea4e WHIRLPOOL 53a61c846a18c9bdea6072e99f1c0b80c0a34bd0b5ebcfe69f63e9936391e2acd07eb59c1d54454a845adad784259db042ecf926e5340035c6dac35bd3cc47d1
-EBUILD qmmp-plugin-pack-0.10.2.ebuild 514 SHA256 74c1794d61108e7972b16a30709acbab4b571b0551a3ac2d89022d4a7112ec5e SHA512 760c81fdd23a64086b5f56b28abdbe51dbbc83a5334541318bd95d4453076eb66cea0085d99fc2709274b7d6945971299b41df6ee64e750cd97b88f2e16ba0be WHIRLPOOL 53f58c471d575447d0126fd924784c5088fa86197191a9d1df865f2b044fb1e3821346d8570a47a02aa1bbbe589c011c8a8c9b7a0fcf5efabeb90f4fdaf24afa
-EBUILD qmmp-plugin-pack-0.10.3.ebuild 514 SHA256 74c1794d61108e7972b16a30709acbab4b571b0551a3ac2d89022d4a7112ec5e SHA512 760c81fdd23a64086b5f56b28abdbe51dbbc83a5334541318bd95d4453076eb66cea0085d99fc2709274b7d6945971299b41df6ee64e750cd97b88f2e16ba0be WHIRLPOOL 53f58c471d575447d0126fd924784c5088fa86197191a9d1df865f2b044fb1e3821346d8570a47a02aa1bbbe589c011c8a8c9b7a0fcf5efabeb90f4fdaf24afa
 EBUILD qmmp-plugin-pack-1.1.3-r1.ebuild 607 SHA256 964d6fad80f6bba8e3ed8a6651249631a266f17f13b7d63fc8419905de59ef16 SHA512 804046131cd3e04767c0ced665afb883d12e06856334d2a314a42c1d876dd47330e4274679d7205e09794d44322b900e0c085faa865678d1d8f71d776d6563f1 WHIRLPOOL b2ab668b036e1bc66d5c3f2ba3ee4d694d4c73ee059eaeb665f8eac13139894b7f73c06a317ceff25fcae6a43164cdec772d7122c2fae041916b8f5ee43c5ba0
 EBUILD qmmp-plugin-pack-1.1.4.ebuild 609 SHA256 4d7abdbdccfe4680aa03f01eb3ccfbc546df82f15d0ed2113dc6ae489263ad0a SHA512 e08386069afef17b29f0b1fd3879aa5d34d9ac003dc95c45e7478ee4c4cc482c9782a225b1d7cc5e20ec5bab39409abd4507b19734189554df7bd2c79087c6a3 WHIRLPOOL c919c03c650efa3a35d2021500a73e0fe80d2d1bd0b905dd221d12740b8fce2dd13864e8e4324c68c0ae55f74b3db3332d01ecd9bc9af133a0c695a4a09ce898
 MISC ChangeLog 7220 SHA256 8153dbf9fef8d3c9b6cb8707671c8a5815ca7f418a837bdd860faac1d88ef215 SHA512 470a2a54c351138880eaf6f49a46bc8ba6494fad87d36c308265092201efbab0fb68daba65294aa3c856b6e459ea725197f371918740b7f784d5c77e5ec9b756 WHIRLPOOL eee1b10c466c9b741d50a589478e2dc463b141f7d6dc776845dde79d80140cf6e2527eadded6a07cf4de18c7d03f16e8d16605e3b555e3e3661d0b672cb72208
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.10.2.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.10.2.ebuild
deleted file mode 100644
index 9ec8989ba496..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.10.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:4
-	media-libs/taglib
-	media-sound/mpg123
-	=media-sound/qmmp-$(get_version_component_range 1-2)*
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-"
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.10.3.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.10.3.ebuild
deleted file mode 100644
index 9ec8989ba496..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.10.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:4
-	media-libs/taglib
-	media-sound/mpg123
-	=media-sound/qmmp-$(get_version_component_range 1-2)*
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-"
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 3942ca2f7b14..5a7e73277003 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -5,7 +5,7 @@ DIST grip-3.4.3.tar.gz 740870 SHA256 34b7dd9f8c904f8f1984f691b3bfc62a68979eef62a
 DIST grip-3.5.2.tar.gz 952153 SHA256 aa67931ef3a80ef57351d487be2210b2f7030a16b41ff2f38d22ccc76d7f89b7 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421 WHIRLPOOL cc883036a3a4a2073eb9d14c53f53e26ae568be81e0f21e709031586b5b541c04d03cd251bd99eb66bfda86fdf1167a6b1838517c85b89b1fa6acb72cd94e588
 DIST grip-3.6.1.tar.gz 958967 SHA256 88a7a1193de74ce65968106a1b48b62a3171aaeabb1a5edae9d0308e901d5e28 SHA512 ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf WHIRLPOOL a8b5cf838d205ce32ccf78df9df04f50c1095d87b0d61e44c9cfb7e661345c737173df968f5cafa2492e7a6a66b474ad00ce6a0922d41253d767cf880c61fa80
 EBUILD grip-3.3.1-r3.ebuild 1353 SHA256 86015e1490c5fd36a3de2a9171f2f0f0f894739a3b4c30164d79b0f416a5b109 SHA512 964b99dd264dda5e9309c47a998308ac4b6dc770847d14ae0d60e768ef5038ffd41ea3a0bd87cd5de1130f79d5ceaf5040588724db59516ab1a1e3acf92b9154 WHIRLPOOL 25916061d8e72838207ec09f46ce95ed543d4840746397f09670eff05e370a8f80dfb11cd897dffac88d3859466f5c2b083dbc7beb69b6e3a8279fd40bf5b4b9
-EBUILD grip-3.4.3.ebuild 1211 SHA256 40a4fa1895b322b1dffd04076c0521f4fd4a18cdd294d405b3ae472d507664a5 SHA512 54a83666019468cdaeda12b5c52d0e553476678000b10afa6c2803c9abe6dd9ea6363aaf3130ea7a355be3aaa49c6ede37068915316232d8f11825eb8cc04349 WHIRLPOOL 29155e81524d6912b8045810f286b0a59e1f963c9d2a600731f9e941ec40234d9da488a5c701183d8429f7a070d22189b0b7c01680b258b75c90e377c9e76364
+EBUILD grip-3.4.3.ebuild 1210 SHA256 b93e11cf440092b5299922288ed61f6d026ab7a48e7b4f790dfb0974524902b5 SHA512 8938f10865ee8917044e382be2165ea4922d810900d3337151c2ec7b6cb697df4e376fbc8e7aefc57713c6cb54ed5c5415e5b4427890cbe00d01f7eee60e4935 WHIRLPOOL 06fdfddd824cc98f2955d4626328e6019396a9e702df07cc6ab241ae7fb95332d7bd4cffafddae59d4fa47b8f11522d76af2def767b3b50dadeed5501e71a902
 EBUILD grip-3.5.2.ebuild 1214 SHA256 7a1dcd44a2cbf2be7cd5bfb158f2836569b220af4389119fc5956138ed079591 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 WHIRLPOOL 15325254d92f5de6e80260e3a227b173de69288e35027518595a564bcf8f40817af4ec3f28d25837eb3ea10dd8c1e1a875fc8e5cd8aaa099c2d90394c0d1fae2
 EBUILD grip-3.6.1.ebuild 1214 SHA256 7a1dcd44a2cbf2be7cd5bfb158f2836569b220af4389119fc5956138ed079591 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 WHIRLPOOL 15325254d92f5de6e80260e3a227b173de69288e35027518595a564bcf8f40817af4ec3f28d25837eb3ea10dd8c1e1a875fc8e5cd8aaa099c2d90394c0d1fae2
 MISC ChangeLog 2633 SHA256 3a2d77609f0964d855012b01f14fe6272301e064249e4dc3906c7fe4a3a7fccf SHA512 623ac7e82e453abc3d895ae1f48ba1f6b8819315fb3c155ed38ebf071cecf3d785a0b0e8d11d6ed1b5dbf4a79f7c651e9aedf3cba422032c271db4f5e549f5a5 WHIRLPOOL d93f9369678af73af8264be95646903113ee47b207f588b19214c77d951fc293394d2923e4e87a49d50d37a2417f69468592b2b4ad2435e16d4bee5dcfd66905
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
index 1924de5d73bc..c9abaf041752 100644
--- a/media-sound/grip/grip-3.4.3.ebuild
+++ b/media-sound/grip/grip-3.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 83c5a5592305..b23e7a446874 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -3,4 +3,4 @@ EBUILD lmms-1.1.90.ebuild 2027 SHA256 b0fa4fe963aba14452a9100c2b445cc0f989ea4f28
 EBUILD lmms-9999.ebuild 2027 SHA256 b0fa4fe963aba14452a9100c2b445cc0f989ea4f287e371a0298a185248990dd SHA512 9fd56eeaf6bcbd7c28a093166e0d462e550a48eebaf64fe0f13eabefe9804d22e6836714ad76000a1a9fb3ba4da44fd707c5e9df0fafa84477b86a10b20a731c WHIRLPOOL 820620c89f0393456cb466c5465b6c018c94e3c21f7069864d095b94efab936c55fd47ef8da672d18f4d0f61ee338b73d89a8846d31bb4f4fde6e77de8fa0c4c
 MISC ChangeLog 3860 SHA256 00246ccff05a70477c8fc617502e8ca634448724d97a4aa9ecc61ff4d0322031 SHA512 9abb20b427a20eec58ac2369e572fe12e2fb19a44584a1fdd7970eae651f985edcfc27bb9220b5906db825d99dae155955039add1a0a0dca584241ec7c06a801 WHIRLPOOL 34949e1dcceede847908f532fe1849577175d12291ed1ca5e2bd982943c6af6c9f6694cc6132dc25a820361f991088c00e12df63a52f3155188630f3382900b0
 MISC ChangeLog-2015 6018 SHA256 634fee3a377d417ba4e42f2063d9a2f02f3cd9c92e6d143d45b1997ca86307d3 SHA512 c1791c947a51442591906c5fbbcaeb097fcbb4811899769b083e58e7736b21acde417e2b2bfa2a35a91d9ac64e65d0f0f1a20537d9d5b6cd52b531be79fd306b WHIRLPOOL 229f363820f41eac61d4e75125ca4630fb747348522786eed1d17df637fc8eddf4220e4831d2c9da3d951c18a0eff8751c5ee7245ac3311b80bfffa3c2e45094
-MISC metadata.xml 1190 SHA256 ba6c36f5dc550cbe07039fc23a8d443ff77df625942126347322bd36722c0cb8 SHA512 0e167f31d86689ec76b894af2c1c425b926c8d680bb26272c3d4f783206b8d8a4f44a1a77daf8f7a9a00792f7252733d84a7b146e97c35b63c39da3dfce103f4 WHIRLPOOL 8b4e7f4c89a8dd3130c9e2b21d8b493d3de192e04c2bef8271a4a991cc264c3fe33daf803a8c1e1f6c53dac8dd36d0dea4d0a850eebb787eb2a6a2f0e6eb8d33
+MISC metadata.xml 956 SHA256 3ffcb56a6dbaf83d989da2d585b4cd74b607945ae8766423e7caeae127a4b197 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc WHIRLPOOL 5b77da74918aaec10906c8f85a737a65ab8e21bb3b660d20c1a79f5ab6265cd60a4eebffa35f217f7fdf475f5dad72caa7726342ddffd38af7e3c3021dc5c7c0
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index ec9eb3d1b7f0..018a1358bd4f 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jaquilina@eagleeyet.net</email>
-		<name>Jonathan Aquilina</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
@@ -17,10 +13,6 @@
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="libgig">Enables GIG player plugin.</flag>
 		<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</flag>
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 9f0c2d3d9104..1eca759cb263 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,10 +1,6 @@
-DIST qmmp-0.10.10.tar.bz2 1346679 SHA256 7f8982a1a4bb216cd4c8d5d5599b24a16c3f2bc1faf22c1ab40bdaf6c6ea5cc0 SHA512 427419bd4b1baba0d8f118ba98d66feb5a775f27a46c5766b4fe7345b0d9231061287b7bbb8ccea2c155f9ae26e8c7c0fc078c25587d24adfc303279ea3ea48f WHIRLPOOL f3d1d6a4b46ef5057395305ba92de64c8227b2aef584f8558605756fa83db5af44ccd099ef6061874f74cd9177ef8c0a8d26114bf5b4e5c8a7f6d78079358596
-DIST qmmp-0.10.9.tar.bz2 1342488 SHA256 e9481ca8d42dd3e91da1c49273e2bbe5f86f02e219b90438135afbb0f0b94442 SHA512 c7a55e08de550a1830108980e53256eb7622554edd97aab0fc0d72378f973e19eef2ea1b35e28c57c67f22b421da0622ce3006367ad85d2f18de53d7473ae73a WHIRLPOOL 47b0e45b55512609da3585e6eb34fb57acfedb69ff796e4313049df770a065d486b69c75290b9c3838100fc9416a12517948b709d9e434b8fad61c3af3bda7d2
 DIST qmmp-1.1.10.tar.bz2 1142444 SHA256 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a SHA512 f9945ea428265c900751dd692e25eb0618e162e621bda7ab5f0f77d504aee66fa06390edca0155d18ca041706f461dcb9bb20678eaf32250b766e0f593915356 WHIRLPOOL 1beaa2339fa8b86c79876774a3da12a8a5a62bf729e4fd6bd6896aa225bc573dc2272cc7438b257fe6567c8c85f38a301f2740eef788322e1d872404e5db6c0c
 DIST qmmp-1.1.7.tar.bz2 1135005 SHA256 464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72 WHIRLPOOL 1c1f22a22329619f63a1a24590b41b352d398bb4653117c81918b2e940e887c6aaa06f178674a97893de7418673022bdc800a09643d3fb38096f6dc78b7774c3
 DIST qmmp-1.1.9.tar.bz2 1136753 SHA256 e25bfc0fb4182793df81c6ec222d553183ccd3f61e5919d217c9c5d788f3df2e SHA512 54ff71626b2ef778efef84fa56a50b483d6e9d14f1f53be2f1b01223a0f23db04fcc734a371eb22985404d9e15839b76c28d0909bf110c286ebbdf4ae27d1cd9 WHIRLPOOL 5fed1f1d3971887e3922d581e9805966c6715d834120218e013b5bb8b3e166ef89e21af6676ac642713370cfc54f6b0d62a47e5fa91445361cc5a59c749d0d1a
-EBUILD qmmp-0.10.10.ebuild 3602 SHA256 9889e9f252befc7f99b77fb197cf92ee0e35e4ea2ca96404a00f668cebbfd6ec SHA512 a42eb0f109f8ed8bbb944e7a514a1e03a9d3b7de806426d56d477092f01afd606f8ce82862e3ebc4957e57dea86f1e4c981fc16c4bb6d0d849c1471ef7081c66 WHIRLPOOL 1bd8b6aebaac55b1715c50ea30653144332e286f0bb429cd48f03954e33f0104f5f48151efbef9c2c55d3265b6912b886adba3011bc39a591c6f02687fdfec83
-EBUILD qmmp-0.10.9.ebuild 3602 SHA256 9889e9f252befc7f99b77fb197cf92ee0e35e4ea2ca96404a00f668cebbfd6ec SHA512 a42eb0f109f8ed8bbb944e7a514a1e03a9d3b7de806426d56d477092f01afd606f8ce82862e3ebc4957e57dea86f1e4c981fc16c4bb6d0d849c1471ef7081c66 WHIRLPOOL 1bd8b6aebaac55b1715c50ea30653144332e286f0bb429cd48f03954e33f0104f5f48151efbef9c2c55d3265b6912b886adba3011bc39a591c6f02687fdfec83
 EBUILD qmmp-1.1.10.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
 EBUILD qmmp-1.1.7-r1.ebuild 3856 SHA256 5dc5790f785a0c1444e58f5a57e785ad7f9a9a2faf64132a36bc63a16ce6ddaa SHA512 e0922330692482d5ae933f27cb8f12201412cd97f717601bf925eed638412ba70463eba3afecb17d011b5040f1d30f69eb07b8bef1d0599f2341574050434aba WHIRLPOOL 760702483d215e8ee9153096358600b309951d0a0f66c5b25b3ba1cbad6b1a470e1665f5f1e70c3c5fc2aaf96dde8087d6637540be5992fd5dcb117c9f6965bf
 EBUILD qmmp-1.1.9.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
diff --git a/media-sound/qmmp/qmmp-0.10.10.ebuild b/media-sound/qmmp/qmmp-0.10.10.ebuild
deleted file mode 100644
index 8cae55c54f91..000000000000
--- a/media-sound/qmmp/qmmp-0.10.10.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	ESVN_REPO_URI="https://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp/"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
-jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtmultimedia:4
-	media-libs/taglib
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio
-		dev-libs/libcdio-paranoia
-	)
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:4 )
-	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtopengl:4
-		media-libs/libprojectm
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FFMPEG_LEGACY=OFF
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_UDISKS=OFF
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.10.9.ebuild b/media-sound/qmmp/qmmp-0.10.9.ebuild
deleted file mode 100644
index 8cae55c54f91..000000000000
--- a/media-sound/qmmp/qmmp-0.10.9.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	ESVN_REPO_URI="https://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp/"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
-jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtmultimedia:4
-	media-libs/taglib
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio
-		dev-libs/libcdio-paranoia
-	)
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:4 )
-	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtopengl:4
-		media-libs/libprojectm
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FFMPEG_LEGACY=OFF
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_UDISKS=OFF
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index b1d633c8969d..42e6d1ce4c51 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,7 +1,5 @@
-DIST qtractor-0.8.3.tar.gz 1750869 SHA256 6852facb08c1a38c9c4bf5bf9922b0b9a050a00b85c6b5aeda1764f3afb8f83d SHA512 a80fd1c274ff11ff43b1c60a5fd0d4ff5c0e9d333849b6ff0b811e1afc31352395b47b712614c091af3a445d0664ea407d3b6594a38b7a6f5e8fc7adec6f62dc WHIRLPOOL 49ac1f3dfcabc2ebbc5b67a181997a5d15435a0d83f493f26fcb835715e837ed523a7cfe44412c36ebfc05dc8d7234d9031b47a5e84d2cc307af18c8f8c0fc45
 DIST qtractor-0.8.4.tar.gz 1752418 SHA256 3ace8b4fdf623e5e6ccecd7047de73f72bcfdd10b01f187079832092ac936b9d SHA512 406c19eb37273ac932b0f797db6e064e48119a245fe25762f743a261c9f80ec3ce762c76ddbc633ad17bb5924affb7db7ded95d1403b9b1edaa360e6ff060f92 WHIRLPOOL d045b3f5e996aeca04f606be9daf047c42a762d57de61ee0114b86aa2d4c81232d7a56bb4a74d229578d2f7d1af2e412eed452023d1f8191be78e96aefe3121d
-EBUILD qtractor-0.8.3.ebuild 1717 SHA256 c0238a24f87d60ca3bc82df1d19e20a1f3faab83050eac90e5cb203ea93d5a2f SHA512 cd7f5bcdfc0a75e01c4a5a6a43902248914b215ca74f99723a67773450139389ea8e3794a58fc1867bbf630c7be7a4ba0bb94ae689790ad2eccc9f72437376d9 WHIRLPOOL bc436d17750147ca9811066567c7e6eae788c88e82d500c0328abde18bc24833136eab9cd22f7a68666e83604dc18fe7522f292fd637e6cc3a7097f006bf3a45
-EBUILD qtractor-0.8.4.ebuild 1671 SHA256 773d434b5e7bf2228c525d302823621087c379bd71ed5728114a42dbb7b745e9 SHA512 92969eec036aa026d3b7d820638f04584a774ae1e34e73ce49e771f47b8965be3293a37334071c9bcafc94c56f99fa51518fd68c8ec4dedb4f0b7b61fb72e9fe WHIRLPOOL 812623c0ce9644e22c6a5b9046e8138ff64b6f64d48b04c8bf17b556379b01854590488915d54cfcb49d0fbd60419db4fa1596ce40316676786f903bff52dd70
+EBUILD qtractor-0.8.4.ebuild 1502 SHA256 61cdbe815678a1365e14d499fae3728a112ae876aa502be777b861a890bee162 SHA512 0d451afaa10868c5dc5994513f529f378dd9c6ff3436cb02b4af2423d6806ad2e94e0f687e98efad1249a6e055c82ce8bf0b05e1df2e33c652d4f222cbdc3a98 WHIRLPOOL da90ce0acad33c6b16194feacc8dc22e7268ec8fbe33cfa159a0f39e6d5843c0235a6a5137595c526d9bfdbaa98c8965000557da176c7fa754910f28d8bb6c09
 MISC ChangeLog 5859 SHA256 72bfe26b005c8550a752ecff80000cae6e1f92e5a9209d6710e6ed449fb01c1f SHA512 d790a7c10df64ac63c504eced8a65f62cc1c6ebce7bb78cf9728480b70590fae41df45822a5f3e2f4877cbc55003bbda7a4774414ad9c158a34885cedcfdb699 WHIRLPOOL 99252f269a6872c31e9b047a5b3b770afc9558b37c69aaa63b5b4803b621c2303396640a25445b1f2410dcf099d809e90095a515340e88160ca4ad36713afd39
 MISC ChangeLog-2015 9643 SHA256 f24ca0a5415798dd70e6cd41f87421cbd8579c1662a44af30e035d3d92e39ed5 SHA512 c8482ee13b5b9187b4e5afb6fdb65b3372cdb9c3b3c0db2c2d78167ee36dd0fba08abb555618efc8a6d9ce3468e361109278c3037337a1c09c6c2279418de3e0 WHIRLPOOL cb5c79ace8bf4e9c4f612f891ed3333a31e549b4d60dadb38b08a4d4dda4e80aed323ed3509496faec81a59bac08db29569dc1263525d17111080dce587e34a5
 MISC metadata.xml 542 SHA256 9597243fd5cd725858d25b4b3207cc4273a166cc884a1cbd8bd205c546ca06f0 SHA512 002d353914af0071fae342598619aef3b0dfe099d500da0bc98f40c209689f123dbbd93ca80a89a53c6257a54ee808798a858987d80a0443e2cc723dbfdedb7b WHIRLPOOL b51eebd5e61a25a5c437fd101360727500156ca7692ced610232f7a6aa7f24bfb7042e911f72521967a3419f49943ad739a4d974c75261fe255336587efcda9d
diff --git a/media-sound/qtractor/qtractor-0.8.3.ebuild b/media-sound/qtractor/qtractor-0.8.3.ebuild
deleted file mode 100644
index d855a90627bb..000000000000
--- a/media-sound/qtractor/qtractor-0.8.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils flag-o-matic eutils
-
-DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
-HOMEPAGE="http://qtractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib"
-
-RDEPEND="
-	!qt5? (
-		>=dev-qt/qtcore-4.2:4
-		>=dev-qt/qtgui-4.7:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtx11extras:5
-	)
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	virtual/jack
-	media-libs/ladspa-sdk
-	>=media-libs/lilv-0.16.0
-	media-libs/lv2
-	media-libs/suil
-	dssi? ( media-libs/dssi )
-	mad? ( media-libs/libmad )
-	libsamplerate? ( media-libs/libsamplerate )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS="README ChangeLog TODO AUTHORS"
-
-src_configure() {
-	append-cxxflags '-std=c++11'
-	econf \
-		$(use_enable mad libmad) \
-		$(use_enable libsamplerate) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable osc liblo) \
-		--enable-ladspa \
-		$(use_enable dssi) \
-		--enable-lilv \
-		$(use_enable !qt5 qt4) \
-		$(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
-		$(use_enable rubberband librubberband) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable zlib libz) \
-		$(use_enable debug)
-
-	if use qt5 ; then
-		eqmake5 ${PN}.pro -o ${PN}.mak
-	else
-		eqmake4 ${PN}.pro -o ${PN}.mak
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/media-sound/qtractor/qtractor-0.8.4.ebuild b/media-sound/qtractor/qtractor-0.8.4.ebuild
index 232c990cca34..b2605d9c00b7 100644
--- a/media-sound/qtractor/qtractor-0.8.4.ebuild
+++ b/media-sound/qtractor/qtractor-0.8.4.ebuild
@@ -6,27 +6,21 @@ EAPI=6
 inherit flag-o-matic qmake-utils
 
 DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="http://qtractor.sourceforge.net/"
+HOMEPAGE="https://qtractor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc +qt5 rubberband vorbis zlib"
+IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
 RDEPEND="
-	!qt5? (
-		>=dev-qt/qtcore-4.2:4
-		>=dev-qt/qtgui-4.7:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtx11extras:5
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
 	media-libs/ladspa-sdk
 	media-libs/libsndfile
@@ -40,10 +34,12 @@ RDEPEND="
 	osc? ( media-libs/liblo )
 	rubberband? ( media-libs/rubberband )
 	vorbis? ( media-libs/libvorbis )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib )
+"
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )"
+"
 
 DOCS=( README ChangeLog TODO AUTHORS )
 
@@ -57,16 +53,12 @@ src_configure() {
 		--enable-ladspa \
 		$(use_enable dssi) \
 		--enable-lilv \
-		$(use_enable !qt5 qt4) \
-		$(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+		--disable-qt4 \
+		--with-qt5=$(qt5_get_libdir)/qt5 \
 		$(use_enable rubberband librubberband) \
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable zlib libz) \
 		$(use_enable debug)
 
-	if use qt5 ; then
-		eqmake5 ${PN}.pro -o ${PN}.mak
-	else
-		eqmake4 ${PN}.pro -o ${PN}.mak
-	fi
+	eqmake5 ${PN}.pro -o ${PN}.mak
 }
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index 53432d247bff..659396330545 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -2,6 +2,7 @@ AUX sndfile-tools-1.03-remove-Werror.patch 660 SHA256 1cb26315a1e5fd60f9cee32e9c
 DIST sndfile-tools-1.03.tar.gz 474494 SHA256 f75df926a397d4dfa88748d51a3d3a9de1b5de85461bbeeb77edd8ef5b5fb14b SHA512 bc6ac7977a95ccf845c889db81452ae84b4f10a8f51c91ddd6fe4d926337a60cdbcb2859b0758816622554bf26a6e42b70f791f2c5158926c3f92ab2abbf14dc WHIRLPOOL 209c33344b14639622c02b6fb4e6784154681bb57fc3598bd218a35e4db4b7354da36c65e7348940a08049f1984801356439fdc12aaa9ce5f4fb8fd93f31a731
 EBUILD sndfile-tools-1.03-r1.ebuild 566 SHA256 e72174e77275d5614ef4d0a42d1234a349e63851e34083ff47a2d6af0f884da4 SHA512 2608ff60cc47f06c37955cd85c76ebfb698a86cfdf24bad580262a73ee465b187e7bd479760c7a74ec7d7a09694c8fc2f68ddc3fc8c9fa4176099e6b3f459c24 WHIRLPOOL e0e9ecc841f7d195dbb79f0b2064374623c79166419d2f12ba16651c2f418e328faccc8aacd5294dbc4cc92f76dd64b5572da526cfe9fe7c79e495cbc7c4e107
 EBUILD sndfile-tools-1.03.ebuild 648 SHA256 99b5b866e0e6083d4bfb63a53f1c723407953f3afba6e192192ae85ae57f7c0f SHA512 deb4e326d087cbae4ce5d1e7c725596321529e5b02cba885eacfee18eb01ca06c11f0dc4d1bac7d372f30a3ff28f63947fdeab1f6d2fb7d9a8dcd64cb3e67765 WHIRLPOOL 881d0f3e3f7b43b31a0d3d1c969b77911932b85a7b71d3beb4d85f6a0d35ccddaabbfce42f600750681032df861d5d84b176a0a2787a9e2ea06ecf79c8b9f305
+EBUILD sndfile-tools-9999.ebuild 790 SHA256 f4cbb3d7572a8436b69a6d0d0fdafefb0300469e2762eccc114bb5d8f447c86b SHA512 45908c7c4a07342f045fddca47efabb5654d507af8d722df151cd8d5336be493ec64a3a51e153e470ef3e9304fd516fa795ed93f133db96729d8cba808949738 WHIRLPOOL 6f28251f5d7d13dd5981e3002f0e0a24c26a2900e19b8a55ffc1080b8f01238e6403af816a060741c1c7cd79f857869fec1aa77b44796f528ecdc2a9b998a91e
 MISC ChangeLog 2727 SHA256 ddd7bcb4b9643694d9ee6a866ba9c464597094fcc563d019bb61856891e6917e SHA512 584e67dd1626e06cdaf47935fbddd17a91ff7174e2f79218a909552a5e6ea32aef2491c9249133d45cbdd2a2d469cccaa21456808c3a4d8885dbd6ae30ee745f WHIRLPOOL 893172e83f83587794b0a99fabd59d7e5c6407dcb71fd02fc5367f22b9ea01b76f3f6c5c99c58c1fc7be4027b3afc154a3eb73fbbba8ea97b29e3872a51b6c54
 MISC ChangeLog-2015 507 SHA256 382e098c859b24ecf43e9487c398351e222284315b7ad4e5710cbdbad780f607 SHA512 88863d5b40ec590e1a43c504284172f33973031e210bc255b1aaa14d5cc98574de3671af16f1d92fec0d6bfa370af93c9f0b56ff62aa16dc6dc01cafc21e424a WHIRLPOOL 3fe88bfa2a8a781eb29d313aced0c498330e8c0d0318a54fe652d0c2cb0667a1760e921cdb0336eaa1b695867f69d62bef61a2d6844141c9bc82f9484165fdca
 MISC metadata.xml 589 SHA256 99c4446bbba299a50be7f9356f51750f84af0f98065552b40aa42d09290caa97 SHA512 ad1a2f99f3e07e0319f5af7905845cd40e08c10f3ac246e6b0162125b55902d4c612ada31164890918894cd42761cf5418dad0f5225cb825bc652615a34cd5ea WHIRLPOOL 3a69aad202ae1f9427e520e42b82673cb3d002aa5033720b65800d1951144bb82dc6071cf45a2bcad4aa1d6c3358fafd8584df6550d5cee680bf8f2be56a53a5
diff --git a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
new file mode 100644
index 000000000000..b09d2f4021f4
--- /dev/null
+++ b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A small collection of programs that use libsndfile"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
+else
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="jack"
+
+RDEPEND="
+	media-libs/libsndfile:=
+	media-libs/libsamplerate:=
+	x11-libs/cairo:=
+	sci-libs/fftw:3.0=
+	jack? ( media-sound/jack-audio-connection-kit:= )"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable jack)
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 3625cfa0907f..d197342f841b 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,9 +1,6 @@
-DIST spotify-client_1.0.49.125.g72ee7853-111_amd64.deb 73404932 SHA256 1d6d1cccfb7f996b835f21c8dbabc16ca4bd214878e06738dba7886640470050 SHA512 f6152f71fae3827e1f9dfb07cbe30319f090db151702ca02f3566f3deeec369da0c70f9995a548e0df92d655b593de520ab387a011201317753d3def70741e24 WHIRLPOOL b5111509c902068bd2559267bfd2febfab8b4464d73e54a302d23807338e796045901fe14b9c229e6a412553f7cfe84e903ddfc4c4c3e9a60609b23a7ecf2c3c
-DIST spotify-client_1.0.49.125.g72ee7853-22_i386.deb 74637938 SHA256 96c02fdc77991feb0797089d701744c2de4584322f966a1c070b559df27f9b04 SHA512 4a8aab47b6b0c2ac9b349c858e4728451e713c466bcff9c1eac9c6215259ad9325a51b0fc8bd2afcfa141a6ad518f97d408b5d779a126f2ac62c9e8be93f5f93 WHIRLPOOL 9bd02e73731cc4d2e55c43b08d1bea1d3fcfecb13ebdf8fe591aa5be6961423e3463a2fd625745561ebb7f33c902246a84f406bcc1dd3f7f47ffad6b98daa451
 DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 SHA256 8c97a95ade46ce9f8e2bbe565cd2e79396ed31fc4f0646a907a6f3e028db887d SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb WHIRLPOOL db9d74ce31d57704184e6a00b18b3cc417cdffeb6e582d0c41ddc0ba5c822fa4dfebad9d9cf151ebecc46d3b3892714e0fec91ced356d57f3c51dd94a8cce370
 DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 SHA256 0e32bc8b21d591f8def932403b8ef3632e95eba4b5628506dfdf6d521dce7941 SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5 WHIRLPOOL f3c42136e0682bddaec17829a05a9237d95b6d8f79b9ed27e2cdd77d011ea015fb4532d5f5878c03e15661207779a65e7e228a46821c13899b17513f12612863
-EBUILD spotify-1.0.49.ebuild 3277 SHA256 c27a70d3d8f4079135962604d88fc526ffec1e7e2d53c71014ff9a018a482cf3 SHA512 4136d24710c2ec3772e3a896b254eff5bc72db69ac250e823fd7d95a2d5b508707cc4420e8d7e505b7c1a0703f9d088c1f774e8172a0477d79634dbf4c5bb401 WHIRLPOOL f409ae1f35d78fa6c7d93f674aa87e553eac0b879a68a8299ca8d7d650f6d82ccef6e27e718cfdea8dbe1ba04ec14b665d406c751366d5be2462c5bcc0116660
-EBUILD spotify-1.0.64.ebuild 3270 SHA256 02e9f2085aa76b2e1a9c4bb641e86f295a7a6f0fdf9a515a6fa05c3de3ed296d SHA512 54c2ba6d0a6d0966e47ddeaf50dbe60d9085b7b6b95e2d391080493750e3e4ad591943ab56e848e3a23be89d53a6fa7004e12784e7070c4a3cbedeea81c4ed5d WHIRLPOOL e39299f32da24271e5c6ce99c064c7942396b7e8e8ed2aa52885880af6e6c4f036981334bfc2cd39bec6f6dd25449a3f4d61fed362ee7e7d77486cce180f84ea
+EBUILD spotify-1.0.64.ebuild 3268 SHA256 e24f02c548a42eb551900034ed1d8a80279e8a37722e8f0f417679f7eda1bf42 SHA512 ef1ee3f6edce9364be0a39e0a135a7c3b073fea88d7767e39401d72299f7f582b1bb45c7835e409b4a53c1693dcb2477d9c49e0a1fea197d26df2f827611a6b6 WHIRLPOOL a753ffde0ba9cc1277da6bc9ed86d0df3edba3fecbd711ae525659462ba4e7e995846fb0d54cc10f2e461e07f9865dd455e2f1ad04e98d862f390b0fd204d7df
 MISC ChangeLog 12081 SHA256 9e5c2f8b289533cca9ed5549d38602649a59d5c4a470b8dde4b75aedb5a26597 SHA512 b3af791f79c30a3010c6e8d767503b5d59ce858ecdda4e07bdb580a0c436b3b6b4bdf800805aca4d22aec09d89efb43a8ef1ca1c6c4907889d2e0f93ed96cf00 WHIRLPOOL 4341491bb2ec33effbf176fc4116d49751b353b4abb6499bcc69bc7085930b2fad446e82e7b716d9655e4268ea45f00e14e34e013b479af8a2529a76e65e858f
 MISC ChangeLog-2015 7294 SHA256 09f13a6ecc5fda5e12291f061eeb9ef9757017d91f9efbd8ccedf3d1262c5653 SHA512 030d4657a3c92c7311c96401e227f6b09a6c842a7935b1286c60e86cf85cfcf72acd8e80a7ebd15324ad7efe922c06cde6930757eeb70fb0682b6cf8219a8019 WHIRLPOOL 39e8775ef34231dfd628ff6d468d09bd114ac4da9c4365ad8a84b1391a757a064210e667464d102261e129163e36d53a48e35fe8001ee1d28ceedf0d4291018b
 MISC metadata.xml 349 SHA256 61c3a19b42a59b4881ec543958d205d86d441a0aefd68393de8c0d6de54812de SHA512 e39bca3abfb9169f633c009af54681a96b0d1f26d5edd9a0cb5c0a7b2aacfd70fdc4db317bde3273a1e37c04db520fcb0dcbb67167893a40a8fa6766a6637af1 WHIRLPOOL a68aa937b59e907ee396676089418d698948cd1780d15a56a1d0b1d805d530c44ec3ff308d859712fec2bd85cb9d0fefcc2cb70c39a76d184845a539575ac9da
diff --git a/media-sound/spotify/spotify-1.0.49.ebuild b/media-sound/spotify/spotify-1.0.49.ebuild
deleted file mode 100644
index 061ed8fe0bc6..000000000000
--- a/media-sound/spotify/spotify-1.0.49.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-BUILD_ID="125.g72ee7853"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-111_amd64.deb )
-	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-22_i386.deb )"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-# zenety needed for filepicker
-RDEPEND="
-	${DEPEND}
-	dev-libs/nss
-	gnome-base/gconf
-	gnome-extra/zenity
-	media-libs/alsa-lib
-	media-libs/harfbuzz
-	media-libs/fontconfig
-	media-libs/mesa
-	net-misc/curl[ssl,curl_ssl_openssl]
-	net-print/cups[ssl]
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	dev-python/pygobject:3
-	dev-python/dbus-python
-	pulseaudio? ( media-sound/pulseaudio )
-	gnome? ( gnome-extra/gnome-integration-spotify )"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
-	if use gnome ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-}
-
-src_install() {
-	dodoc usr/share/doc/spotify-client/changelog.gz
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.0.64.ebuild b/media-sound/spotify/spotify-1.0.64.ebuild
index d88f039e41f4..d81b0051b49a 100644
--- a/media-sound/spotify/spotify-1.0.64.ebuild
+++ b/media-sound/spotify/spotify-1.0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_amd64.deb )
 	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_i386.deb )"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome pax_kernel pulseaudio"
 RESTRICT="mirror strip"
 
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
index 6924fb02ca71..aed5ef314cc9 100644
--- a/media-sound/toolame/Manifest
+++ b/media-sound/toolame/Manifest
@@ -2,7 +2,7 @@ AUX toolame-02l-gentoo.diff 2188 SHA256 a7d2b7524c52a68952cd060e67a61cd78e9ecb25
 AUX toolame-02l-uint.patch 950 SHA256 d45a1564663337b0f7b50120f3491542b9ceaf6a003b73d786f9f41f01d78dfa SHA512 ef81fd06b5371ab9fa16037a3cb06ae4dbc9cf7f74c2c1553a06d40a9974ee509ec4f63f6dd5c7b21edb6763c5ea8e43273e98699c73013df430d7e008049f1d WHIRLPOOL e57d6847d07bb19a72ec440eb341b7c9f91db650c0b30fa4987ace6c89460c5078cdc62fdeab48439bdeaf5430cfc2036649aee7e26f89162e5ac72459cb81e5
 AUX toolame-02l-uint32_t.patch 624 SHA256 e76d347149cb0df2b75d65c448070b04c9f9e7c876d4b54131ef8deeb2ec23cb SHA512 cfde68fe55830f97caf38defc186aa6e95ee3c513e22af4aa06c89e1e071d2caadf22479e260c631442647c43b733aa13bedfca885f68cccf1187fad8aeccb05 WHIRLPOOL 44f9789acdc490b818312f1f78a7cdf3fced34cbf43233d421fc36333ce3309f0e64500e7f2d93738a8832d67cd04610936be4de0660678c585c85f244871dca
 DIST toolame-02l.tgz 127493 SHA256 3b95cd2504bceac4aab2fca03bb3b5974d1d44b5afdd8eb4cc0f0899521bffc4 SHA512 b88c524e1ad65ef30cfcffb53ab0d3552c916714dbde447d714e90ddf048e481d3b1a33f64081c4accc64a776b009d2737c7ab0863695652f2b0743f44a8055e WHIRLPOOL 95b7dd571d9d3a2243f7e90647560d755838c95f9bbbf982bcecc33c18b0b10ba387f8957667ca5c204fd0c94ac7b443a47bee1123fe625d9507210bc6f6266f
-EBUILD toolame-02l-r4.ebuild 758 SHA256 e70034567054d23feace76f2469512be825534927f3e6fe501909a74da5c0d54 SHA512 97ded645a563dcb5fcc84f29b705b66ed20492784d1a1ffcc6dd0ab36702296892a4b26b6b888d640eddb2822b753ed3f8b560288450110bfbf9d075eeff663b WHIRLPOOL 11b19427a3c8a3b89a910d47dea8aa92c1b2dd68f25829fae38afc2d2f17d8f03e947e34e9b631dda1647810f1021ad2545164e0c5c421584a5c381dec9f0bab
+EBUILD toolame-02l-r4.ebuild 757 SHA256 8c215fb5643b01b86b4860db66923030d860134be133e730049cf694b74e1434 SHA512 9e947dc2c25cdb6cd48697f91975c1385ed5b83f3e6675f504e182fc22fd5f466175009532d5f57ad1523db27658ffb9e84860f3d7912580551378a04135a220 WHIRLPOOL a0e0b0e1579a68e021286967ad48eb4316a9c7788c112e9e7fa2dcd8f716dd9a0d75361ccd23cfd8b71ee2d7881313e63eb5d98bc63657f20a75e4a6baf23deb
 MISC ChangeLog 2848 SHA256 46fd39375ed45a30db496ee897c619cfe4e6e219633a99bbfbd914037784da36 SHA512 e1f220fbb64f3d69cad96cdf85d2d14b02f4264d9890d820e4497ddb6cbb16c5cbea4a8ae64ae9fb540cfbf6c7e83a8a13be10aecb672aa7acf517f8f65175e6 WHIRLPOOL ae91a5eeb981402bccb467799194366c9eca202bc7efc4d811fb74d01953d3c6de81ca9750a32c946e97281d8cbb14fc21dc72d7311cf76ee4df2aadb9aaa491
 MISC ChangeLog-2015 4034 SHA256 dc08f42bd769a612edffcaa092c93cd4378c48749816927b9e32874e4b41bac6 SHA512 217e3afce18bcd91c8548b86ad8aa518782f535c53f8c9b03f30bd11d8ec2064c5e012c49590d2abe7eb800043868c6496ccf14d30b9f37eb5dfada5b6ceb859 WHIRLPOOL 0d9e9a0f642ebf1ff41dc138a0ce599609f3bb878a9f7bfa22e6120dae94f70f3d67e14791bb5e8c2bdd1801ffb101a0e99274685a46a208a100b6cd45cce36c
 MISC metadata.xml 330 SHA256 55df7138e4f74f20b036fbe83f24355c450994809c50b3769751d749e4dff8d6 SHA512 e4b6308fa4241c592a768a0a21629e0b0de427c39c8d0ef9c26e093e029de51e55a28ae547b93a584c373a1f29034069198cff2667d647238e20bd4b4f7b8b2e WHIRLPOOL 94820accf0e2c931e06ad00a0ed964664a75970330368d6ecc292cb6548bb2ca70b09df2e23271b849a30cb48c4917ba476e1a01ed09ab9dc4f904b97fde6a13
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
index 685ff590e1c3..4d732b6a5545 100644
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 PATCHES=(
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 19a3332c5599..d5c6767d2119 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,8 +8,8 @@ DIST ffmpeg-3.3.3.tar.bz2 9940959 SHA256 1069ac8fc7f52e566bea28b41b9c437246aeb50
 DIST ffmpeg-3.3.4.tar.bz2 9944256 SHA256 5ef5e9276c311c74ab2e9d301c2d7ee10e1f2cbd758c6f13d6cb9514dffbac7e SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a WHIRLPOOL b28e0c37a70f7dba8af2599861bc748b2c7f0e56ff6e7eca86f45e94b4f9318c48a1ad8d2c3c5c9446f71f5fc1f20fadd240a9e638d39337158010c2ae00ad41
 EBUILD ffmpeg-3.2.6.ebuild 15052 SHA256 bec4aea66c6d9f0fcde470658898a47f941eda9ca8a48fa69253ab137157af10 SHA512 938928ca584ecedba7cde7d9ef8a58e45652068b1299431590b50cc72d53cd5c0ff512195d75ce652659ff2269e35d66b55d4811431804fa8f810e17e0590913 WHIRLPOOL bb9f8c1a268f010efcc842299572bb3d013fae2bc9eab819fb7d5bbfa463463105d5cbaa6e10a0e4fdd6b59865ad93295eb624fc74999f5b82a794e9010291a0
 EBUILD ffmpeg-3.2.7.ebuild 15057 SHA256 5b5a4aca2c1de577dfb8d73462395b4ce8dc84a3669a6186c3eea0874ec5964d SHA512 62eba0bd34e68cf6ea4d49559292f28e6840e555af06d94c81f1a6a628153a5d8a483e7858b071e508d11233a0869951cfa7a7c87b49fada612b319c0e0c2e26 WHIRLPOOL 89b41ebe97fe0a8b9ecf52641e8b107d9e7a9ee4c285b1b7ed8a0a0307a76d2d40483cd5961e0a9c418fa8b2554af82b53b8ad99c791bc9f013c21749ff798a4
-EBUILD ffmpeg-3.3.3.ebuild 16050 SHA256 f82e1a856ad5496867ad003b85eb4006e08f29f3276d095b12061a0bbfa84d2d SHA512 b317f5249edced441ebadda0307b4622570bef6ad1952b93edfa140f831709f7e829fc311c1b9e1452a1fb9dc93d44c4f22c793d6e31645cd20c8a546c34188d WHIRLPOOL 79bb8c4a106e34d80d522a53b5dce1ce7bfaed8fba95393f1c2149056b387d094329c77e8cab86d9dd7356798b81dd3e679ccd7d2c28e0a8d21e14f87ad0ee41
-EBUILD ffmpeg-3.3.4.ebuild 16084 SHA256 db4e25d499909f316afd4b3306239e4a1ae624019ff8a8fc77171cb14284f17d SHA512 f7321fc0d6093bac4bbe773f6ca749798bea455316cfa76347d6aaecc7f8ce31d1a3a0ce0077e64384ce4f16aebaf957cac75c9b002dc607779ba3a3f68278b8 WHIRLPOOL 06b72809b24ac4df65d415d83159f0967ac5a7a0e9dfd4d473d491e79b505463a9b423350352264ef4c57a8b4263efcee66a229c9bfd250ea192e193137a0c91
+EBUILD ffmpeg-3.3.3.ebuild 16049 SHA256 6b1fb6f979b2ab35b4509e2139eb1b3380555742c050bb3b69255748aa404b33 SHA512 0c66a9774e16cedaa1bd0de00ea182c3ddf4734184230c1fa120f5e58ca32bd7737f708bb329bc34d23e4006ccbedc7aec124b15a946813bbab910897a0eb61f WHIRLPOOL a72e8ec2e29e075a5fac4a9c7ce441a040e3d11518af22bb3874c6a11936f43eab80e1a07c9bfe60153c710359962e68797e3693ac1fc4ceef20f196df73a788
+EBUILD ffmpeg-3.3.4.ebuild 16083 SHA256 2901bfdc1f1675b6ab1d631736775899bf241385b962693d9728da6466ddd100 SHA512 9e23f8955e4d36f38446a831fac63f4cfcc9db1dd43436ef05ea942d37d8d687d6773061f24ef1bc05335fa38ea8ebe67ab5e9cda4106cb370a2c58a5b52e388 WHIRLPOOL bafc402f369c9ab2e55575709c38afdbb5035386e7d0de0e534a866df1a0a4a6a7fe95f2e4979f2dd6cc9349009fdbc8ef20b9125f0b8e0dc07ed04f9cfb6238
 EBUILD ffmpeg-9999.ebuild 15639 SHA256 b8ddff4473372788f87f6c31b05076ad2f662f563ce70300d503affc65ded351 SHA512 1eefc9e81a7fbe83b3cc22a3a3643823b307360d1b8885f1400472fb0b559abebe7d164dd4f590bf7745885c89a4eff10a45ca313167b4194d55c5290a8a6cdc WHIRLPOOL f86c3f599e18e3f93ffd7090178a61d82142402ce35d8eac8f676091464f0e80f9b757af8c1e76d942e634eaa797555e6a5140526383b4b417377bafdf3fe685
 MISC ChangeLog 23132 SHA256 09ec61b302618a36f1aaf270cc3d8a0adfecae89915cfa1db49eba415094887f SHA512 6ec8dcf80d54a23683e72425d5989d70ee5a2f0a9cbf93a6ff3583d7af1556e9897ae9d917e216d0d2a4469ea0ea05d75389bff11c07193f9c599d59848b0468 WHIRLPOOL 7bd7dd2164286941873d7640311f3b9e501a66c4fadce9f825dcf94ff054e79e1ab1ec4922a193d12631806ceb5fed3787cf4992332586a75e4d7993a74e7a86
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
diff --git a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
index 4ac68852ca4c..7152de0c54a7 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index 66159129457a..527fc20e356f 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bc3518b372f3..9518d975a216 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,7 +11,7 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 EBUILD mplayer-1.2.1-r1.ebuild 17429 SHA256 96024a2fc6ec79a8c8fc32c9fb2173e4287d10807f6371961b3c95aaeaf81b75 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3 WHIRLPOOL 8f8e334b08ff302eeeb164f0aa48f052ce144a108e1f5de9ff2e37bcdb1e721d20c91cb823a4f7b11d0e6191c75d7c7c19b88ea36a822ef00e3b9b1eabfad97b
 EBUILD mplayer-1.3.0-r2.ebuild 17194 SHA256 1424b2b4087e9f83d60f37a8f1fccae9f9818ef6372b1713670b08dda6b28ef9 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d WHIRLPOOL 53a194edac6cf2520f9c4180f4f0741ce938a9c23fde391eb5cbc8452fe8be5b739e51c08cfd4587b35085b37142d26386b1424c90d25e3a6247a0ae8a12c393
-EBUILD mplayer-1.3.0-r3.ebuild 17295 SHA256 d5821147ecbf5250285cb3709f9671123da43c6e42d3a13a4f6905c89726ba25 SHA512 0570f81f9b3b3e938498cebb1da7e20dcf6d510fe67ab8adcb5da12341a2c65dbe7a6392edaa4e74e360e5d3e0e88c9b722fe90c22853b0ec08021a3139423f8 WHIRLPOOL 197db40c80586bb88ab4bbdae91e796fea6c227f1ba0785c50159748a12ea9e34ad7680ddd57e2adaddacc612d9bcb873046e21bb68a0b158b47054d45bce186
+EBUILD mplayer-1.3.0-r3.ebuild 17291 SHA256 7299fe0a625eddc967c549992a6f3e93e5f00ffe1121d60acae792e15f17cdb3 SHA512 c7090f69590d7fb36a702c9ee93e5d252ba5bf015d25408806e0fcc64bc87dd822052cd63e3ed3d2627b9ff9dbeb7e3424c80065a8aa22dbc44c2b7a33857814 WHIRLPOOL 6999865997bbda05c0bdf0de812991761436a44759dfc274f42bc08035d0e4dbfc6a8e69281717db159a7208ad3128e5c1f1687849cdb835321de89776fa1357
 EBUILD mplayer-9999.ebuild 17206 SHA256 a8ce728287a09091c4d2917a3e91bc686e31eb7cb5bfbbbef6716d97ea64735e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a WHIRLPOOL 1d23c6754b0c21f3eb3b515396a4a1dc4d2bcb3dee1b2472b38edf91fd987f31b7ee5fb7f229529f826a502d7ae4643b9d57df300cfcc21477a2c4aeb4591f47
 MISC ChangeLog 10735 SHA256 6c3dcfc43705566e97c1761d41f94e41aa26a6a1d7893c25b14e635979e2d267 SHA512 97d8be790bbc844cb59784d2b87dbf9ad0125e69949e502373a7e3cf230d6b5a964eea20b06648efc67634768af865ee5639aff155b61f4eecfa13e08ac93a73 WHIRLPOOL 28daecebbcea2937847c7c1122971327454dcc05ed41b01f1b4a79586c2d5d3db93226ed0ecf4870a2d43061d39192eb63b5fc05ef207ce9408c8b7873d5aa62
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 5a9dd1320680..ef36667a3189 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86"
+	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86"
 fi
 
 # faac codecs are nonfree
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c5459b0a117f..5da5bf2af708 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Oct 2017 19:39:12 +0000
+Sun, 15 Oct 2017 00:09:18 +0000
diff --git a/metadata/glsa/glsa-201710-10.xml b/metadata/glsa/glsa-201710-10.xml
new file mode 100644
index 000000000000..dd52a7ddc0f6
--- /dev/null
+++ b/metadata/glsa/glsa-201710-10.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-10">
+  <title>elfutils: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in elfutils, the worst of
+    which may allow remote attackers to cause a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">elfutils</product>
+  <announced>2017-10-13</announced>
+  <revised>2017-10-13: 1</revised>
+  <bug>614002</bug>
+  <bug>614004</bug>
+  <bug>618004</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/elfutils" auto="yes" arch="*">
+      <unaffected range="ge">0.169-r1</unaffected>
+      <vulnerable range="lt">0.169-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Elfutils provides a library and utilities to access, modify and analyse
+      ELF objects.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in elfutils. Please review
+      the referenced CVE identifiers for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly cause a Denial of Service condition via
+      specially crafted ELF files.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All elfutils users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/elfutils-0.169-r1"
+    </code>
+    
+    <p>Packages which depend on this library may need to be recompiled. Tools
+      such as revdep-rebuild may assist in identifying some of these packages.
+    </p>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-10254">
+      CVE-2016-10254
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-10255">
+      CVE-2016-10255
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7607">
+      CVE-2017-7607
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7608">
+      CVE-2017-7608
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7609">
+      CVE-2017-7609
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7610">
+      CVE-2017-7610
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7611">
+      CVE-2017-7611
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7612">
+      CVE-2017-7612
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7613">
+      CVE-2017-7613
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-08T18:46:38Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2017-10-13T22:31:20Z">chrisadr</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201710-11.xml b/metadata/glsa/glsa-201710-11.xml
new file mode 100644
index 000000000000..bfaf72daf2ec
--- /dev/null
+++ b/metadata/glsa/glsa-201710-11.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-11">
+  <title>GNU Libtasn1: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in GNU Libtasn1, the worst
+    of which may allow remote attackers to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">libtasn1</product>
+  <announced>2017-10-13</announced>
+  <revised>2017-10-13: 1</revised>
+  <bug>619686</bug>
+  <bug>627014</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/libtasn1" auto="yes" arch="*">
+      <unaffected range="ge">4.12-r1</unaffected>
+      <vulnerable range="lt">4.12-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A library that provides Abstract Syntax Notation One (ASN.1, as
+      specified by the X.680 ITU-T recommendation) parsing and structures
+      management, and Distinguished Encoding Rules (DER, as per X.690) encoding
+      and decoding functions.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in GNU Libtasn1. Please
+      review the referenced CVE identifiers for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, cause a Denial of Service condition, or have
+      other unspecified impacts.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All GNU Libtasn1 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/libtasn1-4.12-r1"
+    </code>
+    
+    <p>Packages which depend on this library may need to be recompiled. Tools
+      such as revdep-rebuild may assist in identifying some of these packages.
+    </p>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-10790">
+      CVE-2017-10790
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-6891">
+      CVE-2017-6891
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-08T19:04:08Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2017-10-13T22:47:29Z">chrisadr</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c5459b0a117f..5da5bf2af708 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Oct 2017 19:39:12 +0000
+Sun, 15 Oct 2017 00:09:18 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index f549de6417ac..e36f8be6f680 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-28cc4b75c6ed98b149f306c8a61e2f27c973a628 1507594359 2017-10-10T00:12:39+00:00
+73e44e2cacf09551930e343dbe6a24425f52af50 1507934888 2017-10-13T22:48:08+00:00
diff --git a/metadata/layout.conf b/metadata/layout.conf
index c8922ea500a8..f87e098dcad5 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # For details on this file, see the layout.conf section of the
@@ -6,7 +6,7 @@
 
 # This went live Wednesday, July 4, 2012 at 10:00 UTC
 # https://archives.gentoo.org/gentoo-dev-announce/message/a15cbea85dd089c99302f949b4072c20
-# https://wiki.gentoo.org/wiki/GLEP:59
+# https://www.gentoo.org/glep/glep-0059.html
 manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
 # 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670).
diff --git a/metadata/md5-cache/app-admin/augeas-1.7.0 b/metadata/md5-cache/app-admin/augeas-1.7.0
deleted file mode 100644
index c9e5785dd8ca..000000000000
--- a/metadata/md5-cache/app-admin/augeas-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 sys-libs/readline:= virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A library for changing configuration files
-EAPI=5
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=alpha amd64 hppa ia64 ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline:=
-SLOT=0
-SRC_URI=http://download.augeas.net/augeas-1.7.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d2eb2a4859902b572533865babe102e7
diff --git a/metadata/md5-cache/app-admin/augeas-1.7.0-r1 b/metadata/md5-cache/app-admin/augeas-1.7.0-r1
deleted file mode 100644
index 857d9a4cb8a9..000000000000
--- a/metadata/md5-cache/app-admin/augeas-1.7.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 sys-libs/readline:= virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A library for changing configuration files
-EAPI=5
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline:=
-SLOT=0
-SRC_URI=http://download.augeas.net/augeas-1.7.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=88987ce701e97a7b94f6bf2a02449c6f
diff --git a/metadata/md5-cache/app-admin/augeas-1.8.0 b/metadata/md5-cache/app-admin/augeas-1.8.0
deleted file mode 100644
index f328fbc7f2e2..000000000000
--- a/metadata/md5-cache/app-admin/augeas-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 sys-libs/readline:= virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A library for changing configuration files
-EAPI=5
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline:=
-SLOT=0
-SRC_URI=http://download.augeas.net/augeas-1.8.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bb99aba25f5ceab4c91b10fce8903e04
diff --git a/metadata/md5-cache/app-admin/augeas-1.8.0-r1 b/metadata/md5-cache/app-admin/augeas-1.8.0-r1
deleted file mode 100644
index 6acc3d62d078..000000000000
--- a/metadata/md5-cache/app-admin/augeas-1.8.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libxml2 sys-libs/readline:= virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for changing configuration files
-EAPI=6
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline:=
-SLOT=0
-SRC_URI=http://download.augeas.net/augeas-1.8.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3281d0b4d4ca2a3087ba123e39ceb790
diff --git a/metadata/md5-cache/app-admin/augeas-1.8.1 b/metadata/md5-cache/app-admin/augeas-1.8.1
index 76abb51b8a32..0bc708e161e7 100644
--- a/metadata/md5-cache/app-admin/augeas-1.8.1
+++ b/metadata/md5-cache/app-admin/augeas-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=A library for changing configuration files
 EAPI=6
 HOMEPAGE=http://augeas.net/
 IUSE=static-libs test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 sys-libs/readline:=
 SLOT=0
 SRC_URI=http://download.augeas.net/augeas-1.8.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=41f5aa611ad56be9949f263eb0211869
+_md5_=d128414110003107f6938f6a470cc0c3
diff --git a/metadata/md5-cache/app-admin/keepass-2.37 b/metadata/md5-cache/app-admin/keepass-2.37
new file mode 100644
index 000000000000..12a12f5489d8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepass-2.37
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
+EAPI=6
+HOMEPAGE=http://keepass.info/
+IUSE=aot
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
+SLOT=0
+SRC_URI=mirror://sourceforge/keepass/KeePass-2.37-Source.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4eb32fe147a8eaa0a718c6e1fb74e775
diff --git a/metadata/md5-cache/app-admin/logrotate-3.13.0 b/metadata/md5-cache/app-admin/logrotate-3.13.0
new file mode 100644
index 000000000000..dc6d7451d9f6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logrotate-3.13.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Rotates, compresses, and mails system logs
+EAPI=6
+HOMEPAGE=https://github.com/logrotate/logrotate
+IUSE=acl +cron selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
+SLOT=0
+SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.13.0/logrotate-3.13.0.tar.gz -> logrotate-3.13.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6d5d8f6025a11af424cc23fd56ce1c3d
diff --git a/metadata/md5-cache/app-admin/lsat-0.9.7.1-r2 b/metadata/md5-cache/app-admin/lsat-0.9.7.1-r2
index 97b502f17845..7a9cf56d36f8 100644
--- a/metadata/md5-cache/app-admin/lsat-0.9.7.1-r2
+++ b/metadata/md5-cache/app-admin/lsat-0.9.7.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The Linux Security Auditing Tool
 EAPI=6
 HOMEPAGE=http://usat.sourceforge.net/
 IUSE=minimal
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl !minimal? ( app-portage/portage-utils net-analyzer/nmap sys-apps/iproute2 sys-apps/which sys-process/lsof )
 SLOT=0
 SRC_URI=http://usat.sourceforge.net/code/lsat-0.9.7.1.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b2c80bb15cd7d026e6c4156c3aea27d9
+_md5_=c475ed9a24e88d33f54b1173ea72db05
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.21 b/metadata/md5-cache/app-crypt/libscrypt-1.21
index 26c4ea143e3c..509bb136b3b0 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.21
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile setup
 DESCRIPTION=Shared library to impliment the scrypt algorithm
 EAPI=6
 HOMEPAGE=https://github.com/technion/libscrypt
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~mips ppc ~ppc64 ~sparc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/technion/libscrypt/archive/v1.21.tar.gz -> libscrypt-1.21.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4f9efc98b4ca83c13e2e6ab4cc834532
+_md5_=adaf692dd61afbb762630b8d4eb3e7be
diff --git a/metadata/md5-cache/app-crypt/rhash-1.3.5 b/metadata/md5-cache/app-crypt/rhash-1.3.5
index 9ecfbaa2e61b..8e4881b23c66 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.3.5
+++ b/metadata/md5-cache/app-crypt/rhash-1.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Console utility and library for computing and verifying file hash su
 EAPI=6
 HOMEPAGE=http://rhash.anz.ru/
 IUSE=debug nls openssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=openssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/rhash/rhash-1.3.5-src.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=31f1afaf2e25e3b5ceb0bd4611002fe5
+_md5_=79e06cb34c64c80e232358075024f57d
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.1188 b/metadata/md5-cache/app-editors/gvim-8.0.1188
new file mode 100644
index 000000000000..7afe619d42e0
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-8.0.1188
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.0.1188 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.0.1188 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=01fbe56e516a612badd0d4ae91bac4c2
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 65f62c9d2340..642f16a9e557 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=vim
-RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c31e0c61944087a89964b7ed5adb88a
+_md5_=01fbe56e516a612badd0d4ae91bac4c2
diff --git a/metadata/md5-cache/app-editors/vim-8.0.1188 b/metadata/md5-cache/app-editors/vim-8.0.1188
new file mode 100644
index 000000000000..8aceeda556d0
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-8.0.1188
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1188 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1188 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=50da87e552649e7d58496a5ee0cbb722
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 516f936b5959..1a6799ce0f38 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=vim
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=53a9116ed7c547f32883c53d95e69db4
+_md5_=50da87e552649e7d58496a5ee0cbb722
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.1188 b/metadata/md5-cache/app-editors/vim-core-8.0.1188
new file mode 100644
index 000000000000..555544a88a00
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.1188
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=6
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
+_md5_=78934684618efacce0df64b10ce6be9c
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.39 b/metadata/md5-cache/app-emacs/ebuild-mode-1.39
new file mode 100644
index 000000000000..9c42ce31c6bf
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.39
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-apps/texinfo >=virtual/emacs-23
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2+ GPL-3
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.39.tar.xz
+_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_md5_=5ec6f1c2cb4f2c5442efe6465dc41fcd
diff --git a/metadata/md5-cache/app-i18n/kinput2-3.1-r2 b/metadata/md5-cache/app-i18n/kinput2-3.1-r2
index f30c15db3140..f184bc53fbe1 100644
--- a/metadata/md5-cache/app-i18n/kinput2-3.1-r2
+++ b/metadata/md5-cache/app-i18n/kinput2-3.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A Japanese input server which supports the XIM protocol
 EAPI=6
 HOMEPAGE=http://www.nec.co.jp/canna
 IUSE=freewnn
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=HPND
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt !freewnn? ( app-i18n/canna ) freewnn? ( app-i18n/freewnn )
 SLOT=0
 SRC_URI=ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ebba0798567f6832737753d7aa149312
+_md5_=1b8b3d2eff31e92c859d8c9eb89eeae0
diff --git a/metadata/md5-cache/app-portage/eix-0.33.0 b/metadata/md5-cache/app-portage/eix-0.33.0-r1
index 8a7e421b9de8..00fb617d8312 100644
--- a/metadata/md5-cache/app-portage/eix-0.33.0
+++ b/metadata/md5-cache/app-portage/eix-0.33.0-r1
@@ -10,4 +10,4 @@ RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/pu
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.0/eix-0.33.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ec149833e94d4a36d700d87bfea050b6
+_md5_=f2cd01d04e63468fa7a7c5bb236df4f7
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
index 24a0982d3a9a..3c29c692a8fd 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9bf6dbc96744696269c6b282f50469db
+_md5_=7f64788bf521c021ca1bb45de4f84df9
diff --git a/metadata/md5-cache/app-shells/zsh-5.3.1 b/metadata/md5-cache/app-shells/zsh-5.3.1
index 4ec051200f2d..8c848591fa4d 100644
--- a/metadata/md5-cache/app-shells/zsh-5.3.1
+++ b/metadata/md5-cache/app-shells/zsh-5.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=6
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
 SLOT=0
 SRC_URI=http://www.zsh.org/pub/zsh-5.3.1.tar.xz doc? ( http://www.zsh.org/pub/zsh-5.3.1-doc.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4fc423814f0ac9a978d631a5286ad7da
+_md5_=c60562401c4462fce144974bbad8da0c
diff --git a/metadata/md5-cache/app-text/dos2unix-7.3.5 b/metadata/md5-cache/app-text/dos2unix-7.3.5
index 0ba1cf5d6914..86fb56d458ab 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.3.5
+++ b/metadata/md5-cache/app-text/dos2unix-7.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=6
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
 IUSE=debug nls test linguas_da linguas_de linguas_eo linguas_es linguas_fr linguas_hu linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u virtual/libintl
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.5.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.5.tar.gz
 _eclasses_=l10n	2c2e15383ba891d642f51896a7f0ecfe	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f4336f905565bc76aa96a9e998f67c6c
+_md5_=73ceebf271e28fbaf299ac18e6440368
diff --git a/metadata/md5-cache/app-text/poppler-0.57.0 b/metadata/md5-cache/app-text/poppler-0.57.0
index 22d24d046619..8fe56ba4cc83 100644
--- a/metadata/md5-cache/app-text/poppler-0.57.0
+++ b/metadata/md5-cache/app-text/poppler-0.57.0
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
 SLOT=0/68
 SRC_URI=https://poppler.freedesktop.org/poppler-0.57.0.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c10dc391ef31aa1e57a763f4ec902de
+_md5_=e5c275c07917c2aa5cbdf10189bd2f51
diff --git a/metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1 b/metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1
new file mode 100644
index 000000000000..19eab8e82630
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=vim spell files: Hungarian (hu)
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/vim-spell-hu-20100312.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
+_md5_=e58891cf00b809a0b4d12108eaf49915
diff --git a/metadata/md5-cache/app-vim/vim-spell-it-20100312-r1 b/metadata/md5-cache/app-vim/vim-spell-it-20100312-r1
new file mode 100644
index 000000000000..4ca969859129
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-spell-it-20100312-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=vim spell files: Italian (it)
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/vim-spell-it-20100312.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
+_md5_=309df2c13b735ececbcb62231558ea16
diff --git a/metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1 b/metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1
new file mode 100644
index 000000000000..fa25e2e65be2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=vim spell files: Dutch (nl)
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/vim-spell-nl-20051007.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
+_md5_=d22950fa54687e24c7f5ae83326dbada
diff --git a/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1 b/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
index d9ac904d3ab2..b91548c03bb1 100644
--- a/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=vim spell files: Polish (pl)
 EAPI=6
-HOMEPAGE=https://www.vim.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=CC-BY-SA-2.0
 SLOT=0
 SRC_URI=mirror://gentoo/vim-spell-pl-20060218.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=ff546b42f800027fe4520ef04c5a0742
+_md5_=17798d1a6951bcccb3f2048b57c65e1d
diff --git a/metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1 b/metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
new file mode 100644
index 000000000000..0b4e8d712cbe
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=vim spell files: Portuguese (pt)
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=mirror://gentoo/vim-spell-pt-20100312.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
+_md5_=cc1c13957f749b07dc37293997571816
diff --git a/metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1 b/metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
new file mode 100644
index 000000000000..420fe1b50a5d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=vim spell files: Russian (ru)
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=myspell-ru_RU-AlexanderLebedev
+SLOT=0
+SRC_URI=mirror://gentoo/vim-spell-ru-20070506.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
+_md5_=92e77d9536267597fe7b3ab3cca42e44
diff --git a/metadata/md5-cache/dev-db/pgadmin4-1.6 b/metadata/md5-cache/dev-db/pgadmin4-1.6
deleted file mode 100644
index 6e7bd4f8c04b..000000000000
--- a/metadata/md5-cache/dev-db/pgadmin4-1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] doc? ( dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
-DESCRIPTION=GUI administration and development platform for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgadmin.org/
-IUSE=doc python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=POSTGRESQL
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] >=app-text/htmlmin-0.1.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/Babel-2.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/beautifulsoup-4.4.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/blinker-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/click-6.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/extras-0.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/fixtures-2.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-babel-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-gravatar-0.4.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-htmlmin-1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-login-0.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-migrate-2.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-security-1.7.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-sqlalchemy-2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-wtf-0.12[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/html5lib-0.9999999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/itsdangerous-0.24[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/linecache2-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/markupsafe-0.23[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/mimeparse-1.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/passlib-1.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pbr-1.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/psycopg-2.7.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pycrypto-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pyrsistent-0.11.13[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-dateutil-2.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pytz-2014.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/simplejson-3.6.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/six-1.9.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/speaklater-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/sqlalchemy-1.0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/werkzeug-0.9.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/wtforms-2.0.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v1.6/source/pgadmin4-1.6.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0b4a448f63286e3e1ca376d62329fc99
diff --git a/metadata/md5-cache/dev-db/pgadmin4-2.0 b/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
index a6ecd765730c..150d34b9f538 100644
--- a/metadata/md5-cache/dev-db/pgadmin4-2.0
+++ b/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
@@ -6,10 +6,10 @@ HOMEPAGE=http://www.pgadmin.org/
 IUSE=doc python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=POSTGRESQL
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] >=app-text/htmlmin-0.1.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/Babel-2.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/beautifulsoup-4.4.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/blinker-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/click-6.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/extras-0.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/fixtures-2.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-babel-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-gravatar-0.4.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-htmlmin-1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-login-0.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-migrate-2.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-security-1.7.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-sqlalchemy-2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-wtf-0.12[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/html5lib-0.9999999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/itsdangerous-0.24[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/linecache2-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/markupsafe-0.23[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/mimeparse-1.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/passlib-1.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pbr-1.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/psycopg-2.7.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pycrypto-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pyrsistent-0.11.13[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-dateutil-2.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pytz-2014.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/simplejson-3.6.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/six-1.9.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/speaklater-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/sqlalchemy-1.0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/werkzeug-0.9.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/wtforms-2.0.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] >=app-text/htmlmin-0.1.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/Babel-2.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/beautifulsoup-4.4.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/blinker-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/click-6.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/extras-0.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/fixtures-2.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-babel-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-gravatar-0.4.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-htmlmin-1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-login-0.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-migrate-2.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-paranoid-0.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-security-1.7.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-sqlalchemy-2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-wtf-0.12[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/html5lib-0.9999999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/itsdangerous-0.24[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/linecache2-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/markupsafe-0.23[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/mimeparse-1.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/passlib-1.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pbr-1.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/psycopg-2.7.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pycrypto-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pyrsistent-0.11.13[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-dateutil-2.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pytz-2014.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/simplejson-3.6.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/six-1.9.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/speaklater-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/sqlalchemy-1.0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/werkzeug-0.9.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/wtforms-2.0.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v2.0/source/pgadmin4-2.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0b4a448f63286e3e1ca376d62329fc99
+_md5_=c7f9bc817079f74b7bc3014c7a88f164
diff --git a/metadata/md5-cache/dev-games/clanlib-0.8.1 b/metadata/md5-cache/dev-games/clanlib-0.8.1
index 0145fe83cdd4..a89b6d5e2df6 100644
--- a/metadata/md5-cache/dev-games/clanlib-0.8.1
+++ b/metadata/md5-cache/dev-games/clanlib-0.8.1
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:0 virtual/jpeg:0 virtual/glu virtual/opengl sdl? ( med
 SLOT=0.8
 SRC_URI=http://clanlib.org/download/releases-0.8/ClanLib-0.8.1.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=faa45d5ac4e5a74f2715a16c9e0c594c
+_md5_=61cee2eece0c2a5a003db308c925cc88
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.06.0_beta1 b/metadata/md5-cache/dev-lang/ocaml-4.06.0_beta2
index 5cbef0f06818..f935e07dca93 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.06.0_beta1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.06.0_beta2
@@ -4,10 +4,11 @@ DESCRIPTION=Type-inferring functional programming language descended from the ML
 EAPI=5
 HOMEPAGE=http://www.ocaml.org/
 IUSE=emacs flambda latex ncurses +ocamlopt spacetime X xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=QPL-1.0 LGPL-2
 PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( sys-libs/libunwind:= ) X? ( x11-libs/libX11 x11-proto/xproto )
-SLOT=0/4.06.0_beta1
-SRC_URI=https://github.com/ocaml/ocaml/archive/4.06.0+beta1.tar.gz -> ocaml-4.06.0-beta1.tar.gz mirror://gentoo/ocaml-patches-10.tar.bz2
+SLOT=0/4.06.0_beta2
+SRC_URI=https://github.com/ocaml/ocaml/archive/4.06.0+beta2.tar.gz -> ocaml-4.06.0-beta2.tar.gz mirror://gentoo/ocaml-patches-10.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=55b74c6addbb1053fb583936e6c89f42
+_md5_=a5c4c38e55e34f181b525d2df44e2d1c
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.30.465504 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.30.465504
new file mode 100644
index 000000000000..ad3d3c619b72
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.30.465504
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst prepare unpack
+DEPEND=dev-util/patchelf
+DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
+EAPI=6
+HOMEPAGE=https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx
+KEYWORDS=~amd64
+LICENSE=AMD-GPU-PRO-EULA
+RDEPEND=dev-libs/ocl-icd
+RESTRICT=mirror fetch strip
+SLOT=0
+SRC_URI=amdgpu-pro-17.30-465504.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0040708466df280d7dbc6d1a0833736c
diff --git a/metadata/md5-cache/dev-libs/libffi-3.2.1 b/metadata/md5-cache/dev-libs/libffi-3.2.1
index 8feb4547f6b8..b6b6a43334f5 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.2.1
+++ b/metadata/md5-cache/dev-libs/libffi-3.2.1
@@ -10,4 +10,4 @@ RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d37c6e73cfcd2bc657980a7d4d40267a
+_md5_=6dad29a7e7122904eb897d620309cc52
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2 b/metadata/md5-cache/dev-libs/ppl-1.2
index 61c95da91208..ea775442a1cc 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.2
+++ b/metadata/md5-cache/dev-libs/ppl-1.2
@@ -4,9 +4,9 @@ DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex system
 EAPI=5
 HOMEPAGE=http://bugseng.com/products/ppl
 IUSE=+cxx doc lpsol pch static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk ) !dev-libs/cloog-ppl
 SLOT=0/4.14
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz
-_md5_=ffeb1847a484605901be38051effba5b
+_md5_=cee49109d2e512f085edafe4e6f8516b
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.06_p1 b/metadata/md5-cache/dev-ml/camlp4-4.06_p1
new file mode 100644
index 000000000000..bf418a19c91c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlp4-4.06_p1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.06_beta:=[ocamlopt?] dev-ml/ocamlbuild
+DESCRIPTION=System for writing extensible parsers for programming languages
+EAPI=5
+HOMEPAGE=https://github.com/ocaml/camlp4
+IUSE=+ocamlopt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4.06_beta:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
+SLOT=0/4.06_p1
+SRC_URI=https://github.com/ocaml/camlp4/archive/4.06+1.tar.gz -> camlp4-4.06_p1.tar.gz
+_md5_=8f01c6579e23c993bcc07b23254a7bb1
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta11 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta11
deleted file mode 100644
index 3ba7665ea19f..000000000000
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=test? ( dev-ml/menhir ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A composable build system for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/jbuilder
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4:=
-SLOT=0/1.0_beta11
-SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta11.tar.gz -> jbuilder-1.0-beta11.tar.gz
-_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=281533637252a9fb9df3516f20d92c45
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta12 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta12
deleted file mode 100644
index 13a810b36612..000000000000
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=test? ( dev-ml/menhir ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A composable build system for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/jbuilder
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4:=
-SLOT=0/1.0_beta12
-SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta12.tar.gz -> jbuilder-1.0-beta12.tar.gz
-_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=281533637252a9fb9df3516f20d92c45
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta13 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta13
deleted file mode 100644
index 34edc33a82e4..000000000000
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=test? ( dev-ml/menhir ) >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A composable build system for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/jbuilder
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4:=
-SLOT=0/1.0_beta13
-SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta13.tar.gz -> jbuilder-1.0-beta13.tar.gz
-_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=281533637252a9fb9df3516f20d92c45
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.3 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.3
deleted file mode 100644
index 41d15d67798a..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=Convert OCaml parsetrees between different major versions
-EAPI=6
-HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
-SLOT=0/1.0.3
-SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.3.tar.gz -> ocaml-migrate-parsetree-1.0.3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.4 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
index 4099eb4cf7d4..5ea5197d2211 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.4
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
-SLOT=0/1.0.4
-SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.4.tar.gz -> ocaml-migrate-parsetree-1.0.4.tar.gz
+SLOT=0/1.0.6
+SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.6.tar.gz -> ocaml-migrate-parsetree-1.0.6.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
 _md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.5 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.5
new file mode 100644
index 000000000000..6011efa01b60
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:= >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=OCaml bindings for OpenSSL
+EAPI=5
+HOMEPAGE=https://github.com/savonet/ocaml-ssl
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=
+SLOT=0/0.5.5
+SRC_URI=https://github.com/savonet/ocaml-ssl/releases/download/0.5.5/ocaml-ssl-0.5.5.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0c978856c6643299210aae8d31522d19
diff --git a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2 b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
new file mode 100644
index 000000000000..a20cbe6ea816
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.2 >=dev-perl/DBI-1.30 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Authentication and Authorization via Perl's DBI
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Apache-DBI/
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.2 >=dev-perl/DBI-1.30 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-DBI-1.12.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=cb2ab0a9c11b33d6515aa6389782915f
diff --git a/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1 b/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1
new file mode 100644
index 000000000000..b9b302d0ea4e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=www-apache/mod_perl dev-perl/Apache-Test dev-lang/perl:=
+DESCRIPTION=Automatically reload changed modules without restarting Apache
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Apache-Reload/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=www-apache/mod_perl dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Reload-0.13.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=583bb4fde223e3afe7df11c526841279
diff --git a/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2 b/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
new file mode 100644
index 000000000000..9b4b915e769d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/perl-ExtUtils-MakeMaker =www-servers/apache-2* dev-lang/perl:=
+DESCRIPTION=Test.pm wrapper with helpers for testing Apache
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Apache-Test/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND==www-servers/apache-2* dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=7e957c6fdad767cc79f9a502c51930c7
diff --git a/metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2 b/metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
new file mode 100644
index 000000000000..24c9a5078f22
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-MIME-Base64 >=www-apache/mod_perl-2 dev-lang/perl:=
+DESCRIPTION=Perform Microsoft NTLM and Basic User Authentication
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Apache2-AuthenNTLM/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-MIME-Base64 >=www-apache/mod_perl-2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SP/SPEEVES/Apache2-AuthenNTLM-0.02.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=7efe99aaebad38c5c3efcdb1bf4e18a5
diff --git a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1 b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
index e328e48c1555..b983a8f4eb71 100644
--- a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
+++ b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.vanhemert.co.uk/files/Audio-CD-0.05.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=dc7a5e5d26f6256081f569c09e4ec060
+_md5_=9757e298cbe21c48344452269d61b25e
diff --git a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r2 b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r2
new file mode 100644
index 000000000000..41ca01105b23
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/URI-1.10 >=dev-perl/HTML-Parser-3.15 >=virtual/perl-MIME-Base64-2.12 >=virtual/perl-Digest-MD5-2.12 >=virtual/perl-libnet-1.0703-r1 >=dev-perl/libwww-perl-5.50 >=media-libs/libcdaudio-0.99.6 dev-lang/perl:=
+DESCRIPTION=Perl Module needed for app-cdr/disc-cover
+EAPI=6
+HOMEPAGE=http://www.vanhemert.co.uk/disc-cover.html
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/URI-1.10 >=dev-perl/HTML-Parser-3.15 >=virtual/perl-MIME-Base64-2.12 >=virtual/perl-Digest-MD5-2.12 >=virtual/perl-libnet-1.0703-r1 >=dev-perl/libwww-perl-5.50 >=media-libs/libcdaudio-0.99.6 dev-lang/perl:=
+SLOT=0
+SRC_URI=http://www.vanhemert.co.uk/files/Audio-CD-0.05.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c5771daf5bff3bfe793d312b15d5dd69
diff --git a/metadata/md5-cache/dev-perl/Audio-DSP-0.20.0-r2 b/metadata/md5-cache/dev-perl/Audio-DSP-0.20.0-r2
new file mode 100644
index 000000000000..2fa398cb55b9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Audio-DSP-0.20.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Perl interface to *NIX digital audio device
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Audio-DSP/
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SE/SETHJ/Audio-DSP-0.02.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=31b96e91d9769f987fb69120dd36b272
diff --git a/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2 b/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2
new file mode 100644
index 000000000000..3e2629fc058a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pam dev-lang/perl:=
+DESCRIPTION=Interface to PAM library
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Authen-PAM/
+IUSE=examples examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/pam dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NIKIP/Authen-PAM-0.16.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=187285013ae8146da7391210ca6c0fc3
diff --git a/metadata/md5-cache/dev-perl/Authen-SCRAM-0.5.0-r1 b/metadata/md5-cache/dev-perl/Authen-SCRAM-0.5.0-r1
new file mode 100644
index 000000000000..57f2b5aeade6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Authen-SCRAM-0.5.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Authen-SASL-SASLprep virtual/perl-Carp dev-perl/Crypt-URandom virtual/perl-Encode virtual/perl-MIME-Base64 >=dev-perl/Moo-1.1.0 >=dev-perl/PBKDF2-Tiny-0.3.0 dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/namespace-clean >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( virtual/perl-Exporter virtual/perl-File-Spec dev-perl/Test-FailWarnings dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=Salted Challenge Response Authentication Mechanism (RFC 5802)
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Authen-SCRAM/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Authen-SASL-SASLprep virtual/perl-Carp dev-perl/Crypt-URandom virtual/perl-Encode virtual/perl-MIME-Base64 >=dev-perl/Moo-1.1.0 >=dev-perl/PBKDF2-Tiny-0.3.0 dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/namespace-clean dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Authen-SCRAM-0.005.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=a243dbfbd1ce2fc4fa5b7c5a39460f40
diff --git a/metadata/md5-cache/dev-perl/Importer-0.24.0 b/metadata/md5-cache/dev-perl/Importer-0.24.0
index 788554da00c3..02ea70e0dbeb 100644
--- a/metadata/md5-cache/dev-perl/Importer-0.24.0
+++ b/metadata/md5-cache/dev-perl/Importer-0.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Alternative interface to modules that export symbols
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Importer/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.024.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8c34a3611ae9d9e93006bbc0d7c16f5a
+_md5_=076a2e9537cbce86eb38acddce6cf476
diff --git a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0 b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0
index 1568e1477c65..3b71d25c66fb 100644
--- a/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0
+++ b/metadata/md5-cache/dev-perl/Params-ValidationCompiler-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=Build an optimized subroutine parameter validator once, use it forev
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Params-ValidationCompiler/
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Eval-Closure dev-perl/Exception-Class virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.400.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.24.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d1c188ffb0bc2379ba6bc78946e08f11
+_md5_=bde9391c3bd864dc79f18f5e8b140311
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0 b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
index 774968710774..7e46441a06f0 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
+++ b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provide commonly requested regular expressions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Regexp-Common/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc x86
 LICENSE=|| ( Artistic Artistic-2 MIT BSD )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=150986533b93410e1473481581bcdc01
+_md5_=9ff93b71bfd5f4c10ecb074eed21aba2
diff --git a/metadata/md5-cache/dev-perl/Sub-Info-0.2.0 b/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
index 0f5df0cf6700..4cf466879ac6 100644
--- a/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
+++ b/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for inspecting subroutines
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Info/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9b16a755c9ed6d510dd073362f462663
+_md5_=62d39daebb49bd966d861b3f474c46db
diff --git a/metadata/md5-cache/dev-perl/Term-Table-0.8.0 b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
index d317388b56fb..cf3bf3522d1c 100644
--- a/metadata/md5-cache/dev-perl/Term-Table-0.8.0
+++ b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Format a header and rows into a table
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Term-Table/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.008.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fb86c5c8d2f7ad3623c29508b644f713
+_md5_=273b12009e7fc820153f3c48db4a3c9e
diff --git a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0 b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
index e68c98e9c593..f491472f3ad2 100644
--- a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
+++ b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provide commonly requested regular expressions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Regexp/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=virtual/perl-Test-Simple virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Test-Regexp-2017040101.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c3b0139cf87659871b557f9e17cda751
+_md5_=05886679d83735e678e564a3235841f6
diff --git a/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0 b/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
index 23070610502d..d965d64d4fe8 100644
--- a/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
+++ b/metadata/md5-cache/dev-perl/Test-Without-Module-0.200.0
@@ -4,10 +4,10 @@ DESCRIPTION=Test fallback behaviour in absence of modules
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Without-Module/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3eb09faf59279c9c9764aa293e243a0d
+_md5_=ef81830aa59b81df73ce6b568d72d779
diff --git a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.50.0 b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.50.0
index 6f8037d5ad06..3de83cd3671c 100644
--- a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.50.0
+++ b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fail if tests warn
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test2-Plugin-NoWarnings/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Test-Simple-1.302.15 virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.05.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=87acfa5026a0c72d4c1f19f788b64932
+_md5_=335f09f8a0f96efecf87b3e55b2fb8aa
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
index 3e87144b41fa..5452b0c31ee6 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
@@ -4,10 +4,10 @@ DESCRIPTION=A rich set of tools built upon the Test2 framework
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test2-Suite/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Info-0.1.0 >=dev-perl/Term-Table-0.2.0 >=virtual/perl-Test-Simple-1.302.73 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000077.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2c9d0fcf3d1859506d3fa5dd6003e631
+_md5_=37fe20a7faeaa1c0c520f0ec0a9f3353
diff --git a/metadata/md5-cache/dev-perl/aliased-0.340.0-r1 b/metadata/md5-cache/dev-perl/aliased-0.340.0-r1
new file mode 100644
index 000000000000..ee1ac4761fde
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/aliased-0.340.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Module-Build-Tiny-0.39.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Test-Simple virtual/perl-if ) dev-lang/perl:=
+DESCRIPTION=Use shorter versions of class names
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/aliased/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c727848fc43f596f660713db68a8b77a
diff --git a/metadata/md5-cache/dev-php/xdebug-2.5.3 b/metadata/md5-cache/dev-php/xdebug-2.5.3
index b08725a44fe9..b29399897073 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.5.3
+++ b/metadata/md5-cache/dev-php/xdebug-2.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=A PHP debugging and profiling extension
 EAPI=6
 HOMEPAGE=http://www.xdebug.org/
 IUSE=php_targets_php7-1 php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~hppa ~ppc ppc64 ~x86
+KEYWORDS=~amd64 ~hppa ppc ppc64 ~x86
 LICENSE=Xdebug
 RDEPEND=~dev-php/xdebug-client-2.5.3 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-0 php_targets_php5-6 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.5.3.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6a79d07f1c1003a6b6e899ca91a34149
+_md5_=d03c8daf0b882b32f77b3d6fd02aaf37
diff --git a/metadata/md5-cache/dev-php/xdebug-client-2.5.3 b/metadata/md5-cache/dev-php/xdebug-client-2.5.3
index 718198334e23..57234d7ac636 100644
--- a/metadata/md5-cache/dev-php/xdebug-client-2.5.3
+++ b/metadata/md5-cache/dev-php/xdebug-client-2.5.3
@@ -4,9 +4,9 @@ DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
 EAPI=6
 HOMEPAGE=http://www.xdebug.org/
 IUSE=libedit
-KEYWORDS=~amd64 ~hppa ~ppc ppc64 ~x86
+KEYWORDS=~amd64 ~hppa ppc ppc64 ~x86
 LICENSE=Xdebug
 RDEPEND=libedit? ( dev-libs/libedit )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.5.3.tgz
-_md5_=9222f96553b4a546e0643364afc6955e
+_md5_=d87b781188258ab4021fbf1ea202458f
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.3.8 b/metadata/md5-cache/dev-python/catkin_pkg-0.3.8
new file mode 100644
index 000000000000..8e87d0aec93c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.3.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Standalone Python library for the catkin package system
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/catkin_pkg
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.3.8.tar.gz -> catkin_pkg-0.3.8-gh.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f7a7dd12632058c8de7ad719c8de1595
diff --git a/metadata/md5-cache/dev-python/flask-paranoid-0.1.0 b/metadata/md5-cache/dev-python/flask-paranoid-0.1.0
new file mode 100644
index 000000000000..a7b3b62d7b19
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-paranoid-0.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Simple user session protection extension for Flask
+EAPI=6
+HOMEPAGE=https://github.com/miguelgrinberg/flask-paranoid/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Paranoid/Flask-Paranoid-0.1.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd59405f8e5e370f20ab99aa2a71eaee
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.0 b/metadata/md5-cache/dev-python/psutil-5.4.0
new file mode 100644
index 000000000000..194d9b938ffe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-5.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=6
+HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/psutil/psutil-5.4.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1b023f1487abcc5529191ebeaccc15f0
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.2 b/metadata/md5-cache/dev-python/rospkg-1.1.4
index 8fd3e09ced98..6afc234bb70e 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.1.2
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.4
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.2.tar.gz -> rospkg-1.1.2.tar.gz
+SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.4.tar.gz -> rospkg-1.1.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=732b6fe7a4e04e39afb690113c5a6d54
diff --git a/metadata/md5-cache/dev-python/simplekv-0.11.3 b/metadata/md5-cache/dev-python/simplekv-0.11.3
new file mode 100644
index 000000000000..e4c23477faea
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplekv-0.11.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A key-value storage for binary data, support many backends.
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/simplekv/simplekv-0.11.3.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8323e9892573811592f64072e0845993
diff --git a/metadata/md5-cache/dev-python/uvloop-0.8.1 b/metadata/md5-cache/dev-python/uvloop-0.8.1
index a476a0df0a31..f6d8954274ad 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.8.1
+++ b/metadata/md5-cache/dev-python/uvloop-0.8.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.8.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fc10e027dfc958715882d50060a0959
+_md5_=6e205ac5dcfc61dc4aca6ccc885cbc46
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-0.2.3 b/metadata/md5-cache/dev-ros/openni2_launch-0.2.3
new file mode 100644
index 000000000000..5d91a5e070cb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openni2_launch-0.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/openni2_launch
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/openni2_launch/archive/0.2.3.tar.gz -> openni2_launch-0.2.3.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=05c599f17876d19ef78c0417330c2e5d
diff --git a/metadata/md5-cache/dev-ros/rospack-2.4.3 b/metadata/md5-cache/dev-ros/rospack-2.4.3
new file mode 100644
index 000000000000..7588335c0e44
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rospack-2.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/cmake_modules-0.4.1 test? ( dev-cpp/gtest dev-python/nose ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Retrieves information about ROS packages available on the filesystem
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rospack
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/rospack/archive/2.4.3.tar.gz -> rospack-2.4.3.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e6cef78ca714f5db42134047f9ca2879
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.7 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.7
deleted file mode 100644
index 279030bd8266..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rqt_bag
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ccd0d93d9dd8ebc08de194082c3e6c7d
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.8 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.9
index 236c17ca8028..177f5493593a 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.9
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.8.tar.gz -> rqt_bag-0.4.8.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.9.tar.gz -> rqt_bag-0.4.9.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3a71e381828c161ace3d18aca7ccb2c9
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.7 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.7
deleted file mode 100644
index 4a0a31be7934..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a7c413940910b467124162aa3147063e
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.8 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.9
index 56c7ae7c20af..b3d8bd2d12fa 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.9
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.8.tar.gz -> rqt_bag-0.4.8.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.9.tar.gz -> rqt_bag-0.4.9.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=94413a8300acf7116bd5a7b0c93e0a28
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.6 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.6
deleted file mode 100644
index ee2cf314d01f..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=GUI plugin for visualizing 3D poses
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rqt_pose_view
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a3bdf63e29798498499b29a9ae43875e
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.7 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8
index f4aae36005b2..35b0e2ad2e2f 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.8
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.7.tar.gz -> rqt_pose_view-0.5.7.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.8.tar.gz -> rqt_pose_view-0.5.8.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=48583ee5945caf339fdb69360800ce0f
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.6 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.6
deleted file mode 100644
index e406539536ce..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=GUI plugin for steering a robot using Twist messages
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.6.tar.gz -> rqt_robot_plugins-0.5.6.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ebecfa0bd0befdcc877102aed160131b
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.7 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.8
index 1ae566d92196..d420eee591f9 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.8
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_robot_steering/archive/0.5.7.tar.gz -> rqt_robot_steering-0.5.7.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_robot_steering/archive/0.5.8.tar.gz -> rqt_robot_steering-0.5.8.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=e23218be3e1862ff15005d5e94164d94
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-5.0.4 b/metadata/md5-cache/dev-ruby/elasticsearch-5.0.4
new file mode 100644
index 000000000000..6d883f9804b2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-5.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/elasticsearch-api[ruby_targets_ruby22] dev-ruby/elasticsearch-transport[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/elasticsearch-api[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/elasticsearch-api[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/elasticsearch-transport[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/pry[ruby_targets_ruby22] dev-ruby/shoulda-context[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/shoulda-context[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Ruby integrations for ES, elasticsearch module
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/elasticsearch-api[ruby_targets_ruby22] dev-ruby/elasticsearch-transport[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/elasticsearch-api[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/elasticsearch-api[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v5.0.4.tar.gz -> elasticsearch-ruby-5.0.4.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=edbfa901e5831c9993c90b63f33d73b4
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-5.0.4 b/metadata/md5-cache/dev-ruby/elasticsearch-api-5.0.4
new file mode 100644
index 000000000000..8fa97ad0b56b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-5.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/multi_json[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/elasticsearch-transport[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/pry[ruby_targets_ruby22] dev-ruby/shoulda-context[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/shoulda-context[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Ruby integrations for ES, elasticsearch-api module
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v5.0.4.tar.gz -> elasticsearch-ruby-5.0.4.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2b8a9f6c695515d7a9861adb2d2ec155
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.4 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.4
new file mode 100644
index 000000000000..5d3ab3d04db3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/faraday[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/faraday[ruby_targets_ruby23] dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/faraday[ruby_targets_ruby24] dev-ruby/multi_json[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/ansi[ruby_targets_ruby22] dev-ruby/mocha:1.0[ruby_targets_ruby22] dev-ruby/pry[ruby_targets_ruby22] dev-ruby/shoulda-context[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/shoulda-context[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Ruby integrations for ES, elasticsearch-transport module
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/faraday[ruby_targets_ruby22] dev-ruby/multi_json[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/faraday[ruby_targets_ruby23] dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/faraday[ruby_targets_ruby24] dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v5.0.4.tar.gz -> elasticsearch-ruby-5.0.4.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a079f93244ec0dad1a43194802f82175
diff --git a/metadata/md5-cache/dev-ruby/gherkin-5.0.0 b/metadata/md5-cache/dev-ruby/gherkin-5.0.0
new file mode 100644
index 000000000000..a82233d1fa47
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gherkin-5.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Fast Gherkin lexer and parser
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/gherkin
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=5
+SRC_URI=mirror://rubygems/gherkin-5.0.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0c160605a839a4b8d37625e8c016fe9d
diff --git a/metadata/md5-cache/dev-ruby/http-3.0.0 b/metadata/md5-cache/dev-ruby/http-3.0.0
new file mode 100644
index 000000000000..f5bb6e33e248
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/http-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=An easy-to-use client library for making requests from Ruby
+EAPI=6
+HOMEPAGE=https://github.com/tarcieri/http
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby22] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby22] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby22] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=3
+SRC_URI=mirror://rubygems/http-3.0.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4b83181edae04fde5e4ffed0cede9ff2
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.6 b/metadata/md5-cache/dev-ruby/json-1.8.6
index b9e184cddefa..714689eb432d 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.6
+++ b/metadata/md5-cache/dev-ruby/json-1.8.6
@@ -4,11 +4,11 @@ DESCRIPTION=A JSON implementation as a Ruby extension
 EAPI=6
 HOMEPAGE=https://github.com/flori/json
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.6.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b997d6401462790092be6cf1293679cc
+_md5_=ff9af7025de85ec997bd09bbcf181a45
diff --git a/metadata/md5-cache/dev-ruby/maildir-2.2.1-r1 b/metadata/md5-cache/dev-ruby/maildir-2.2.1-r1
new file mode 100644
index 000000000000..676eef52af3f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/maildir-2.2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby22] dev-ruby/mail[ruby_targets_ruby22] dev-ruby/shoulda-context[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby23] dev-ruby/mail[ruby_targets_ruby23] dev-ruby/shoulda-context[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/fakefs-0.3.2[ruby_targets_ruby24] dev-ruby/mail[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A library for reading and writing arbitrary messages in DJB's maildir format
+EAPI=6
+HOMEPAGE=https://github.com/ktheory/maildir
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=2
+SRC_URI=mirror://rubygems/maildir-2.2.1.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f69f9bc70cbf5054fa51c9d0d49b3462
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.12.1 b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
index 8ea8f40910d9..7afa1c733625 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.12.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=5
 HOMEPAGE=https://github.com/intridea/multi_json
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.12.1.tar.gz -> multi_json-1.12.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4b72e06c3d2be3b6e337ff43591d687a
+_md5_=ac248063f360bcdc41332f4cd3ae79fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
index cab5c8ca5ce3..faf3674a8346 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.19
@@ -4,7 +4,7 @@ DESCRIPTION=A Ruby interface to some LDAP libraries
 EAPI=5
 HOMEPAGE=http://ruby-ldap.sourceforge.net/
 IUSE=ssl elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-macos
 LICENSE=BSD
 RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.19.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b763a390a8167c7252bb8b086a5f0c43
+_md5_=5786c599f83e71accf5a2be21f4f8e16
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
index 470c7db844d3..cf6e05814268 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL / GLUT bindings for ruby
 EAPI=6
 HOMEPAGE=https://github.com/larskanis/opengl
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.10.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d161c43468a86ed8dc00bc1281aa10de
+_md5_=d4bcd278bb255adc313425853e5167e5
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
index 8a582a4a62a2..c9b59c2cca1c 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.3.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e3795f30025687dcbf09fd01f1eb0884
+_md5_=c8f148328adf81b2b7134f4f515ead9e
diff --git a/metadata/md5-cache/dev-util/apitrace-4.0 b/metadata/md5-cache/dev-util/apitrace-4.0
deleted file mode 100644
index fcab1992781a..000000000000
--- a/metadata/md5-cache/dev-util/apitrace-4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A tool for tracing, analyzing, and debugging graphics APIs
-EAPI=5
-HOMEPAGE=https://github.com/apitrace/apitrace
-IUSE=+cli egl qt4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/apitrace/apitrace/tarball/4.0 -> apitrace-4.0.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c2bca19b4f0744eeb25bfc47d7154960
diff --git a/metadata/md5-cache/dev-util/apitrace-5.0 b/metadata/md5-cache/dev-util/apitrace-5.0
deleted file mode 100644
index b1d24f677198..000000000000
--- a/metadata/md5-cache/dev-util/apitrace-5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A tool for tracing, analyzing, and debugging graphics APIs
-EAPI=5
-HOMEPAGE=https://github.com/apitrace/apitrace
-IUSE=+cli egl qt4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/apitrace/apitrace/tarball/5.0 -> apitrace-5.0.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fd6b337b7b2c475871f3d846671610af
diff --git a/metadata/md5-cache/dev-util/apitrace-6.0 b/metadata/md5-cache/dev-util/apitrace-6.0
deleted file mode 100644
index fbbef60b1881..000000000000
--- a/metadata/md5-cache/dev-util/apitrace-6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A tool for tracing, analyzing, and debugging graphics APIs
-EAPI=5
-HOMEPAGE=https://github.com/apitrace/apitrace
-IUSE=+cli egl qt4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/apitrace/apitrace/archive/6.0.tar.gz -> apitrace-6.0.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6f6b060e2c32537e12a9b356bd7d188a
diff --git a/metadata/md5-cache/dev-util/apitrace-6.1 b/metadata/md5-cache/dev-util/apitrace-6.1
deleted file mode 100644
index cfe6640da9e3..000000000000
--- a/metadata/md5-cache/dev-util/apitrace-6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A tool for tracing, analyzing, and debugging graphics APIs
-EAPI=5
-HOMEPAGE=https://github.com/apitrace/apitrace
-IUSE=+cli egl qt4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/apitrace/apitrace/archive/6.1.tar.gz -> apitrace-6.1.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b870cd7c6ac72e10a85d0c75a8f2b327
diff --git a/metadata/md5-cache/dev-util/apitrace-7.1 b/metadata/md5-cache/dev-util/apitrace-7.1
index 44f8bc8ce36c..0e7eccb3a0e2 100644
--- a/metadata/md5-cache/dev-util/apitrace-7.1
+++ b/metadata/md5-cache/dev-util/apitrace-7.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-devel/gcc-4.7:* system-snappy? ( >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) media-libs/waffle[egl] ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-devel/gcc-4.7:* system-snappy? ( >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0= sys-process/procps x11-libs/libX11 egl? ( >=media-libs/mesa-8.0[gles1,gles2] media-libs/waffle[egl] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A tool for tracing, analyzing, and debugging graphics APIs
 EAPI=5
 HOMEPAGE=https://github.com/apitrace/apitrace
 IUSE=+cli egl qt5 system-snappy abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT BSD CC-BY-3.0 CC-BY-4.0 public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-devel/gcc-4.7:* system-snappy? ( >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) media-libs/waffle[egl] ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-devel/gcc-4.7:* system-snappy? ( >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0= sys-process/procps x11-libs/libX11 egl? ( >=media-libs/mesa-8.0[gles1,gles2] media-libs/waffle[egl] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/archive/7.1.tar.gz -> apitrace-7.1.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fd87ece45e761c014faaa0146c9ac72b
+_md5_=19438b6c962b9a7eaee7b5d2bfa3bc20
diff --git a/metadata/md5-cache/dev-util/cmake-3.8.2 b/metadata/md5-cache/dev-util/cmake-3.8.2
index 4c6e57012d0d..9269fd0c1c39 100644
--- a/metadata/md5-cache/dev-util/cmake-3.8.2
+++ b/metadata/md5-cache/dev-util/cmake-3.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs server system-jsoncpp ncurses qt5 test
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.8/cmake-3.8.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=2a98385603c0b6f8653e57c65e22c701
+_md5_=2d102f85cd74c9bfcb65f54ee22bf338
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2 b/metadata/md5-cache/dev-util/ninja-1.8.2
index a9bc1c637d89..73077d7a8367 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A small build system similar to make
 EAPI=6
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax zsh-completion
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b7d7f959002f5fe90c5fb3e203643275
+_md5_=6ebfcb748001efe2d0bbdd5ff8fb48b5
diff --git a/metadata/md5-cache/dev-util/source-highlight-3.1.8 b/metadata/md5-cache/dev-util/source-highlight-3.1.8
index 32c5ce520b93..8610692cab2a 100644
--- a/metadata/md5-cache/dev-util/source-highlight-3.1.8
+++ b/metadata/md5-cache/dev-util/source-highlight-3.1.8
@@ -4,10 +4,10 @@ DESCRIPTION=Generate highlighted source code as an (x)html document
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/src-highlite/source-highlight.html
 IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.62.0:=[threads] dev-util/ctags
 SLOT=0
 SRC_URI=mirror://gnu/src-highlite/source-highlight-3.1.8.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2d610d89cfc13700b04ba0b240599290
+_md5_=cabe9bc5eafacad3f5f9c102ac0aaa2a
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.39.0 b/metadata/md5-cache/kde-frameworks/attica-5.39.0
new file mode 100644
index 000000000000..16f04bc8faff
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/attica-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0e589edfc01bb8c6ca3e766c89740779
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.39.0 b/metadata/md5-cache/kde-frameworks/baloo-5.39.0
new file mode 100644
index 000000000000..18e3c340600a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kfilemetadata-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kidletime-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/solid-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kfilemetadata-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kidletime-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/solid-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/baloo-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4c58e92d10c2e885336be071560438bd
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.39.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.39.0
new file mode 100644
index 000000000000..f27142b6f0c4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/bluez-qt-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f2a516f7331d83e72c3c4f9d884943e2
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.39.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.39.0
new file mode 100644
index 000000000000..6247b46b8731
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.39.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69caf38e215dfa5a53beb377c255f1fe
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.39.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.39.0
new file mode 100644
index 000000000000..102a9b544ed9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.39.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=df0cf4e64053bb52eaa8e3b7e097e312
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.39.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.39.0
new file mode 100644
index 000000000000..c416bd7c4b3d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kdesupport/extra-cmake-modules
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/extra-cmake-modules-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e2d5b6d298e4411caad4ea0b42bbb512
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.39.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.39.0
new file mode 100644
index 000000000000..0913a755a0c7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/knewstuff-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kpackage-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/knewstuff-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kpackage-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/frameworkintegration-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=737070f89064e1299e23782b229eead2
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.39.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.39.0
new file mode 100644
index 000000000000..17e01179b99d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for working with KDE activities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kactivities-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a26aa2b13f20d1e834fa0bb02d63d6d4
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.39.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.39.0
new file mode 100644
index 000000000000..3173d508b883
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kactivities-stats-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=45be8bff12c0bd8574bd4faa06f06956
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.39.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.39.0
new file mode 100644
index 000000000000..c1bc74d5c636
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.7.1:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kapidox-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=19b65b2e813fba8fcd778eca732f11a7
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.39.0 b/metadata/md5-cache/kde-frameworks/karchive-5.39.0
new file mode 100644
index 000000000000..94481733d55e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+bzip2 +lzma debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/karchive-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5731a79e5882f6073d5602e2096f6be8
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.39.0 b/metadata/md5-cache/kde-frameworks/kauth-5.39.0
new file mode 100644
index 000000000000..40bc86879e9b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kauth-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1a11bc0d73f6813c8e775d305e0b40c1
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.39.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.39.0
new file mode 100644
index 000000000000..0b07fa6ce440
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kconfigwidgets-5.39:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kbookmarks-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54ba66ceb1e47fbf91959251877a3d22
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.39.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.39.0
new file mode 100644
index 000000000000..7b8bb2abdc1c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdeclarative-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdeclarative-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kcmutils-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8e11a30311f63aeebf5f6fa81cef7646
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.39.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.39.0
new file mode 100644
index 000000000000..244d954c64b1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kcodecs-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5b817a23a4095c7c7a0eda2e2d427582
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.39.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.39.0
new file mode 100644
index 000000000000..9e11bfefd0b9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kcompletion-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0087f13a5cd407ecbe601d1fb30d767b
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.39.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.39.0
new file mode 100644
index 000000000000..1b4b867e62ec
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kconfig-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=965ee525c2a25beca5478a0a2ee766e0
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.39.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.39.0
new file mode 100644
index 000000000000..583abd4e85a0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.39:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kconfigwidgets-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fed3023b601b138283eb0f7a0f5b117c
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.39.0
new file mode 100644
index 000000000000..a22e30af0f80
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kcoreaddons-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=539658846866ae52850fcc8e7de3eb42
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.39.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.39.0
new file mode 100644
index 000000000000..c9b7ab7c8741
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-proto/xproto nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtwidgets-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kcrash-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a2afdd1794180698d60365c768a43313
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.39.0
new file mode 100644
index 000000000000..0f171d11587f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kdbusaddons-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=81cda1765ba13ae70b94b2c88904df35
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.39.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.39.0
new file mode 100644
index 000000000000..c9c3810652fb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kpackage-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kpackage-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kdeclarative-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9d1735136bc2a914c81da2b04718e5c2
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.39.0 b/metadata/md5-cache/kde-frameworks/kded-5.39.0
new file mode 100644
index 000000000000..d9bb593341c0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kinit-5.39:5 >=kde-frameworks/kservice-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.39:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kinit-5.39:5 >=kde-frameworks/kservice-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kded-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=21e411b31abda5da52ecdce36cfaad78
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34
index 095976ee721b..8b53a330b6c7 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34
+++ b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qt3support-4.8.5:4[accessibility] opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) >=dev-qt/qtsql-4.8.5:4[qt3support] webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
+DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qt3support-4.8.5:4[accessibility] opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) >=dev-qt/qtsql-4.8.5:4[qt3support] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
 DESCRIPTION=Libraries needed for programs by KDE
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl +webkit test +handbook
+IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl test +handbook
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PDEPEND=x11-misc/xdg-utils handbook? ( kde-apps/khelpcenter:* ) policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qt3support-4.8.5:4[accessibility] opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) >=dev-qt/qtsql-4.8.5:4[qt3support] webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
+RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 >=dev-qt/qt3support-4.8.5:4[accessibility] opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) >=dev-qt/qtsql-4.8.5:4[qt3support] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
 REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdelibs-4.14.34.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b55dc42fed3f87b448c75ba536cbc3fd
+_md5_=852e7b7b039962f9d16e378d22640783
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.36 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.36
deleted file mode 100644
index 8f921fcd1f38..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.36
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
-DESCRIPTION=Libraries needed for programs by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl +webkit test +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-PDEPEND=x11-misc/xdg-utils handbook? ( kde-apps/khelpcenter:* ) policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils plasma? ( !sci-libs/plasma ) udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
-REQUIRED_USE=opengl? ( plasma ) udisks? ( udev ) upower? ( udev )
-RESTRICT=test
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/applications/17.08.1/src/kdelibs-4.14.36.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=194bd41e6c8c87373210e6a889131f8f
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
index 34db1b751a3a..2a6f6cce870e 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
+++ b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
+DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
 DESCRIPTION=Libraries needed for programs by KDE
 EAPI=6
 HOMEPAGE=https://www.kde.org/
-IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl +webkit test +handbook
+IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl test +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 PDEPEND=x11-misc/xdg-utils handbook? ( kde-apps/khelpcenter:* ) policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils plasma? ( !sci-libs/plasma ) udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( >=sys-power/upower-0.9.23 ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
+RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-4.8.5:4[qt3support?] media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.5:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils plasma? ( !sci-libs/plasma ) udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( >=sys-power/upower-0.9.23 ) kde-frameworks/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4
 REQUIRED_USE=opengl? ( plasma ) udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84f2dbee768148edeb0391f788f56704
+_md5_=5e2492c65be04aa8542aa161d12762e6
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.39.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.39.0
new file mode 100644
index 000000000000..96bb4895bfc0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kded-5.39:5 >=kde-frameworks/kdesignerplugin-5.39:5 >=kde-frameworks/kemoticons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kunitconversion-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/solid-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.39:5 >=dev-qt/designer-5.7.1:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kded-5.39:5 >=kde-frameworks/kdesignerplugin-5.39:5 >=kde-frameworks/kemoticons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kunitconversion-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/solid-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.39:5 >=kde-frameworks/kinit-5.39:5 >=kde-frameworks/kitemmodels-5.39:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kde4-l10n-16.04.3 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kdelibs4support-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b618c9857bd8b1565ad8dfc0c4f56d19
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.39.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.39.0
new file mode 100644
index 000000000000..49a919092e8e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kplotting-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.39:5 ) >=kde-frameworks/kdoctools-5.39:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=designer nls webkit debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kplotting-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.39:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kdesignerplugin-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3fdb98622ff91d9a46ab834eabb5169c
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.39.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.39.0
new file mode 100644
index 000000000000..2dc4403a54cb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kpty-5.39:5 >=kde-frameworks/kservice-5.39:5 X? ( x11-libs/libX11 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle super user actions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kpty-5.39:5 >=kde-frameworks/kservice-5.39:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kdesu-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a0cc3e9ecad38935109e78b23de6e37f
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.39.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.39.0
new file mode 100644
index 000000000000..a4fecea6e3d5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwallet-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwallet-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kdewebkit-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e0747a68e32cba5c1e986bea31b526c8
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.39.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.39.0
new file mode 100644
index 000000000000..2a4689175564
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kdnssd-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7ba1becabea5a694677ad7f54ec47fd7
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.10.95 b/metadata/md5-cache/kde-frameworks/kdoctools-5.39.0
index e675b87e7c8d..de8a23382a30 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.10.95
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.39.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.10:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+DEPEND=>=kde-frameworks/karchive-5.39:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/unstable/qqc2-desktop-style/qqc2-desktop-style-5.10.95.tar.xz
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/karchive-5.39:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kdoctools-5.39.0.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f77a87b9abae430a05192bd06e056775
+_md5_=40771509c2bb8ce31ac1b662ecf43df1
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.39.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.39.0
new file mode 100644
index 000000000000..c71efce243fa
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kservice-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kservice-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kemoticons-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6259a1fef4ad1b0e2a594c125a5f0bae
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.39.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.39.0
new file mode 100644
index 000000000000..f4df899c3583
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.39:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for extracting file metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.39:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+REQUIRED_USE=test? ( taglib )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kfilemetadata-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d91ba48efc351f0dee16bc38c9eb0cfb
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.39.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.39.0
new file mode 100644
index 000000000000..7101f9d44516
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kglobalaccel-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=28acc087dcbbf38f949de22d1c8e7074
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.39.0
new file mode 100644
index 000000000000..2f6c6f0c8a9b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kguiaddons-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=099ac82ffb493e7ad49234b1374ce211
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.39.0 b/metadata/md5-cache/kde-frameworks/khtml-5.39.0
new file mode 100644
index 000000000000..44c669c0ca4f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kjs-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwallet-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KHTML web rendering engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kjs-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwallet-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/khtml-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69e76baa63ce10e0d6fbb984b495e0d8
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.39.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.39.0
new file mode 100644
index 000000000000..5bd9337162f5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/ki18n-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1926b1d3ee99190787b084494249607f
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.39.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.39.0
new file mode 100644
index 000000000000..0c1a7254e6fb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kiconthemes-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5d76a73d55de375c29422e195f36b13c
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.39.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.39.0
new file mode 100644
index 000000000000..41939b13d51c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kidletime-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51f93c389b29bb1ef1a0e7c0cace8f6c
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.39.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.39.0
new file mode 100644
index 000000000000..5e07d967797a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.39:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eps openexr test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.39:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kimageformats-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=906e95c41685f0ac1503d271ae718989
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.39.0 b/metadata/md5-cache/kde-frameworks/kinit-5.39.0
new file mode 100644
index 000000000000..09ce5944d1d1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 x11-libs/libX11 x11-libs/libxcb caps? ( sys-libs/libcap ) man? ( >=kde-frameworks/kdoctools-5.39:5 ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+caps +man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 x11-libs/libX11 x11-libs/libxcb caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kinit-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=67e36506777015eebf79e132a1fcd2be
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.39.0 b/metadata/md5-cache/kde-frameworks/kio-5.39.0
new file mode 100644
index 000000000000..da84fbde4a53
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.39.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kbookmarks-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/solid-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.39:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 handbook? ( >=kde-frameworks/kdoctools-5.39:5 ) test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=acl +handbook kerberos +kwallet X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.39:5
+RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kbookmarks-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/solid-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.39:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kio-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af2e590a59c50a13e2d2c3ab320f9b1c
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.39.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.39.0
new file mode 100644
index 000000000000..6b827cb27099
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.39:5 ) >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=6
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=plasma debug examples test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.39:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kirigami2-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a79f27361fa013f4cc4993aba6669dc9
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.39.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.39.0
new file mode 100644
index 000000000000..b41a1fedda38
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( >=dev-qt/qtwidgets-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kitemmodels-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5317a881e2f5c6742841f1b6919671c8
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.39.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.39.0
new file mode 100644
index 000000000000..8cc784940499
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kitemviews-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c3d1b854770f4c2df50552363510eaf6
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.39.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.39.0
new file mode 100644
index 000000000000..a9d86e11516f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-libs/libX11 x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kjobwidgets-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=57b24fa5787eeaea2f77f66d8c1f94d7
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.39.0 b/metadata/md5-cache/kde-frameworks/kjs-5.39.0
new file mode 100644
index 000000000000..8da78aff50f9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre >=kde-frameworks/kdoctools-5.39:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kjs-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a346c67befa9f93d4dc14abdff04dabf
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.39.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.39.0
new file mode 100644
index 000000000000..7ee1aa0d2012
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kjs-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.39:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework binding JavaScript objects to QObjects
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kjs-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kjsembed-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dadbee7d969ecec42702be488f8f17ce
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.39.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.39.0
new file mode 100644
index 000000000000..6bb91d1b14ae
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a common interface for KParts that can play media files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kmediaplayer-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9ce52e47965f74f9e024f9498173497
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.39.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.39.0
new file mode 100644
index 000000000000..9058f817c64e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.39:5 >=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/attica-5.39:5 >=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.39:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/knewstuff-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=20fe499ab204f3e4816cf7214991c8b7
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.39.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.39.0
new file mode 100644
index 000000000000..e0de291a95b9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=dbus nls speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/knotifications-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef6aeab2d1defd125f1dbd7ed8032010
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.39.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.39.0
new file mode 100644
index 000000000000..ad41c120fcfe
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/knotifyconfig-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c6b7a53599366b57f7c273d7aad0bc3
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.39.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.39.0
new file mode 100644
index 000000000000..f3418915869e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 man? ( >=kde-frameworks/kdoctools-5.39:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kpackage-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9dc83860295a350c0029154f753829e2
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.39.0 b/metadata/md5-cache/kde-frameworks/kparts-5.39.0
new file mode 100644
index 000000000000..f71ce0fb57fc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/ktextwidgets-5.39:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kparts-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=610c40cbb6798cbd294bf74f6c1ae3c4
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.39.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.39.0
new file mode 100644
index 000000000000..fb74a1932f78
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE contact person abstraction library
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/frameworks/kpeople
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kpeople-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b919812d043c671dc14a4384eae6df04
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.39.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.39.0
new file mode 100644
index 000000000000..b7951d73f61d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kplotting-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=941277bc1b802a123d5e919913ac7020
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.39.0 b/metadata/md5-cache/kde-frameworks/kpty-5.39.0
new file mode 100644
index 000000000000..595ef470f2ca
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 sys-libs/libutempter sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kpty-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=10c8e0069f21dccb19400ec6a1b1c4c8
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.39.0 b/metadata/md5-cache/kde-frameworks/kross-5.39.0
new file mode 100644
index 000000000000..59e24f5c1f7f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.39:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kross-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7db1389b0f2e96b1f4322e63e07e8a1f
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.39.0 b/metadata/md5-cache/kde-frameworks/krunner-5.39.0
new file mode 100644
index 000000000000..e7449e9237cd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/plasma-5.39:5 >=kde-frameworks/solid-5.39:5 >=kde-frameworks/threadweaver-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/plasma-5.39:5 >=kde-frameworks/solid-5.39:5 >=kde-frameworks/threadweaver-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/krunner-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b6133644b4dc64c54406e014b7c2d326
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.39.0 b/metadata/md5-cache/kde-frameworks/kservice-5.39.0
new file mode 100644
index 000000000000..9ce64ff7845b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.39:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kservice-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=53c34a18d18f1400cc70003dfac8e01c
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0
new file mode 100644
index 000000000000..ef91f5b92ec6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=kde-frameworks/syntax-highlighting-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.7.1:5 test? ( >=kde-frameworks/kservice-5.39:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a full text editor component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=kde-frameworks/syntax-highlighting-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=22b745661e768be0c03c17795737baa9
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.39.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.39.0
new file mode 100644
index 000000000000..c28f8d2922c2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/ktextwidgets-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a2cf8be8e2f0beb55b658f92697927f8
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.39.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.39.0
new file mode 100644
index 000000000000..d6f2969f8cfc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting units
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kunitconversion-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=00846fd7e78876dd76c1ca4abdaf49a4
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.39.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.39.0
new file mode 100644
index 000000000000..b290cd4223d9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.39:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kwallet-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c1011496155cdc97331719976bd4e438
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.39.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.39.0
new file mode 100644
index 000000000000..3ffb42ee1a4a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.7.0 media-libs/mesa[egl] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.7.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kwayland-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=29dcfb9e4576b1239b06b8100c3ef34e
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.39.0
new file mode 100644
index 000000000000..f83e2c0088ed
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kwidgetsaddons-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c92f5c1c70e65a0496d6611b4d65d2c
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.39.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.39.0
new file mode 100644
index 000000000000..4242b35f18f8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kwindowsystem-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5de6c0b7532878b45ba13b67e700ae97
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.39.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.39.0
new file mode 100644
index 000000000000..6e9594d1d4f0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.39:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=attica test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.39:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kxmlgui-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cab148274fcbfb783c20885526782f8d
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.39.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.39.0
new file mode 100644
index 000000000000..1de4d3dd81b6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/kxmlrpcclient-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7908b19a688391dff99b759d148e018b
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.39.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.39.0
new file mode 100644
index 000000000000..8ec4fcc2f463
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/modemmanager-qt-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3460b1f9893b88a6b5c487fcdaac9017
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.39.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.39.0
new file mode 100644
index 000000000000..9e8e88bf06df
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/networkmanager-qt-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41142769b5f674b7ebcfa1db0e1e4508
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.39.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.39.0
new file mode 100644
index 000000000000..dcdf47c3cca7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.39:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/oxygen-icons5-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7f7e68a381027d0c30b2f16d16b291af
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.39.0 b/metadata/md5-cache/kde-frameworks/plasma-5.39.0
new file mode 100644
index 000000000000..0ca5e9e28dc8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.39.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.39:5 >=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdeclarative-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kpackage-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.39:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.39:5 X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma framework
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gles2 wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.39:5 >=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdeclarative-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kpackage-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.39:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/plasma-framework-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dfe852add4359e44f7142e1690cc603b
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.39.0 b/metadata/md5-cache/kde-frameworks/prison-5.39.0
new file mode 100644
index 000000000000..5175aa79d88b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/prison.git
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/prison-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0a8055a57e3e72fefa520211aceb29ac
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.39.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.39.0
new file mode 100644
index 000000000000..8220b073b29c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kirigami-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kirigami-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/qqc2-desktop-style-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ff276861c128ae85d9031bb898d681d
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.39.0 b/metadata/md5-cache/kde-frameworks/solid-5.39.0
new file mode 100644
index 000000000000..15bfd9770513
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/solid-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1cf83fb76d474646e2c81a6aa8a9dd48
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.39.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.39.0
new file mode 100644
index 000000000000..c57488bcd243
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=aspell +hunspell nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/sonnet-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e18d9b50fe49c7485c7a54e7513dda90
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.39.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.39.0
new file mode 100644
index 000000000000..e6b96911deba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for syntax highlighting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/syntax-highlighting-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=88fe7622e922b6449a355b7584879651
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.39.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.39.0
new file mode 100644
index 000000000000..bf51c75fc149
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.39.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.39:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.39
+SRC_URI=mirror://kde/stable/frameworks/5.39/threadweaver-5.39.0.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6af520d4d2345ebc79d62f785e593af4
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.0 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.0
index 968fbf92be59..1c361f2e6c64 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.0
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.0
@@ -11,4 +11,4 @@ REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) g
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.0/plasma-desktop-5.11.0.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7471032e19cfe5253a8bee546057498a
+_md5_=bc782873c17d169ed3bea6440ff65ba6
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.26_p20171013 b/metadata/md5-cache/media-gfx/exiv2-0.26_p20171013
index 89e908be601f..88a322224eaf 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.26_p20171013
+++ b/metadata/md5-cache/media-gfx/exiv2-0.26_p20171013
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/26
 SRC_URI=https://github.com/Exiv2/exiv2/tarball/269370863ecd61dd038eed3b96ecd65898d3bb6e -> exiv2-0.26_p20171013.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=545070ede9a157d9249cd6d671867291
+_md5_=b6fec85e7855c9864f3b9db56539df90
diff --git a/metadata/md5-cache/media-gfx/icc_examin-0.55-r1 b/metadata/md5-cache/media-gfx/icc_examin-0.55-r1
deleted file mode 100644
index 199e851eb203..000000000000
--- a/metadata/md5-cache/media-gfx/icc_examin-0.55-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-admin/elektra media-libs/ftgl media-libs/libXcm =media-libs/oyranos-0.9.5* media-libs/tiff:0 x11-libs/fltk x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm virtual/pkgconfig
-DESCRIPTION=Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables
-EAPI=5
-HOMEPAGE=http://www.oyranos.org/wiki/index.php?title=ICC_Examin
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/elektra media-libs/ftgl media-libs/libXcm =media-libs/oyranos-0.9.5* media-libs/tiff:0 x11-libs/fltk x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=https://github.com/oyranos-cms/icc-examin/archive/0.55.tar.gz -> icc_examin-0.55.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8567c814e3a9c70574c01c7c58332e64
diff --git a/metadata/md5-cache/media-gfx/icc_examin-0.56_p20171007 b/metadata/md5-cache/media-gfx/icc_examin-0.56_p20171007
new file mode 100644
index 000000000000..aec95108e4f7
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/icc_examin-0.56_p20171007
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=app-admin/elektra media-libs/freetype media-libs/ftgl media-libs/libXcm[X] media-libs/oyranos media-libs/tiff:0 virtual/jpeg:0 virtual/opengl x11-libs/fltk[opengl] x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm sys-devel/gettext virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables
+EAPI=6
+HOMEPAGE=http://www.oyranos.org/icc-examin/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/elektra media-libs/freetype media-libs/ftgl media-libs/libXcm[X] media-libs/oyranos media-libs/tiff:0 virtual/jpeg:0 virtual/opengl x11-libs/fltk[opengl] x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=https://github.com/oyranos-cms/icc-examin/tarball/ee9e8cd013766b0df2c5e3b4416f985322b22966 -> icc-examin-0.56_p20171007.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=908143fc73f58a1cf361e0528e416ec7
diff --git a/metadata/md5-cache/media-gfx/icc_examin-9999 b/metadata/md5-cache/media-gfx/icc_examin-9999
index 05e567699f36..a2fb25fa6a9b 100644
--- a/metadata/md5-cache/media-gfx/icc_examin-9999
+++ b/metadata/md5-cache/media-gfx/icc_examin-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=app-admin/elektra media-libs/ftgl media-libs/libXcm =media-libs/oyranos-9999 media-libs/tiff:0 x11-libs/fltk x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm virtual/pkgconfig >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables
-EAPI=5
-HOMEPAGE=http://www.oyranos.org/wiki/index.php?title=ICC_Examin
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=app-admin/elektra media-libs/freetype media-libs/ftgl media-libs/libXcm[X] media-libs/oyranos media-libs/tiff:0 virtual/jpeg:0 virtual/opengl x11-libs/fltk[opengl] x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm sys-devel/gettext virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables
+EAPI=6
+HOMEPAGE=http://www.oyranos.org/icc-examin/
 LICENSE=GPL-2
-RDEPEND=app-admin/elektra media-libs/ftgl media-libs/libXcm =media-libs/oyranos-9999 media-libs/tiff:0 x11-libs/fltk x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm
+RDEPEND=app-admin/elektra media-libs/freetype media-libs/ftgl media-libs/libXcm[X] media-libs/oyranos media-libs/tiff:0 virtual/jpeg:0 virtual/opengl x11-libs/fltk[opengl] x11-libs/libX11 x11-libs/libXinerama x11-libs/libXpm x11-libs/libXrandr x11-libs/libXxf86vm
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6e7aaa9d02e90f9ebec58bc6b0122edf
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3bfbb5647bf8fafd4eadbdbfa07da33e
diff --git a/metadata/md5-cache/media-gfx/pixie-2.2.6-r1 b/metadata/md5-cache/media-gfx/pixie-2.2.6-r1
index 5e29826d3390..48e7f321b13b 100644
--- a/metadata/md5-cache/media-gfx/pixie-2.2.6-r1
+++ b/metadata/md5-cache/media-gfx/pixie-2.2.6-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg media-libs/tiff media-libs/libpng x11-libs/fltk:1[opengl] media-libs/openexr virtual/opengl sys-libs/zlib X? ( x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXi x11-libs/libXmu x11-libs/libXt )
 SLOT=0
-SRC_URI=mirror://sourceforge/pixie/Pixie-src-2.2.6.tgz
+SRC_URI=mirror://sourceforge/pixie/Pixie-src-2.2.6.tgz https://dev.gentoo.org/~dilfridge/distfiles/pixie-2.2.6-gcc6.patch.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=785ac5287e2e0081f29805c869acbbfe
+_md5_=346080a45608d7a485f211aa1d601024
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.13 b/metadata/md5-cache/media-libs/libmtp-1.1.13
index 6208dc317e0c..f01fcf8a6788 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.13
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.13
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=6
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.13.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=2764a5c3f3287e13207e02ff3327387c
+_md5_=da2ec9858db36b5ed9a60c04b19ce660
diff --git a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2 b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
index e5b25a7d985f..8e3f64deb08b 100644
--- a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
+++ b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A graphical music visualization plugin similar to milkdrop
 EAPI=6
 HOMEPAGE=http://projectm.sourceforge.net
 IUSE=debug openmp video_cards_nvidia
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=media-fonts/dejavu >=media-libs/ftgl-2.1.3_rc5 media-libs/freetype:2 media-libs/mesa media-libs/glew:= sys-libs/zlib video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=23e48a53bb8d9a185c8c6fb116d5fa88
+_md5_=3bd9ec4f220fd8c17b12a63b3404f6e1
diff --git a/metadata/md5-cache/media-libs/libsamplerate-9999 b/metadata/md5-cache/media-libs/libsamplerate-9999
new file mode 100644
index 000000000000..705427125fab
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsamplerate-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sndfile? ( media-libs/libsndfile:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
+EAPI=6
+HOMEPAGE=http://www.mega-nerd.com/SRC/
+IUSE=sndfile static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=BSD-2
+RDEPEND=sndfile? ( media-libs/libsndfile:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( sndfile )
+SLOT=0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=1c380a33240d524f03581abda7f41fc5
diff --git a/metadata/md5-cache/media-libs/libsndfile-9999 b/metadata/md5-cache/media-libs/libsndfile-9999
new file mode 100644
index 000000000000..86bcc9436bdc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsndfile-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) sys-devel/autogen !minimal? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 ) virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A C library for reading and writing files containing sampled sound
+EAPI=6
+HOMEPAGE=http://www.mega-nerd.com/libsndfile
+IUSE=alsa minimal sqlite static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=LGPL-2.1
+RDEPEND=!minimal? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 )
+SLOT=0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=63847e1f8a1ff7319322d1dbd93d0828
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0 b/metadata/md5-cache/media-libs/openjpeg-2.3.0
index 5968d0d17f67..dffa5685ff95 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2cccab974378914affa850d41d0e74d4
+_md5_=0b3ba67e26e50d44bc2f78192a323c5b
diff --git a/metadata/md5-cache/media-libs/oyranos-0.9.5-r1 b/metadata/md5-cache/media-libs/oyranos-0.9.5-r1
deleted file mode 100644
index 055def785388..000000000000
--- a/metadata/md5-cache/media-libs/oyranos-0.9.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-admin/elektra-0.8.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/yajl-2.0.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libXcm-0.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-gfx/exiv2-0.23-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) raw? ( >=media-libs/libraw-0.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Colour management system allowing to share various settings across applications and services
-EAPI=5
-HOMEPAGE=http://www.oyranos.org/
-IUSE=X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-admin/elektra-0.8.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/yajl-2.0.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libXcm-0.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-gfx/exiv2-0.23-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) raw? ( >=media-libs/libraw-0.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/icc-profiles-basiccolor-printing2009 media-libs/icc-profiles-openicc
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/oyranos-cms/oyranos/archive/0.9.5.tar.gz -> oyranos-0.9.5.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=603453121451391fe620be3422832af4
diff --git a/metadata/md5-cache/media-libs/taglib-1.11.1 b/metadata/md5-cache/media-libs/taglib-1.11.1
deleted file mode 100644
index ba9a451903b7..000000000000
--- a/metadata/md5-cache/media-libs/taglib-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] boost? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-util/cppunit-1.13.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A library for reading and editing audio meta data
-EAPI=6
-HOMEPAGE=https://taglib.github.io/
-IUSE=boost debug examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=LGPL-2.1 MPL-1.1
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] boost? ( dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/taglib/taglib/archive/v1.11.1.tar.gz -> taglib-1.11.1.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=92f839feec66a9d02dce4777c009c2c4
diff --git a/metadata/md5-cache/media-libs/taglib-1.9.1-r2 b/metadata/md5-cache/media-libs/taglib-1.9.1-r2
deleted file mode 100644
index 9e8c7ecbbaaa..000000000000
--- a/metadata/md5-cache/media-libs/taglib-1.9.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-util/cppunit-1.13.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A library for reading and editing audio meta data
-EAPI=5
-HOMEPAGE=https://taglib.github.io/
-IUSE=+asf debug examples +mp4 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=LGPL-2.1 MPL-1.1
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=https://github.com/taglib/taglib/archive/v1.9.1.tar.gz -> taglib-1.9.1.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=df804008ee6c26f3c6ff3be6f60c5568
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.2 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.2
deleted file mode 100644
index 5ce67214c08c..000000000000
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtgui:4 media-libs/taglib media-sound/mpg123 =media-sound/qmmp-0.10* dev-lang/yasm sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A set of extra plugins for Qmmp
-EAPI=6
-HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 media-libs/taglib media-sound/mpg123 =media-sound/qmmp-0.10*
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.10.2.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f91121e595864cca43d1ea1add8a43ba
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.3 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.3
deleted file mode 100644
index 8681700ad6c9..000000000000
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtgui:4 media-libs/taglib media-sound/mpg123 =media-sound/qmmp-0.10* dev-lang/yasm sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A set of extra plugins for Qmmp
-EAPI=6
-HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 media-libs/taglib media-sound/mpg123 =media-sound/qmmp-0.10*
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.10.3.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f91121e595864cca43d1ea1add8a43ba
diff --git a/metadata/md5-cache/media-sound/grip-3.4.3 b/metadata/md5-cache/media-sound/grip-3.4.3
index 361d777a512a..f16aebaa2031 100644
--- a/metadata/md5-cache/media-sound/grip-3.4.3
+++ b/metadata/md5-cache/media-sound/grip-3.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ based Audio CD Player/Ripper
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/grip/
 IUSE=vorbis
-KEYWORDS=alpha ~amd64 ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-3.4.3.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fc08d0fe163d2645b2be2a2e09be5a19
+_md5_=467bf831955429b93bb40d6207957e70
diff --git a/metadata/md5-cache/media-sound/qmmp-0.10.10 b/metadata/md5-cache/media-sound/qmmp-0.10.10
deleted file mode 100644
index 9b4be6d94f0e..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-0.10.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtmultimedia:4 media-libs/taglib aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:4 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtopengl:4 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Qt4-based audio player with winamp/xmms skins support
-EAPI=6
-HOMEPAGE=http://qmmp.ylsoftware.com
-IUSE=aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtmultimedia:4 media-libs/taglib aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:4 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtopengl:4 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=gnome? ( dbus ) udisks? ( dbus )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.10.10.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2ae8855fb8e2dec2a06be61769c22169
diff --git a/metadata/md5-cache/media-sound/qmmp-0.10.9 b/metadata/md5-cache/media-sound/qmmp-0.10.9
deleted file mode 100644
index b97319af1346..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-0.10.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtmultimedia:4 media-libs/taglib aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:4 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtopengl:4 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Qt4-based audio player with winamp/xmms skins support
-EAPI=6
-HOMEPAGE=http://qmmp.ylsoftware.com
-IUSE=aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtmultimedia:4 media-libs/taglib aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:4 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtopengl:4 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=gnome? ( dbus ) udisks? ( dbus )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.10.9.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2ae8855fb8e2dec2a06be61769c22169
diff --git a/metadata/md5-cache/media-sound/qtractor-0.8.3 b/metadata/md5-cache/media-sound/qtractor-0.8.3
deleted file mode 100644
index 1130b34dec33..000000000000
--- a/metadata/md5-cache/media-sound/qtractor-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=!qt5? ( >=dev-qt/qtcore-4.2:4 >=dev-qt/qtgui-4.7:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 ) media-libs/alsa-lib media-libs/libsndfile virtual/jack media-libs/ladspa-sdk >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil dssi? ( media-libs/dssi ) mad? ( media-libs/libmad ) libsamplerate? ( media-libs/libsamplerate ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 )
-DESCRIPTION=Qtractor is an Audio/MIDI multi-track sequencer
-EAPI=5
-HOMEPAGE=http://qtractor.sourceforge.net/
-IUSE=debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!qt5? ( >=dev-qt/qtcore-4.2:4 >=dev-qt/qtgui-4.7:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 ) media-libs/alsa-lib media-libs/libsndfile virtual/jack media-libs/ladspa-sdk >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil dssi? ( media-libs/dssi ) mad? ( media-libs/libmad ) libsamplerate? ( media-libs/libsamplerate ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/qtractor/qtractor-0.8.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=31d509ec28ebe78bde90c65402e8d3b3
diff --git a/metadata/md5-cache/media-sound/qtractor-0.8.4 b/metadata/md5-cache/media-sound/qtractor-0.8.4
index 267988ff3c81..2958ea9e27c9 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.8.4
+++ b/metadata/md5-cache/media-sound/qtractor-0.8.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure
-DEPEND=!qt5? ( >=dev-qt/qtcore-4.2:4 >=dev-qt/qtgui-4.7:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 ) media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil virtual/jack dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil virtual/jack dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) dev-qt/linguist-tools:5 virtual/pkgconfig
 DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
 EAPI=6
-HOMEPAGE=http://qtractor.sourceforge.net/
-IUSE=cpu_flags_x86_sse debug dssi libsamplerate mad osc +qt5 rubberband vorbis zlib
+HOMEPAGE=https://qtractor.sourceforge.net/
+IUSE=cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!qt5? ( >=dev-qt/qtcore-4.2:4 >=dev-qt/qtgui-4.7:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 ) media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil virtual/jack dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil virtual/jack dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.8.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9225da77d25ec4cf4ca4aa8d6349bb85
+_md5_=30983cfff60d54089ebf1c8313841fac
diff --git a/metadata/md5-cache/media-sound/sndfile-tools-9999 b/metadata/md5-cache/media-sound/sndfile-tools-9999
new file mode 100644
index 000000000000..b118638a20e3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/sndfile-tools-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare unpack
+DEPEND=virtual/pkgconfig media-libs/libsndfile:= media-libs/libsamplerate:= x11-libs/cairo:= sci-libs/fftw:3.0= jack? ( media-sound/jack-audio-connection-kit:= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A small collection of programs that use libsndfile
+EAPI=6
+HOMEPAGE=http://www.mega-nerd.com/libsndfile/tools/
+IUSE=jack
+LICENSE=GPL-2
+RDEPEND=media-libs/libsndfile:= media-libs/libsamplerate:= x11-libs/cairo:= sci-libs/fftw:3.0= jack? ( media-sound/jack-audio-connection-kit:= )
+SLOT=0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=e1f37eb988474feb614bce3fde2dedcd
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.49 b/metadata/md5-cache/media-sound/spotify-1.0.49
deleted file mode 100644
index 5c96bdd32d3b..000000000000
--- a/metadata/md5-cache/media-sound/spotify-1.0.49
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Spotify is a social music platform
-EAPI=6
-HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
-IUSE=gnome pax_kernel pulseaudio
-KEYWORDS=amd64 x86
-LICENSE=Spotify
-RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa net-misc/curl[ssl,curl_ssl_openssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python pulseaudio? ( media-sound/pulseaudio ) gnome? ( gnome-extra/gnome-integration-spotify )
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.49.125.g72ee7853-111_amd64.deb ) x86? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.49.125.g72ee7853-22_i386.deb )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9e7f1c9eb6a62af2652055d176136e5
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.64 b/metadata/md5-cache/media-sound/spotify-1.0.64
index 1a572c72a717..746a4d5a2f44 100644
--- a/metadata/md5-cache/media-sound/spotify-1.0.64
+++ b/metadata/md5-cache/media-sound/spotify-1.0.64
@@ -4,11 +4,11 @@ DESCRIPTION=Spotify is a social music platform
 EAPI=6
 HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
 IUSE=gnome pax_kernel pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Spotify
 RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa net-misc/curl[ssl,curl_ssl_openssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python pulseaudio? ( media-sound/pulseaudio ) gnome? ( gnome-extra/gnome-integration-spotify )
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb ) x86? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=882b8c69f29f90a20dc898e1381fca8d
+_md5_=c82a6abdb04cb32b04ab107d61f91e3d
diff --git a/metadata/md5-cache/media-sound/toolame-02l-r4 b/metadata/md5-cache/media-sound/toolame-02l-r4
index 7a79b04e8baa..d12f505c31b2 100644
--- a/metadata/md5-cache/media-sound/toolame-02l-r4
+++ b/metadata/md5-cache/media-sound/toolame-02l-r4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=tooLAME - an optimized mpeg 1/2 layer 2 audio encoder
 EAPI=6
 HOMEPAGE=http://www.planckenergy.com
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/toolame/toolame-02l.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7eded8ae7ae1163080408d1f2ddbf7bb
+_md5_=07f8456a80c764f600b1f83875237f4e
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.3 b/metadata/md5-cache/media-video/ffmpeg-3.3.3
index 3eb3c82def04..3a1c2c97fea0 100644
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.3
+++ b/metadata/md5-cache/media-video/ffmpeg-3.3.3
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=6
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh schroedinger speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/55.57.57
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.3.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6349b787449c3354a27012907e8e3308
+_md5_=9340564e8f123e4f23c40d3e8eb9f563
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.4 b/metadata/md5-cache/media-video/ffmpeg-3.3.4
index c811e6eac5ea..3beac18cab96 100644
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.4
+++ b/metadata/md5-cache/media-video/ffmpeg-3.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=6
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh schroedinger speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/55.57.57
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.4.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=25b6c8f8de0d8340f4a2a918ee22ad1c
+_md5_=5f1a2250ebfb248bc7de1e0e7d499c2c
diff --git a/metadata/md5-cache/media-video/mplayer-1.3.0-r3 b/metadata/md5-cache/media-video/mplayer-1.3.0-r3
index 831986ace877..5731a045969e 100644
--- a/metadata/md5-cache/media-video/mplayer-1.3.0-r3
+++ b/metadata/md5-cache/media-video/mplayer-1.3.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Media Player for Linux
 EAPI=5
 HOMEPAGE=http://www.mplayerhq.hu/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran video_cards_s3virge video_cards_mga video_cards_tdfx
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
@@ -12,4 +12,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e85c04292a12f39ce35111a3fa8f56cd
+_md5_=54250fec238d5441e46710409a385a7f
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.1.21 b/metadata/md5-cache/net-analyzer/cacti-1.1.21
index 2d4e72a7d1e3..f2c40b9a380d 100644
--- a/metadata/md5-cache/net-analyzer/cacti-1.1.21
+++ b/metadata/md5-cache/net-analyzer/cacti-1.1.21
@@ -4,10 +4,10 @@ DESCRIPTION=Cacti is a complete frontend to rrdtool
 EAPI=6
 HOMEPAGE=https://www.cacti.net/
 IUSE=snmp doc vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
 SLOT=1.1.21
 SRC_URI=https://www.cacti.net/downloads/cacti-1.1.21.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=0813341b6caff98ff767f528cd56b968
+_md5_=0d19b37db422a9f5905a702500d9d1a1
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.1.25 b/metadata/md5-cache/net-analyzer/cacti-1.1.25
new file mode 100644
index 000000000000..1eb8dcd9b568
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-1.1.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Cacti is a complete frontend to rrdtool
+EAPI=6
+HOMEPAGE=https://www.cacti.net/
+IUSE=snmp doc vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
+SLOT=1.1.25
+SRC_URI=https://www.cacti.net/downloads/cacti-1.1.25.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=0813341b6caff98ff767f528cd56b968
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21
index d081778da1db..676f97175eae 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.21
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql sys-apps/help2man
 DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=6
 HOMEPAGE=https://cacti.net/spine_info.php
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
 SLOT=0
 SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.1.21.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=723a39f05601d9547eed7a36add094f4
+_md5_=ccb2b9ffe6a8f394f624c80e6606f88d
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.25 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.25
new file mode 100644
index 000000000000..d2c0f6d238b9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.25
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql sys-apps/help2man >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
+EAPI=6
+HOMEPAGE=https://cacti.net/spine_info.php
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
+SLOT=0
+SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.1.25.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=723a39f05601d9547eed7a36add094f4
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.3.3 b/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
index ef163f3e90c1..527b8b6b1837 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
 EAPI=6
 HOMEPAGE=http://www.nagios.org/
 IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.3.3.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=a5eaf7e950252bb51fd7ca1ca3c8a89c
+_md5_=900b834ba01026b4598ac836a0b17589
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.17-r2 b/metadata/md5-cache/net-analyzer/vnstat-1.17-r3
index 720bcb097c0c..e1c2f1cba758 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.17-r2
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.17-r3
@@ -10,4 +10,4 @@ RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 SLOT=0
 SRC_URI=http://humdi.net/vnstat/vnstat-1.17.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=b93a411bb70655929897bc961a70e5b0
+_md5_=9c0d2221be1b6d06388b128589176b95
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.4 b/metadata/md5-cache/net-dns/libidn2-2.0.4
index 3c272b118652..81e222076cc7 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.0.4
+++ b/metadata/md5-cache/net-dns/libidn2-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-3+
 RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn2-2.0.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f6db33d743766b159b3c6415732eabe6
+_md5_=38aeffd15d8f4e98e1788fa24c72b2a6
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.12 b/metadata/md5-cache/net-libs/gnutls-3.5.12
deleted file mode 100644
index e620701459ad..000000000000
--- a/metadata/md5-cache/net-libs/gnutls-3.5.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) valgrind? ( dev-util/valgrind ) test? ( seccomp? ( sys-libs/libseccomp ) ) test-full? ( guile? ( >=dev-scheme/guile-2 ) app-crypt/dieharder app-misc/datefudge dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
-EAPI=6
-HOMEPAGE=http://www.gnutls.org/
-IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 sslv2 sslv3 seccomp static-libs test test-full +tls-heartbeat tools valgrind zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
-SLOT=0/30
-SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.12.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=65c1fe9d179c7e302d7c0898ea16b490
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.13 b/metadata/md5-cache/net-libs/gnutls-3.5.13
index 34d0343aa080..939a00e65f3f 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.13
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.13
@@ -4,11 +4,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 sslv2 sslv3 seccomp static-libs test test-full +tls-heartbeat tools valgrind zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.13.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a14c21a4acbb3ea74b1514a9e55fd43e
+_md5_=c501a30248f659733f285beaa0b2042e
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.14 b/metadata/md5-cache/net-libs/gnutls-3.5.14
deleted file mode 100644
index d2c03e007f87..000000000000
--- a/metadata/md5-cache/net-libs/gnutls-3.5.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) valgrind? ( dev-util/valgrind ) test? ( seccomp? ( sys-libs/libseccomp ) ) test-full? ( guile? ( >=dev-scheme/guile-2 ) app-crypt/dieharder app-misc/datefudge dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
-EAPI=6
-HOMEPAGE=http://www.gnutls.org/
-IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 sslv2 sslv3 seccomp static-libs test test-full +tls-heartbeat tools valgrind zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
-SLOT=0/30
-SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.14.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6b918fe319c303c5f3dabd5eab82cd11
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.15 b/metadata/md5-cache/net-libs/gnutls-3.5.15
index 24a775433b3a..e09d15182cc4 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.15
@@ -4,11 +4,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.15.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=34f8dbe3cf6eefeda301a7890ea00706
+_md5_=f57a10bdedf407da5cd547cce866b02e
diff --git a/metadata/md5-cache/net-print/cups-filters-1.16.4 b/metadata/md5-cache/net-print/cups-filters-1.16.4
index 95fda37a15f7..dff1047b6269 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.16.4
+++ b/metadata/md5-cache/net-print/cups-filters-1.16.4
@@ -4,10 +4,10 @@ DESCRIPTION=Cups filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.16.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=07df9ae01b21ea1a1cc52ebc823fd33f
+_md5_=aa4bfdc74540cb66e5b90a501746c780
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.92.0 b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.94.0
index f7707869a47e..aa5c3b67a6d4 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.92.0
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.94.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat <sci-libs/geos-3.6.0 sci-libs/proj sys-libs/zlib lua? ( dev-lang/lua:= ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj sys-libs/zlib lua? ( dev-lang/lua:= ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Converts OSM data to SQL and insert into PostgreSQL db
 EAPI=6
 HOMEPAGE=https://wiki.openstreetmap.org/wiki/Osm2pgsql https://github.com/openstreetmap/osm2pgsql
 IUSE=+lua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat <sci-libs/geos-3.6.0 sci-libs/proj sys-libs/zlib lua? ( dev-lang/lua:= ) dev-db/postgis
+RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj sys-libs/zlib lua? ( dev-lang/lua:= ) dev-db/postgis
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/0.92.0.tar.gz -> osm2pgsql-0.92.0.tar.gz
+SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/0.94.0.tar.gz -> osm2pgsql-0.94.0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3cda549a0fe16d2b57c2f109a98be783
+_md5_=b05c823ff9b86b6f5b7b484ab7e31833
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-1.30 b/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
new file mode 100644
index 000000000000..e4917d1465bf
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/ocaml-3.12.1[ocamlopt?] dev-ml/zarith gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] ) dev-ml/camlzip dev-ml/ocplib-simplex
+DESCRIPTION=Automatic theorem prover
+EAPI=6
+HOMEPAGE=http://alt-ergo.ocamlpro.com
+IUSE=examples gtk +ocamlopt
+KEYWORDS=~amd64
+LICENSE=CeCILL-C
+RDEPEND=>=dev-lang/ocaml-3.12.1[ocamlopt?] dev-ml/zarith gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] ) dev-ml/camlzip dev-ml/ocplib-simplex
+SLOT=0
+SRC_URI=https://alt-ergo.ocamlpro.com/http/alt-ergo-1.30/alt-ergo-1.30.tar.gz
+_md5_=c9eb17b95972846ff9ce2b78bf9dcb31
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.6.1 b/metadata/md5-cache/sci-mathematics/rkward-0.6.1
deleted file mode 100644
index 2b615c29d00a..000000000000
--- a/metadata/md5-cache/sci-mathematics/rkward-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-lang/R >=kde-apps/katepart-4.4:4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=IDE for the R-project
-EAPI=5
-HOMEPAGE=http://rkward.sourceforge.net/
-IUSE=debug l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fr l10n_it l10n_lt l10n_pl l10n_tr l10n_zh-CN +handbook
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-lang/R >=kde-apps/katepart-4.4:4 kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=mirror://sourceforge/rkward/rkward-0.6.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69f46e365a800e3c03cad215878992b0
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.6.5 b/metadata/md5-cache/sci-mathematics/rkward-0.6.5
deleted file mode 100644
index b97b33f125bb..000000000000
--- a/metadata/md5-cache/sci-mathematics/rkward-0.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/katepart-4.4:4 dev-lang/R x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[webkit(+)]
-DESCRIPTION=IDE for the R-project
-EAPI=6
-HOMEPAGE=https://rkward.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/katepart-4.4:4 dev-lang/R x11-libs/libX11 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qtwebkit-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[webkit(+)]
-SLOT=4
-SRC_URI=mirror://kde/stable/rkward/0.6.5/src/rkward-0.6.5.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5876203fc79054a831be649ed7a3ddad
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.37 b/metadata/md5-cache/sys-apps/inxi-2.3.37
index 861e2f798069..0a2e221fa728 100644
--- a/metadata/md5-cache/sys-apps/inxi-2.3.37
+++ b/metadata/md5-cache/sys-apps/inxi-2.3.37
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=The CLI inxi collects and prints hardware and system information
 EAPI=6
 HOMEPAGE=https://github.com/smxi/inxi
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-3.0 sys-apps/pciutils sys-apps/usbutils
 SLOT=0
 SRC_URI=https://github.com/smxi/inxi/tarball/2b4e89b21ffd06e888d89a38aaedb797ecea4403 -> inxi-2.3.37.tar.gz
-_md5_=06c67b685b79e3dbe99433cae9523182
+_md5_=8c20ec331070d0e06c8257d37d59f574
diff --git a/metadata/md5-cache/sys-apps/openrc-0.32.1 b/metadata/md5-cache/sys-apps/openrc-0.32.1
index 62bfde9b5f36..7686b6091baa 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.32.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.32.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.32.1.tar.gz -> openrc-0.32.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e40cbc3fd1db5fbb07dc1ae97c40f86a
+_md5_=660a458ee83567135ee8a624c9369a3e
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.5.2 b/metadata/md5-cache/sys-apps/ripgrep-0.5.2
deleted file mode 100644
index de977cdc8d05..000000000000
--- a/metadata/md5-cache/sys-apps/ripgrep-0.5.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-util/cargo >=dev-lang/rust-1.11
-DESCRIPTION=a search tool that combines the usability of ag with the raw speed of grep
-EAPI=6
-HOMEPAGE=https://github.com/BurntSushi/ripgrep
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Unlicense )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~radhermit/dist/ripgrep-0.5.2.tar.xz
-_md5_=25ba7f9890c38148720653ee7b5fac74
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r4 b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
index e4ec91149791..924d3cdcf518 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r4
+++ b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d4f8933870922c2983de9711f11d048c
+_md5_=8dcb0bcaa78adeaefdb7f70bcd7ac035
diff --git a/metadata/md5-cache/sys-apps/shadow-4.5 b/metadata/md5-cache/sys-apps/shadow-4.5
index 3bf8634dd844..1717dabc6bf7 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.5
+++ b/metadata/md5-cache/sys-apps/shadow-4.5
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities to deal with user accounts
 EAPI=5
 HOMEPAGE=https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/
 IUSE=acl audit cracklib nls pam selinux skey xattr linguas_cs linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) pam? ( virtual/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 )
 SLOT=0
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.5/shadow-4.5.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=abbcee2c2ce3c84994bfae9e991ad62f
+_md5_=54a7aa63c0a12ae84f8918c314561b62
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.11-r2 b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
index b9b4ea5a380b..9ee843d9600e 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.11-r2
+++ b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
@@ -3,10 +3,10 @@ DEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap virtual/pkgconfig >=app-por
 DESCRIPTION=Realtime Policy and Watchdog Daemon
 EAPI=6
 HOMEPAGE=http://0pointer.de/blog/projects/rtkit
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-3 BSD
 RDEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap
 SLOT=0
 SRC_URI=http://0pointer.de/public/rtkit-0.11.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f7c6d645f980b1d74e1b38e27be7f1ff
+_md5_=a768c9ce313eff19d35535d3fee735f2
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
index 3bdcde5053b8..7e39444e924b 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
@@ -4,11 +4,11 @@ DESCRIPTION=Pacemaker CRM
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
 IUSE=acl cman heartbeat smtp snmp static-libs python_targets_python2_7
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.16.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bc01aaa1bac9b6d3c15dc39aee16d13a
+_md5_=842dc25beddd25783a946682e0d4c434
diff --git a/metadata/md5-cache/sys-devel/autogen-5.18.4-r1 b/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
index 821b0ae01b04..f7a5f97f87fc 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Program and text file generation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autogen/
 IUSE=libopts static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8:= dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.4/autogen-5.18.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a4d709957657a24c25c88c6a9a1a1401
+_md5_=3aec0177b0ffedf91e6c893edb1e2ced
diff --git a/metadata/md5-cache/sys-devel/crossdev-99999999 b/metadata/md5-cache/sys-devel/crossdev-99999999
index a1d92124f3f7..a482a614491c 100644
--- a/metadata/md5-cache/sys-devel/crossdev-99999999
+++ b/metadata/md5-cache/sys-devel/crossdev-99999999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
 SLOT=0
 _eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc
-_md5_=a3bd27064b61cbd6d1f14781556971a9
+_md5_=126661e84cd56b77c83a320091ceb9e1
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r1 b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
new file mode 100644
index 000000000000..903f9342ad4f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/m4 app-arch/xz-utils nls? ( sys-devel/gettext ) test? ( sys-devel/bison ) >=app-portage/elt-patches-20170422
+DESCRIPTION=The Fast Lexical Analyzer
+EAPI=6
+HOMEPAGE=https://flex.sourceforge.net/ https://github.com/westes/flex
+IUSE=nls static test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=FLEX
+RDEPEND=sys-devel/m4
+SLOT=0
+SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=feb8f85ac683a680e82c6c65516497c3
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
index b12064ad3287..1c83a3446b59 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=utility to manage compilers
 EAPI=5
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.8.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-config-1.8.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=01bc92a744bf27ccccab20ed416cfdb3
+_md5_=3c9c1a59683db1e4e17d7ce9de7de289
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
index 000401ab84c1..0907ec644511 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Device mapper target autoconfig
 EAPI=6
 HOMEPAGE=http://christophe.varoqui.free.fr/
 IUSE=systemd rbd
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.6.4;sf=tgz -> multipath-tools-0.6.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1e62052b42beea88362a1dc8f3e25f89
+_md5_=8a648bf6a800dea65266666d8ebf4b33
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.7
new file mode 100644
index 000000000000..db98d2f82770
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.13 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz mirror://gentoo/genpatches-4.13-9.base.tar.xz mirror://gentoo/genpatches-4.13-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-9.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6c28b88a6ee18d1d2b3d06dae2433c20
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.7
index c7da25d00b00..898f338082b7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.7
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.13.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
+SLOT=4.13.7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 9e21abd49e66..949388e90310 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=79d8b679e4455a8a23cf4c491abe8e56
+_md5_=6ab1fadc7877f180887517559227d5dc
diff --git a/metadata/md5-cache/x11-misc/fraqtive-0.4.8 b/metadata/md5-cache/x11-misc/fraqtive-0.4.8
index f23607d73cee..8d771c626f07 100644
--- a/metadata/md5-cache/x11-misc/fraqtive-0.4.8
+++ b/metadata/md5-cache/x11-misc/fraqtive-0.4.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 ) virtual/glu virtual/pkgconfig >=sys-apps/sed-4
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/glu virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=an open source, multi-platform generator of the Mandelbrot family fractals
 EAPI=5
-HOMEPAGE=http://fraqtive.mimec.org/
-IUSE=qt5 cpu_flags_x86_sse2
+HOMEPAGE=https://fraqtive.mimec.org/
+IUSE=cpu_flags_x86_sse2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 ) virtual/glu
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/fraqtive/fraqtive-0.4.8.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0471616a0866764bf69b3e89ab3ad3fb
+_md5_=c3e9c57fec04b590adaf981fe7fb49dd
diff --git a/metadata/md5-cache/x11-misc/sddm-0.16.0-r1 b/metadata/md5-cache/x11-misc/sddm-0.16.0-r1
new file mode 100644
index 000000000000..ed7da4135088
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/sddm-0.16.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) dev-python/docutils >=dev-qt/linguist-tools-5.6:5 >=dev-qt/qttest-5.6:5 kde-frameworks/extra-cmake-modules virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DESCRIPTION=Simple Desktop Display Manager
+EAPI=6
+HOMEPAGE=https://github.com/sddm/sddm
+IUSE=consolekit elogind +pam systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
+RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://github.com/sddm/sddm/releases/download/v0.16.0/sddm-0.16.0.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=39f3562ce27fb0fb44c353e4f03c1478
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c5459b0a117f..5da5bf2af708 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Oct 2017 19:39:12 +0000
+Sun, 15 Oct 2017 00:09:18 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 321c80973ce2..05a40a77f270 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct 13 19:39:12 UTC 2017
+Sun Oct 15 00:09:18 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fca56af38513..ddb143bd9b92 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Oct 2017 19:45:01 +0000
+Sun, 15 Oct 2017 00:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2cc91a4d6b33..0534bbbcf9cd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f928bd3c92fca93814668701654a174e52e2ae5a 1507922829 2017-10-13T19:27:09+00:00
+168dfa7fdc872d570ff67284f184199455397ba5 1508023916 2017-10-14T23:31:56+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 907559028391..fd61b8295a63 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1507923301 Fri 13 Oct 2017 07:35:01 PM UTC
+1508025901 Sun 15 Oct 2017 12:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c5459b0a117f..5da5bf2af708 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Oct 2017 19:39:12 +0000
+Sun, 15 Oct 2017 00:09:18 +0000
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index b0058ca64c5d..c4534e0b84d1 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -5,9 +5,11 @@ AUX cacti-spine-0.8.8h-fix-ac-macro.patch 217 SHA256 473634529cca89e1609219a4064
 DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf
 DIST cacti-spine-1.1.20.tar.gz 801877 SHA256 a8ccb24980099fbb6ee0a16f397f10fb9b3320db6a02c4e61b1483445d405f99 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f WHIRLPOOL 1948229141f99fb04c799b46b323a047c47dc3c94303cb50f56018af8cbc1fe4d2c3a5b8c1683629802b3600e6e69b8ab5ce636e0d9c84ba61e9beadde11f2f1
 DIST cacti-spine-1.1.21.tar.gz 801907 SHA256 031c7eeea7e64b20754cccfcc65851443847a31765893ddcc528da4e384ca4bf SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0 WHIRLPOOL 6521e622329c1a6e6ca5b8c97717380a4bc2fadde37af42fa6c1fd83f82a35ebc5cefce9788a360ff46abc62a9918e327404188f6c9b611b0064e1a86b41cab0
+DIST cacti-spine-1.1.25.tar.gz 802127 SHA256 d5452d320781107a2cbc289247ecf8c0b29f55379a0c008b020843508c7e435d SHA512 d9c4a924ce08d363a1ce7327172b6c83d606ccfb2b623b3b5a0f6df534a031caedbe55314cd415a58484c89df49d5e682853e5001849bd8e9767190fdc367809 WHIRLPOOL 0c2d5ec02c110b5ef5545ca1be769a2632c2bedd9c7627ef7f9a53995a956151627a10293fcfb19f34e223cb8c6cde914a2b399f14c2426a57bbdfe5f2046617
 EBUILD cacti-spine-0.8.8h.ebuild 999 SHA256 9dfc1173686e7bb7cdc44895735a91f77e0412436b90af2fada2670d74eeb827 SHA512 5b1226090b6cc63715b45e46a5d258b25ab67d596894212c755fc8c3602db4d8f96f9c26208b7bf4c3c27b11ef57cc3cda9913d709fc7d5f1ed9b44c5f52c241 WHIRLPOOL 3763b3ae6bc822edcc6e526bbb137be74766bdc105e58dd8e2d6a1969f352ed302508c6b09e2d34febf3fc1fb24e469edfec49f4db059167a1f47101b7843526
 EBUILD cacti-spine-1.1.20.ebuild 861 SHA256 1339a910525d2e15412e9b805c92877bdb49fdc9f462b6dc0abb6ac3d906d29d SHA512 4820e9d6245df29dfb6dd57cdc6a41dab158e177e4273895748612d2de9089f61dc3984fef204ac0ec0321d97c94258962edb14ac84a983ce34b7b2234dce2be WHIRLPOOL c671990e7c4c899be726dfab136ff50abc2cbc97440f88446e6f912f14b8f03c4e9a2fa884f909cccdcab1f5cfbee968923c93896c0a4871e703375b7f96c00e
-EBUILD cacti-spine-1.1.21.ebuild 863 SHA256 5e5f9ee85315aef7c3dbdbf8397d5afb857a4647a9ad7a553c87316c760b6eed SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa WHIRLPOOL 20561edecf53e00acbeb99a486f0b9df275fc95c795e92fb8c13e9c0f5f1059aa12b44eb108adcc62fdf685e2842f3aee0f0822af644fe41aedc4149aa59aeed
+EBUILD cacti-spine-1.1.21.ebuild 862 SHA256 05dac1a6ed0de32c13e63983c62738089ebf30ad0c053ec2caafe47c33147a6d SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2 WHIRLPOOL ae366e77ff4e1b4e3d8ae198918efeb3e207902db4462a3b4211103bc41a2cf208b927d530f60c4748114c6a735db073da0daac19e96e6878e09301049733dce
+EBUILD cacti-spine-1.1.25.ebuild 863 SHA256 5e5f9ee85315aef7c3dbdbf8397d5afb857a4647a9ad7a553c87316c760b6eed SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa WHIRLPOOL 20561edecf53e00acbeb99a486f0b9df275fc95c795e92fb8c13e9c0f5f1059aa12b44eb108adcc62fdf685e2842f3aee0f0822af644fe41aedc4149aa59aeed
 MISC ChangeLog 5144 SHA256 f4109f6f6cc548a8d9390a072215bcc6f16fe7724494eb7e14c09093c7700160 SHA512 607568b0cbe9ee8d1bbddaf9d9dd01c9652a5cdf12d7d2e944ca73c4c4550af004ff59276bcb84ac90179b4c4349e33261929703922dbf9862bc32de3939eea9 WHIRLPOOL 8a2b8005b6230e5348bac05fe25c89b3afc862496d00e45333a762bf2563fddd0cc914c53fe433eb9636a61b941667d567c2753031c66e530295f21869fa2545
 MISC ChangeLog-2015 7652 SHA256 c66b026913004af1b3c3f9222527b2b6256a198df5a1846ce70562c33e08c837 SHA512 4867bbe6054bb287d4b6142b1a03f5709eab730764f40ad56e434edaa6c45f83e817d1118042a4fa6b28b881481f4b8911dbcb35aad0414459d9e0d82c2e888c WHIRLPOOL 3a0530ff8febf7c22f78a7e3a9e2cd98268bbfaadf218acafe223c1e2f10b15266c6a5a8ae3539b0f8460934a8569a222c9fce53adbefd55006941dda3e98306
 MISC metadata.xml 728 SHA256 e44c360dfac0f02ddf82d23b13b4e9f45aca436e872a9508753a8e450cd04069 SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38 WHIRLPOOL c073071c896c3cd8b8e8f7a408cd38dddf9d8e74851874dc5a2b9516c9626cc58923070220f8b4fdbc9d9a9828160fbcf21c1b3f96c6ff4d797fdfce2803a404
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
index d148f4544d01..4c78d022f85d 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
 
 CDEPEND="
 	dev-libs/openssl:*
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild
new file mode 100644
index 000000000000..d148f4544d01
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog
+}
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 484670756762..aebd444c82cc 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -2,9 +2,11 @@ AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db4
 DIST cacti-0.8.8h.tar.gz 2585226 SHA256 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 SHA512 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f WHIRLPOOL 250ee38d969c9a7d9a71b15a25e48c2b9b22412c6c2394798d178172d9a1be056b009b328594559524adbd47ad05032992b13cb5a632af1a23f947fb55342402
 DIST cacti-1.1.20.tar.gz 8903728 SHA256 cbad90ef98d656bb10814e1444722dc00ff0c3a922b4591775984e890a81c942 SHA512 2d51c757916b366a188a3ab31771bafb6492aaa6ab2e778255945677bbb3f23f6fbfbb73ea9b05abf2f7cb26c0970bc208f68d5f1c016f8fe3b9da003dcd3b1b WHIRLPOOL a73b661f71e51b3f9be4413f211c735d1addad877020d7abc762043620869215177565a597a67dc40ff460784b00e8a765a9d348b39cdd2b2b15bccb3db70fb3
 DIST cacti-1.1.21.tar.gz 8905650 SHA256 e649fea4e8fc9900620af213218989e229aa25a1e1fb10dcde1844b1a2ae3bc0 SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2 WHIRLPOOL dea91e014e4b64a40bad4ab573a468fae0c6e1f7e380946cec5f5b270fe8abaacd3c73d71ad636e813e443117af0641269cfe2448f8c8487b1b7f7507e2a493e
+DIST cacti-1.1.25.tar.gz 8920466 SHA256 d0b911ff5b46abf858650bcb95bbeb1e482c3815e1a48129fde167ffe2d52389 SHA512 f5574cf0ba9d8fa39a6e547c9fe2a3c007901987abb82ff50d63672009bbf257ee58f47f02cea512dda6809e880e87e8a3ad826c26a9421f195569816d6489e0 WHIRLPOOL e229d13cc133c1e852e248c313ab22e0a1a53a123e6bc98396ea031a8307169a3278a9ef5bb63a69be667bf6d83c1c299cb97116db753a22a318ed061e75f3c5
 EBUILD cacti-0.8.8h.ebuild 1308 SHA256 42fb408c4c187c7733a7741701d94988734649097a6e76842d120fd5272ea1bc SHA512 6d48400c92aa9ef987ac43b5cbb6a4eeb9ad2235ffe1adc40cdadbe54ba0033090e0e4b8a9f48a6b85b0bf4e41c4f4f67da1869218344c59c777ecb173cd8784 WHIRLPOOL 9132c1a334e3426c7817893f212fbac3ffefbf8139e1f0e15b700d97c1cb2019391e420ba36fbc9e61bf992ecf2b567dcb0c838ddd361220435a934ff682f1ba
 EBUILD cacti-1.1.20.ebuild 1258 SHA256 8a90731cd9defdfdefb98d57868e37fc438eb8d16b303c92a33e571340585d5b SHA512 90246b8bbd88ac48ddd24df0dc32a43f8f387f2eb4215ed8280c59e2856f7060027cc4fa590446c2e7c3fce8c663da77ac5d169b9267ed8f04eb9c8207c6f517 WHIRLPOOL 50382cf522323d6c354322ee87c38ff1691049c718cf464a9bf6092cc770ff1a4be2286af3c15ca5773bad34ff25b2ef8ee40b0ab32a54cd8f9da452cdcce742
-EBUILD cacti-1.1.21.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
+EBUILD cacti-1.1.21.ebuild 1259 SHA256 d85789f10a42d9c56f166df0d5f7185bee5829f754bef93fc2200affe2aa95b1 SHA512 e9f48fbc4348eb47d07c0d47272e001d0f815fa6527b2bb48989e818d4984bb042d19f4c0369f29cc7b2537c884b8c1483f1058c95720c8f440aa62bf4903884 WHIRLPOOL a968f18d75cd7ef0b10cc13e71b878650de242fc8136523b0e52b9b15466e19db269c36fb6823b2280b6210e329c02cf988be7c78a33131131c88ec07962c307
+EBUILD cacti-1.1.25.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
 MISC ChangeLog 6068 SHA256 b9a798f16089824899d4534b3047ea47bc4c3f5c961bb75939ede4394c939f09 SHA512 d289b3977cd4e2a6029cc976427dbd7258e5d31074ab63b2f0b26820d347b0b6a0a43d395bdf850851402ec36afc3e36d64f094d1e70d546177671276eba0cf2 WHIRLPOOL 36c0d2056e11d758c86a9b3458677ed1682c80a362949660c7a23ee1e3161f622ae80ba792c10e55aae943c0431fc4c373588b3e57ded9af7e131868b48f8367
 MISC ChangeLog-2015 30467 SHA256 36b345341f9a47ef2d54bd1272e9d54fade878bc9aa0a983f52e9739c58f4a97 SHA512 e0890043839852c1b0e41962ac38e6e881e1d1b9eba6055c969b276e8a3d878a9aa0291c0b01fc8053442ab3d722ded00736b20b59cf8135df7ee617502af542 WHIRLPOOL 8fae89c873c85a58a937879bf554c316096d744a3e86c809fcc02ff8c278f5c56603af8cedf841bce462c52ccfe24c1af9550d81484b6f81c399b7066c51bff5
 MISC metadata.xml 834 SHA256 f5fe19c82f443bc060d5035e3b96d494d79de2a29963090fcca821b4e3d3226e SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616 WHIRLPOOL 7f5ecdbe61e052c3430d54a1b8b8bb6435bf1bfa15f1014db7dc5b3dd74f38f2b18029855f1db387c645211fa5db84d20cee37937ab1e2e9ab25b5e023e6a59b
diff --git a/net-analyzer/cacti/cacti-1.1.21.ebuild b/net-analyzer/cacti/cacti-1.1.21.ebuild
index 08d211285f65..b0f3b50324d5 100644
--- a/net-analyzer/cacti/cacti-1.1.21.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.21.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/cacti/cacti-1.1.25.ebuild b/net-analyzer/cacti/cacti-1.1.25.ebuild
new file mode 100644
index 000000000000..08d211285f65
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.1.25.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	default
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	dodoc docs/{CHANGELOG,txt/manual.txt}
+	dodoc -r docs/html/
+	rm -rf docs
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 72474914e74e..87ae61dd0dd9 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -14,7 +14,7 @@ DIST nagios-4.3.4.tar.gz 11101966 SHA256 c90b7812d9e343db12be19a572e15c415c5d635
 DIST nagios-core-gentoo-icons-20141125.tar 40960 SHA256 68b715f636eb291343cab3259862bbed8b6b898520b58df522438524de3d8761 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 WHIRLPOOL 7ec3a944b2a659b456d3168818ca5b1af3a427436e6af2f3e5d6cba6fc7b1c7bad6f552301f064df31988865b3b32fd117d9e6f61c630d6d817a51cbbbcb331d
 EBUILD nagios-core-3.5.1.ebuild 6154 SHA256 074c4b31f7ec83caff01f8133cbea7c9d2f9e76db0128337e90cea704c536797 SHA512 c402040b5449fe096d40d0313ee08380089788c57da4dc780a8736eb335fb775379db4667145baed355dbbe9128e99d2662f54d9a57e44f2cc5fc35f0fe2bf01 WHIRLPOOL 3dc306c99a2d8da810a671ff7026348817f887c23e9839c9f61f9f7fbee2e39634064316f5b7e481c5c61b43cfdc96bf282be2f3cfc1c68e7ced0ae55edbdeda
 EBUILD nagios-core-4.3.1-r1.ebuild 7579 SHA256 59dc0741a74350b7b8ea45eeed8ee615b9914227f4d1de0fa1e007ec43a15a4f SHA512 8a4273cb4e2f50ed4e69d190743c362db3c1c9480ea19d061501dc57e48fea7e6b3c1811107714667b7ead9eb748ee8a7a106b792f066422ef13640b14bd5aac WHIRLPOOL a3ec231a49d488aaca020f654ec5e1e531bc7c3b3623e2b35b040260bbb10d789245d4d4ed3b8684cc3a98a4e8709fca5d9ac5703e68c83287f90c374838f6a2
-EBUILD nagios-core-4.3.3.ebuild 7467 SHA256 5f2d273020d0643a818bee780b5d571226826bdfc890c20c90e0553f8a4989f5 SHA512 ded85ca44a60619ba61b39e80b05620e1545541271a51ecb0af78f560fbe3ea74c42964a7c364ec1b9730b0d5e37bb0b98c8ff4e44fe72593c329552ec77efea WHIRLPOOL 2d4c3d02945db7744eccf34d84f9485fc2faebf58a7d7fbacc13fbe65e93b5d257a22356bd2741673f2342be515395d5ddc8c2d30fe950e6a260e91f6e20c4dd
+EBUILD nagios-core-4.3.3.ebuild 7466 SHA256 60f009661f96fe9d6e970decb9d801563d2042d8fe1e64c5cf34c16985d2c6bf SHA512 860b07673f9d77e296bfc471291cd07de65b1195ea2cfd0bad7ceffdf316afa23fda0c5f90a2de2c7115f053f54dbced5e45627d6747512af62833d0c398682b WHIRLPOOL e01ddd9d1151771597bbd652a4723c4834f2fe9a2b2ee32b1523c250519b6431c073cb922aa51e41b5306986efe42bde0f2d7ed03ba34e56778933ae029c54b4
 EBUILD nagios-core-4.3.4.ebuild 6647 SHA256 5a1c13161c3a456fb3d29aaaa48f19a59219357213787f3db9ae2b2d4ccc7499 SHA512 7cbe1d7067a862543aafcd591a2cf8b5abe40af75f7daa3eecbc4aa3f8afaaa5a0f366c4f4175b1680f7d30c481aa2d39296049a9963631c6c29edad465949e4 WHIRLPOOL a864fa1548be74e7976f29b87f11709bd474d079b8ff9ee0d17b5f5db5e3a911cbdaa5333eac751d1edca5ea4417555e2cc7de14a85f8f2446cbf41ea1893217
 MISC ChangeLog 9808 SHA256 b19bd88b156c5328fb84b82463c7e9f2368bb6345056f69dfba49efce0b46fdd SHA512 89556c2ce3a8975682c9b9da2098dd5410dc98e432d9aa37a7bde5445e0dfc0cbd6c2c7963b5ceee516b0ebe92df5944ab2da93af37515419921cc940d936919 WHIRLPOOL 9725300fcaf5bcd46d7f6d0ea1b6e5d58f4982a82d194a76fa795fd6596bba9e640b7cfba72471dd650b06c46dad7cad77e48043fbd0a2ce1210f3eb9233a641
 MISC ChangeLog-2015 33539 SHA256 28d8b03589fb01e259aac550508273f287ead57f10f905a9b3c26ac0a6e1232e SHA512 32de57ce104d88c4b92cf54b47cfddd3abfb5a31ab7d3ff9371b1c2b3522ccb2a97331f66284b48cf04438a6453a9b54c5f8e1b1749fd506807691f31f5ba661 WHIRLPOOL 406df23c9449f282a40f3ed16ffea06635ad3d523d1f33423305803fbb2f484997a80ba422e736b6c2bfe59ab0f2238eeb94307ba22702a28ef75b99d2050ac2
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index fd40037f208c..553186b60646 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd perl +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index ebbbc3d48c61..abd0bc271703 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,5 +1,6 @@
-AUX vnstat-1.17-conf.patch 356 SHA256 3193bdf800a73715f1c34b62a734056325c80a38e0dfb53885ee3edd35ec85b0 SHA512 52a063ff1b99fdbc43912ee3efbcfc30f514fd1394724fefb883eed7cf650071c4877581d64d5534be1a84a631deb4880201ad6e1dd05017a06cbec652aae227 WHIRLPOOL 1250ac8983feda813978bee03481387dc6c7afc4e2b0166474514f42581bb5d47c7d0d245a6fe5b02448c3a8ebb8026465c5e7a94e5a70a4bae8189a773a5a89
-AUX vnstat-1.17-run.patch 300 SHA256 f8f8152d8bc368886a08288be10894357261492afc4ac9f3838174be2d47e123 SHA512 d0dfec867d8d169967a5a7724360cf4833d3c933a47bcba329e0f7c007bbdd58c0d7b14e209385f209027f75f5892e062b081456bd2d54c88e818c86a4061f9e WHIRLPOOL 32c303fba762945cbbdc37c27bd53059c90cd8337913baa37ddaa19ab5529b6254d3b9f9864d7cbc4e87fdda6116fe609bd204c90ce9c6de469e16fa4a4187c4
+AUX vnstat-1.17-conf.patch 352 SHA256 e0924807ebbd8bf14ae6bc4fe91e358247c287143bda1b6424a1f348f570cf3e SHA512 d95fd80ae1887137dda7b13812cdb962a35a06f60e182fc66017bcc68ee5aa9aaadca01745b8194f468f8ed453ebe347c87ae7ddb4985e0e88450a33a1f8830c WHIRLPOOL 798087016751bea5f7e43ef0225b7b9ce662bef524382a5f08a9b977b441465a1c94f0b32be716faccb1078dbc8e395de690958012eef48fe1d67d938260a0b0
+AUX vnstat-1.17-drop-root.patch 359 SHA256 c3802f925e7a05132e233a85069529068daed08bf9fe359d235ac672f8262b7d SHA512 9e0b5d5d8b26c0657f8af41e615365e8e71dda051225bda103466754dd39f2e77ae277ad9f539920c7ae77e86618a9944ee33fb4a35d60ee3593541a38549362 WHIRLPOOL ee7f71674c2084a6d46e6e360e03c18900a793eeeb987848f69c31a8d0848a7c0b7670f50c4ea63b0134610956e3431a9ad5a2bf0b1b78d0cb3f4a96f6b506f3
+AUX vnstat-1.17-run.patch 296 SHA256 f192ddd0fa44cb6ae1942d1fb46a5ae4c9149271df71bb36c166713be87f455b SHA512 4baacbe8c3f1bcfb585060e0502ea7bc24dc7e964ecd381dadc7fb33395aa5655c33e83726a402e5dba212b92a4a498926add3b50aebb674458542772cf51afd WHIRLPOOL 62891f42ed3989859e2142de298291813d16d79398ab2064a7f0fbd8a1bbcdde9c54ebb0a6e966e5dc2ef07bb2ee0902837140b6dbbd5df6dbdb49b8a0816259
 AUX vnstat.cron 220 SHA256 b6b437c680606061b98af19758cbacc3f883f73cd86f0bbfbcfe756c982cd3fd SHA512 c901385f97323d1a686cee63d015eaf9ad38ed195a1c0e25dae671dd7061ebc918498684c55b90b0674960891dfca4b83f458174892c1b9efb48cd362fdb8477 WHIRLPOOL 1432dfdfdf2f121deeff6f8147b344ff61838a8fe54d7bc5bb3ac6c1b9675a64b6e331bd3e33ee0e9fe2488bde42ad8c4e279ea3b1d1d5ed304b4b2ef4205429
 AUX vnstat.cron-r1 177 SHA256 614966fa153b024515a4d6363d3046df9bdda07c7d18bc7aeb4f8347d80e7134 SHA512 8074d65cf2f28bd5c02fe741dbe20f8404bc2e25b94b43d0bcc829ca088828227805caf9cb8cae020ae0a9370d68dc3c757fedf07d48c0fc71ba944f2da1cb94 WHIRLPOOL 9c44e29673064d7c1ac77f8af0bd5aa3117bb46560f4cddee829a3e6a3d617ba468a867298d6d7e58c840c752402e35a8b82dedd8571d13454a167bdbc188676
 AUX vnstatd.confd 216 SHA256 2cd5b91f86bc26aca85166a50de89faaccbf1ea8f219efb48b50b7ed0f3fe377 SHA512 d645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946 WHIRLPOOL 3a974a3dc30a33a3a2ca22db551068f1df3444f4248e896482e26d1c5b0bd717706ef30e18f5a6ee193966bef1466a13d3c6ad35e86f42f025ebb3c02e622a22
@@ -9,7 +10,7 @@ AUX vnstatd.initd-r2 874 SHA256 5ce75e189239ab52b9114defda6c46f57c18ed88d0ffc811
 AUX vnstatd.systemd 262 SHA256 26c4a8e6e1800fd912229bb9463355cde8591261d51f4936765bb94a4ea25cff SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c WHIRLPOOL 3d7f67a773204d3f933c7692b006419376aeead550c3bd169545586f7e7f69deb20585b44bd264be5ec0e83002f2cab3c8d8e11d4d12103fe07c3ae84b52df9f
 AUX vnstatd.tmpfile 35 SHA256 91c9577f36c7f7ec32bb2963035a6ac49e7556ac6adc41564c033db8889b669e SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac WHIRLPOOL dd6b74ff518ba3b652b3db0519bb45a370c50341ba5e1c8f37b01c2a5dc03341dffda2a88e389e66f6d620fa90a63f6ddf5e05c474d92d7644be156312989cda
 DIST vnstat-1.17.tar.gz 238397 SHA256 18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971 SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 WHIRLPOOL 38f64c6eadf7bbfcc1cd6cc3d8f8ea3da4846dd64caf242628ce9d0e6f9b8f565dff9d31ecd1633b3a0a8b5e7dcd4545f1adeafeb4f42547ad87be77317622e3
-EBUILD vnstat-1.17-r2.ebuild 1472 SHA256 35e2fac6008e530c4d02b9247ad909b02ccfbca81c11a2a899fad60cc8eef92e SHA512 194cf7b43dd74ba43844827ae20f57853bbbaab16808a3ce1f6911bd78f3d5d5a684b884d07794464c1e04afd0048363d0b3a07f12f8575a8fdaebb998b1e2b2 WHIRLPOOL bef4f21c7236efc316bfa46b5d58b54f8a7fc0298a02933668a3410a3b9edc240ed0a26b5f3c72df037d5a49f1cdbea249ab98ea2764984fed1207cad3a51652
+EBUILD vnstat-1.17-r3.ebuild 1514 SHA256 eee2e21edfbc26b210a1dc19d5d3052d58f7ebfd91fe89bbc6b8d0a99d7a7c73 SHA512 0c8d1fbd7285ac41d74c77554c97eac98b4649be0d60dc1e2725e112ab38940970f96b81ba79cfa99222d959fbf0de046212c782453e93dc92d5667566fa9459 WHIRLPOOL 304c650d3fc39069d0ac81a4810f70bd2fe58c5d29c7321f2326d4cf7755df77bf1501989009f4a02142cfc3a0ddf29be0545e559e3270ac2e0fc59898da5c21
 EBUILD vnstat-1.17.ebuild 1430 SHA256 d05f7cede84c40a709d44a69e1717fb1d9a801df75ce95a51f6ec144aa58a8d8 SHA512 14d709e9ba19b7707d62fd5a82dc483f50b76efa884015a14600dd1489132a1c0a687444b802bbd917252acbfa84c291210cd2078778a16796d0bacb576b360d WHIRLPOOL 1bab57fa5b8b832d7277c4b05820af2898b66f9c5b4617ebcbdd52049020e87344f5e78c44756571ae1bc2201fda0a0fa36dbb9ce6078e4dd8aeaee1080d109c
 MISC ChangeLog 4350 SHA256 8dc324d38ef67a70ae4206f377deed192838d9685f91f11e4faf44045ae48dd4 SHA512 cef200253f77a3059ed18d1630da13c5f33aad335d2399d0fc8e94f687643a983e02fd749480324f77ba0d905e95196ffb73e3d238d1d0436b5b75fa05f30d19 WHIRLPOOL 3a3cf0f596faa146a4127436274dbaec11a604ed129cd95709027701c0b41827012a2db7564b0d1812e1bf726aa47c437c374e245ce0386e6277677cea15eb4c
 MISC ChangeLog-2015 9786 SHA256 db76c2eba2b1cd31b5afd4096dd5e15479842d0dc2835c22b4b6c70d7be0f0c5 SHA512 483b71d6778421520e2696c2ed0e2efc480a40f7f4a36ea0aeaa6fe02b386393c4805f551079e1d304eb73d1c1a443248b6b3449dba7e6734eb0ea54fbdd93bf WHIRLPOOL f721d1991070b8dc468a8ca6d6692b049d8e2ed78ae3100ab0dcc67246c3a005f9cbe2016bc8c45015a92d6d9393070d7f9cf30b0eefbedcebbcc9d6731be09e
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
index b939e7c04351..5bcbdafb2a74 100644
--- a/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
+++ b/net-analyzer/vnstat/files/vnstat-1.17-conf.patch
@@ -1,4 +1,4 @@
---- a/cfg/vnstat.conf.JeR
+--- a/cfg/vnstat.conf
 +++ b/cfg/vnstat.conf
 @@ -115,10 +115,10 @@
  UpdateFileOwner 1
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
new file mode 100644
index 000000000000..c0446c3b3410
--- /dev/null
+++ b/net-analyzer/vnstat/files/vnstat-1.17-drop-root.patch
@@ -0,0 +1,15 @@
+--- a/cfg/vnstat.conf
++++ b/cfg/vnstat.conf
+@@ -81,10 +81,10 @@
+ ##
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonUser ""
++DaemonUser "vnstat"
+ 
+ # switch to given user when started as root (leave empty to disable)
+-DaemonGroup ""
++DaemonGroup "vnstat"
+ 
+ # how often (in seconds) interface data is updated
+ UpdateInterval 30
diff --git a/net-analyzer/vnstat/files/vnstat-1.17-run.patch b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
index e3b514d0c6b6..4afe449ceed3 100644
--- a/net-analyzer/vnstat/files/vnstat-1.17-run.patch
+++ b/net-analyzer/vnstat/files/vnstat-1.17-run.patch
@@ -1,4 +1,4 @@
---- a/src/common.h.JeR
+--- a/src/common.h
 +++ b/src/common.h
 @@ -198,7 +198,7 @@
  #define CREATEDIRS 1
diff --git a/net-analyzer/vnstat/vnstat-1.17-r2.ebuild b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
index 88ba28fdb0e4..6e0d7ba752b6 100644
--- a/net-analyzer/vnstat/vnstat-1.17-r2.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17-r3.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.17-conf.patch
+	"${FILESDIR}"/${PN}-1.17-drop-root.patch
 	"${FILESDIR}"/${PN}-1.17-run.patch
 )
 
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 1db3935e47eb..1ba2b497f70f 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -8,7 +8,7 @@ DIST libidn2-2.0.2.tar.gz 1925342 SHA256 8cd62828b2ab0171e0f35a302f3ad60c3a3fffb
 DIST libidn2-2.0.4.tar.gz 2008524 SHA256 644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 WHIRLPOOL 0caf45267c06bd6d78fc80673a90f718686a98408b2bd668e415b0ee8a5639199091320f9877a25c89de324219e96cd72b7c7d2e4fa52fa7322604b82aede3ce
 EBUILD libidn2-0.16-r1.ebuild 1245 SHA256 0149630898a3379290f58ca48229c00ac63f1345e41632a73a86b81dc8e67f51 SHA512 ccd3857fe7b69afb6e5a214f4c32a638558af0ee8d5d63f16d0e3ef7a5ce0a5c7b12f2e920203e2aee1dfd747ca83700ff291aeaf0c0d8427d7a114944e5a873 WHIRLPOOL 2795ee6c77820bbbb2d892bf7409f5ab6e39138ff8aa0a1c6b8e55e7f1403ebecb67a6cf82e90642e97f8ebb072a418dfa4097f3a58c05280749de8f22fb6321
 EBUILD libidn2-2.0.2.ebuild 1215 SHA256 e26f15e66939fcccb1ff14d392e5d8e58b541edd8fb951d6d3728a056ad572cd SHA512 405982e2c61c980bf2f14fd31255abca41590ef60b1010651846d1d1a8ef64bc282e94b2dd4b460c5ae1912610e0ac69417fa0fa19018e8c30424d153b1f52f4 WHIRLPOOL b87ff2d1d4d131652228fd8c3c9df4b58ab1607218fc083e95835d5da533257795a0c7d714d7fb1b6594f1646b2a8d8f80837f2a6f29ae7eb39ce10531673f70
-EBUILD libidn2-2.0.4.ebuild 1231 SHA256 82578bc5b526782f502493a178c6d265446c85e33b793afe6bfc3f57d80a8c18 SHA512 5ee19044ecd0d3cb9e17e3de9a8595d93b234d248ba2b45c0464c2ce13bb063fb5fe861a62e6c9f6811443f9e57c133d243cfec3b23f7d24fbc980ba93fa65a1 WHIRLPOOL a48ba8d0f592ff6cae5a7b0eb338bad28600576f1473e17836ca68b1e2ed88ddc5f4051890efd8306f5e1475e29481861efa28f3a43ac50b409ac08695973e3b
+EBUILD libidn2-2.0.4.ebuild 1230 SHA256 39ab46e5d9d46bf5118a4573df1b7556be6146efcbb642b4b208eea3cb7bc09a SHA512 a3015fc0d0f51a91d2e646e18358ce91942b0c03338c38f3cb562ee49fa10e1eb9a43eb0bcbcdf2164ad5912d788039ed85ac23f8620b93b57183809df387099 WHIRLPOOL 2445e13b07ff42a11b6776c598f356b5987463385325b8bbcd2e964001500b4783be023300a6b6e76fc5425a9d6437e3d43a2f2c8b1bb29482998ccded17dc8d
 MISC ChangeLog 3828 SHA256 aefe244e873ffa922bd5fe4ec1e5e04c0a9e53b4b800ba7d45c852e42c59a174 SHA512 86f81bda7e03947c297ae9e43a099aefdc6998a8167cda8a1528cc331b7de0375269606e1c5ce0b78a4f24099916d2e484337919043b6a1562ebcdab58aba454 WHIRLPOOL 6875b1f712a7dd8e351d47711a458104cc915acd3bc0e0c7e3b1322c2844f8a5403aecfa106cf50e33be416b3d126449af713dc29bf45918f6bcca6a47e5b30b
 MISC ChangeLog-2015 523 SHA256 c7b427322922dc669c3a7181888c9db6e86e5e5dadb447c224a6a6fc9ae5e838 SHA512 383ea04d0912da873aa4c53f2750274e44cc964968da2c7766c34f50d7f6294443856900ac962c642d84976e0135ff43dad3d51b9655aac1bb0d56f209af52ff WHIRLPOOL f0e45be2ab24678fef9bdba1634e27841d3cc841e3c76ed6db9189735a4d44c51680d8877ee1b8c4421030d0f53ebab6fc262749f46c3609229294c33e23de81
 MISC metadata.xml 210 SHA256 59333e331c55cfd39ab5a54817053590464e735d79003424078790bad0f03885 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 WHIRLPOOL 4720a4dc9840fd244dc5c4ce9695cdb0007a36c7b0262d4db8a8b0fec37fc718fd0c33f87c9ca0cfd5f5f09b6fe42f1cf93103a85de3f2c3d5dce10a82ef082d
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index 7b64e993d3ac..7b568184d25d 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
index d0d36a796c75..8bf9dad754e9 100644
--- a/net-im/corebird/Manifest
+++ b/net-im/corebird/Manifest
@@ -10,4 +10,4 @@ EBUILD corebird-1.5-r2.ebuild 1430 SHA256 a79a9cc89d03808110c783aac21da64dfdca1e
 EBUILD corebird-1.5.1.ebuild 1430 SHA256 a79a9cc89d03808110c783aac21da64dfdca1e97ec24f8eb7511b20827ab2397 SHA512 6154332e8ed238189d5c10c9e6b70bba2708c5ceb2f04f84f3790a6fc953a1dd00863e639e4bf2b9cebe5847eb559fd9872554f54cfe339e24d2d440ee1141d6 WHIRLPOOL 49ef6ac4c123230de49ffbced9c0b77463d08b23405548c38521cc79e4a3406e328bf95190cfce70e7bf2a77a607e45938073b1fdeb5b500ebd5dc86565b23ac
 MISC ChangeLog 2751 SHA256 fc861d557ff715f5c9ea5951a29d59c09e3c8ebf24e416a5a42a78f756cf2da1 SHA512 14eef97f2b7cea014fcc40798c179be548adaceef9039fe30c66b303eb6bec0ca83fb8100ae29ebcfe2fafde332f530d07a746422de2427387a9fcaf2f13c5d4 WHIRLPOOL 5c4dcc82a1e67f30265fc6310ad668e307b2fcba33b8c1c373c6ee7154cd24d5fbd717451dfe9499b8a30cb02dbdb101ab479db66c18a15ec1517944032d1155
 MISC ChangeLog-2015 753 SHA256 0807fbe3f29d69ecc7e7c2161c55f68e109155d0f600bf583f4a0bd50b71a1de SHA512 a683284f19fab798ff4f681b680842eeef5f8af3d2a607f4213cdce0b9a06c9b054b44f5767d11ff50b6f1baddb59b9cf85d3afea7606f64555f3ce762e00fb6 WHIRLPOOL 59a6793f9e8dad3aa9954e7e19c80804f4682d55ff0374e75eb6f9565bae3ef781d96fbaf7c17b68bd7abfaf814368a3b20128ec71f5854bc07f25aa5c68da1b
-MISC metadata.xml 962 SHA256 d76128945cbc041368ff2b35baedcba56d5a31042aa26934e05c2d91cb458cba SHA512 56bb0081718b710ff89fccf4e77ca77e74362868844e74c455db7fcacd732aa6be2d86e68c4ee79d29bf192c07f4a4f46f489162613cb918b32b46978f701066 WHIRLPOOL 1d6d6a7beeebea9f281a9e54e6600a38cc138cfc7d65f884566411000e063e34179963fd3104091ef20cdd851625feaf9c5bf3a0c9083d6e5ece7f38351c8bf5
+MISC metadata.xml 706 SHA256 42656a782d60a99af53e121294b19cbda635056627af77a1c6038fc9c7c326f3 SHA512 ec24b71619f5610115704e8ecf590f69f9364ed8842db9628ee089c8c0867356aa5830a24428117370b658badf1cc2b0adf7468f6183fbff8a5f8d91323b95a2 WHIRLPOOL 4d650ce885ab726bff31dbf0d3935cd48ff0979ac0a451edfed7f99aa41f42dbda52c59870b547b4fb7903a01c24ad3d7f00cac4e5c4d875d1eeb5b9c3348f90
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
index 76003f5872bd..aba0ccd8f127 100644
--- a/net-im/corebird/metadata.xml
+++ b/net-im/corebird/metadata.xml
@@ -2,14 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>thatslyude@gmail.com</email>
-		<name>Chandler Paul</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
-	</maintainer>
-	<maintainer type="person">
 		<email>markpariente@gmail.com</email>
 		<name>Mark R. Pariente</name>
-		<description>Proxied maintainer; CC in all bugs bugs</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>moschlar@metalabs.de</email>
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d218bc98c13e..3fb68bc14938 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,13 +1,9 @@
-DIST gnutls-3.5.12.tar.xz 7212652 SHA256 63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb SHA512 8fec23e7e494a2e15e0f938115cae1ba3fee952d634db387f983b01096f68ca4313b23bc4c439d3c7fdd07c861eac4913a7c2343c8704961588ae195886ec90c WHIRLPOOL f7309aa89e75ed75371893ba4e4ac89f9f8bc7a61ef10ae4c4986aec290ae2dc5108cd3cc6463af6700ddab3754c6fcbd10ac95d3c40c4549cfdf6b3289f8a72
 DIST gnutls-3.5.13.tar.xz 7226468 SHA256 79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096 SHA512 e98f23a589042f879936c3f8b474535e695fb7dd68a9e81323668c013241f765c2d3af6c6a072ecf867acc1e551ec46e15bb842144d3a06bdd5d2f4fc3d828a7 WHIRLPOOL 89439e7adba634698642a247c418569c0ea6ca6155bfb5dce17c8ed69d2506a37d9ad793122aaaec92adffefa75cb23a857c49ef722c5cf506700fe0c34b6028
-DIST gnutls-3.5.14.tar.xz 7228200 SHA256 4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda SHA512 c55384bdf835c0f7715bfb10b7fa0ac30d26d53ffa5f32af78844cf27985407eed034af77413fb2e94e3a0c0a5fb0597d66f5dbbbe72e5e0658bfeeafa6f7829 WHIRLPOOL c6ae68898983184d00dde78a38a3398b677541ae6316a25544668f183423da1f6c3c7f3709f896f6c135e6907d832d6980f102d77b40758f9cf81c25f68cb086
 DIST gnutls-3.5.15.tar.xz 7238928 SHA256 046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecfad5 SHA512 046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b WHIRLPOOL 811cca49bdd144107b6c25de31b3209694a8590107953fc3c4ecafddba48339e98cf1dc8e489addb04f0ac525411e96e505fd8edb342dca4e02f97dde3f26ffe
 DIST gnutls-3.6.0.tar.xz 8024972 SHA256 2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03 WHIRLPOOL e8e479d7a0adc14c969b7364f58505f68ed92054fb8d8ba862f59d9ab64578e83ae02309ec9b5da2e63fc5dec799d86e434abc32394dbf414dc46bf46b15b0c8
-EBUILD gnutls-3.5.12.ebuild 4241 SHA256 7cc2f99c8c204729d41c215edfc3694bf7c1c867a6299a294c733efa54ef524a SHA512 4539b39dd14e81432d005d6e008a44cd86b85db93cc809eb11ec213060a85fa84bd2d3e39728b421f8c506b4075dede2011618d1ee8f7b15870aa2cc8d2b63db WHIRLPOOL 2e57007bec6aaf2c0fab154062a1c1c0149bdce8822ff7baf27c2501c86ef736bcce558e7fce3a088d8d1b6776b23ea39e5ace4ab5806a625d7b7aed3305d249
-EBUILD gnutls-3.5.13.ebuild 4240 SHA256 5ced6157f89a13698570d9b81a5928d19e474d99119f9a0c222844dee05c50a2 SHA512 cbfe9e36d49a1ca28bd9ea9912c5593359f885cec4d6c10cc3ba30bf791ff355c368a9ad3e46163d34c32e2583667291e01ba33b40eda3deb5c44e5b901cf336 WHIRLPOOL e5594b1deec3fd384a5589143a0b7f8c82f3b458a3c1d07fd0f8e39c843f1fa8b95521534bee265f863e19c654203baccd274c23f53ac440b3fb7ab82712e7b3
-EBUILD gnutls-3.5.14.ebuild 4248 SHA256 b49907c8f76b45f5bb41090a06ff12ce2a6b9f84f95b94f192938b050ecbf04d SHA512 c253bf6aaf6fe42d8dcc50327fde08d50dd19b07ecdbe2fd62d4918061ffded044140c95b5473dfb064b7e57d77cff889b86417720a8c42d9f981218d45654da WHIRLPOOL eece35197be71f02fbb954db0b35d5ef270927b2b31eb100f9ceb7f1430da5d293332baebc842fd61b99a1c480d2134a393d75c0faed6e25be78eeff1317afa7
-EBUILD gnutls-3.5.15.ebuild 4348 SHA256 60325da7c14160c32e04a9debd687c857ec204b66f62067b56c8b31b3d7b7f8f SHA512 9937ce68b1e6322a60ad8e03b1e75dbdce825444aa879e563a77002040ac0d26b6b98739ac5b1f70827d93621f873e1f822cf5bc58f1766a7d70207781e75b83 WHIRLPOOL a71d1bfc14f273791af793de045e68810bbfd8c4c0ef0b0d734efee7e8ff283aa87996d91ec97a9331461dca1b7f331db2283fd1136e6ed57640852c83d3f53b
+EBUILD gnutls-3.5.13.ebuild 4239 SHA256 1a469cfd52bb5ae35dd8c082d92da70eb95df5d31d6408ebce877e4ee5414367 SHA512 7a3ab4ada4edc640dac61f6fa7054d4ef1b8e3c434634cbe6edfbc1d7a99694e9612c5d2f6bf39c57389ef55f73f602b90c3a4e472ae3a0e571d83d6bc54fd42 WHIRLPOOL 7558a9899237bd14695304d52e108b0aaf314e489d5635a7180dd063c0c09e95b0ac17482759f59c7a23f38d2188a6030f9ea9fc2bb82d8e45d33247ce933970
+EBUILD gnutls-3.5.15.ebuild 4343 SHA256 913dd405ef17219938866e91e0dbc0bc1fdb3103ac790235b59104d940a326f7 SHA512 dff41b697330086b7856fbc6fabf3bd8958864f674e14ab9a8b35919ee858015d599f79b8b40c1ac66f78e4a4b331ffa0b3ad9eca33ec1e78d1e5b0091917aa2 WHIRLPOOL fc2363e180a918fa8ad5358aa54612b0607aae912b00a377b0f2f4a7c98dec347bb08fdadae6bb319c450e64f105c3eb6b0fb83fa401dff5258930cde54ebfab
 EBUILD gnutls-3.6.0.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
 MISC ChangeLog 17487 SHA256 745581f186ce927f027e522a8526063db87e0f641ee11341812bb5f63f9b33f4 SHA512 c002d5c6d3dbfb1b0d6fb98971e1a0863984504f8f8dd6a3e14e14b8345e3e1707ae5048cdddd84417a527c8c654f5d947d4dd5d722f98b21349a1ec199c03e1 WHIRLPOOL 1497e5ef4f12af6e20ab11ce5fedd3b90e590886d423e5cf2aeb3839ce1b5a0077370b13683c2c17f921524e8e4e988a4c72cbfd757148097bed92ce1ef6f803
 MISC ChangeLog-2015 82624 SHA256 4fe397e159cdb07634ca978c94cc0b39eca917b0ba6ba076d8a604a493048226 SHA512 5e51b3daec255369511ffdab025e38c8b0328981534f78ee9b878ce53b101c2a66227b6990743010dc842fbf283748227a39edee290ddcb0c9caabb783c248c1 WHIRLPOOL 7eac80b27265b5035b09fc24c318602153f84bbaa242b5a490380fa2134a5bbe2ba4f946d5d34057c7f99b4c6a1a8fcbb2e53026418347ffda04d6477cd95be7
-MISC metadata.xml 1258 SHA256 0f335e67df2ab489b81c80fb737d5fb1b25dae656584918b6215c433c0daf9ad SHA512 ac9c2dcecc76ae124eb4c208ba23c75129a67beb5ea32b0ef6bcf2797c5b87229d72cb16c3d84bbdc930226ab80fd9e289fecc718ee9ea853ccd8e558d630d73 WHIRLPOOL 8b88a362d1d836661449dd281af3eadb54f60e7174783e7930beac53b1f2a811533550ad48ca57c2f0f9dadbf8e273419feddadb19ee4829eb956300bfa1a9e9
+MISC metadata.xml 1261 SHA256 8b7398e78d0897f95937f18de6768d0bc5aa710f50a7fca7f0e77ad90794222b SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992 WHIRLPOOL 6c597442b0a270ded3b49c54ab04106fd2f74c45b64a2f552498ca0f262d088f0daf0771d4eedec6fa3810db0dae54a168e1fe7da2e8f815a6be7423ac7adef5
diff --git a/net-libs/gnutls/gnutls-3.5.12.ebuild b/net-libs/gnutls/gnutls-3.5.12.ebuild
deleted file mode 100644
index 3cc5187823c8..000000000000
--- a/net-libs/gnutls/gnutls-3.5.12.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/30" # libgnutls.so number
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 sslv2 sslv3 seccomp static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
-	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8:=[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-	test-full? (
-		guile? ( >=dev-scheme/guile-2 )
-		app-crypt/dieharder
-		app-misc/datefudge
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	ECONF_SOURCE=${S} econf \
-		--without-included-libtasn1 \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(use_enable nls) \
-		$(use_enable openpgp openpgp-authentication) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		$(use_with idn) \
-		$(use_with idn libidn2) \
-		--without-tpm \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		"${libconf[@]}" \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.5.13.ebuild b/net-libs/gnutls/gnutls-3.5.13.ebuild
index 096f0e9dbb4f..d927832a49a0 100644
--- a/net-libs/gnutls/gnutls-3.5.13.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 sslv2 sslv3 seccomp static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
 
diff --git a/net-libs/gnutls/gnutls-3.5.14.ebuild b/net-libs/gnutls/gnutls-3.5.14.ebuild
deleted file mode 100644
index 050387e4052d..000000000000
--- a/net-libs/gnutls/gnutls-3.5.14.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/30" # libgnutls.so number
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 sslv2 sslv3 seccomp static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
-	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8:=[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-	test-full? (
-		guile? ( >=dev-scheme/guile-2 )
-		app-crypt/dieharder
-		app-misc/datefudge
-		dev-libs/softhsm:2[-bindist]
-		net-dialup/ppp
-		net-misc/socat
-	)"
-
-DOCS=(
-	README.md
-	doc/certtool.cfg
-)
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug#520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# remove magic of library detection
-	# bug#438222
-	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	ECONF_SOURCE=${S} econf \
-		--without-included-libtasn1 \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(multilib_native_enable manpages) \
-		$(multilib_native_use_enable tools) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable seccomp seccomp-tests) \
-		$(multilib_native_use_enable valgrind valgrind-tests) \
-		$(multilib_native_use_enable test-full full-test-suite) \
-		$(use_enable nls) \
-		$(use_enable openpgp openpgp-authentication) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable openssl openssl-compatibility) \
-		$(use_enable tls-heartbeat heartbeat-support) \
-		$(use_enable sslv2 ssl2-support) \
-		$(use_enable sslv3 ssl3-support) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		$(use_with idn) \
-		$(use_with idn libidn2) \
-		--without-tpm \
-		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
-		"${libconf[@]}" \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index f4f614daebed..24e4bb0fef56 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
 
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 9f796b4b07fc..85804ccbea44 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -11,7 +11,7 @@
       Named Entities. Requires <pkg>net-dns/unbound</pkg>
     </flag>
     <flag name="openpgp">
-	  Enable openpgp support
+      Enable openpgp support
     </flag>
     <flag name="openssl">
       Build openssl compatibility libraries
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 5db66c6f467f..899b6d78ae02 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -6,7 +6,7 @@ DIST cups-filters-1.17.8.tar.xz 1455096 SHA256 9acefd72f8e6a6e5fb6e80d37aad8c712
 DIST cups-filters-1.17.9.tar.xz 1454068 SHA256 98ae3f8c8309ea950144e582d252e65f4636e8812832a982edd0ab83eddef544 SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4 WHIRLPOOL 0b838e546bc505353a7e6294b536ddd3a68b767fa63495f289faa96f9196b2b345a75e611cf082d3c45976658be8eaad60ea5a11d57f7bff9f826b6f3a1835d7
 DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
 EBUILD cups-filters-1.13.5.ebuild 3242 SHA256 abf3490575abae9dbe41956f3bb2bfd72596da62c1886e431a3eeeaf1074ce8e SHA512 de7a27e2c5789f7ee700beea4203bc739b00484d9c50b52b18420b2e0b460f648f4b38d66ea58f61458c3bc0e412fb1cce0b865f2bcdc64d29083d2569179000 WHIRLPOOL d712e5216cb859e4b6f432cf9a23ab9b1995ec568b54a97d02eaa19d8d8a495c37d5c1f7bb03fe662e24e7b20bf10d8f2bf296e3f885e07b1dc231b8e411a712
-EBUILD cups-filters-1.16.4.ebuild 3402 SHA256 dc2c123fea9868c00440ce08eb8996acbcab68990d1ca2d2145a35ba034e21e9 SHA512 9b1e61686fa96044119ba8fa380487fa7be7dfca8edfc87d2e516160cbbb79f0c092e3409338ed76f48d320f6102bb0b47cc0578366ea0ac42810d1434b161f7 WHIRLPOOL 36fd5bd02e284c69fd2efba054a69500232fed9244be19a60e6300a2ac7414cffee06eb647809de7d5961f9ac6c2ce58ed4869a84ce5467ba54fac89be97d129
+EBUILD cups-filters-1.16.4.ebuild 3401 SHA256 9cb0243d3984647aae370e17cc83257e11a2e57e40e9f7d936afbce38c8deef2 SHA512 02d3d3ec0f2415aaef89d5875ba298db0fe324729ba8fb306320fa485f94d5a9841ae43a29d9d3a0477d60b73668f425fd309bd3045443a2ce50ad67400c33d3 WHIRLPOOL 6b3366bda2b6450cc527f5a580c553a4791b89ee525503533148c4bfb56321971996369ef4182b04a0de6bc04af2940930f7603035559ebec3651142e5f2d7bd
 EBUILD cups-filters-1.17.8.ebuild 3469 SHA256 6372d07d70d24ed6951c3b37d14938fc4ff3cba3c55ab876ee62acc5ebb799b8 SHA512 69706fcdb1fd4d1949c87d743fab6f3584adce6efb284c89befc680f4a252823075cc931771658a043cc9dec45bf0dac5c35c3023cb8e443ee46ab4f0f5d642a WHIRLPOOL fc92aa6c3c4fe04f716163b15d22be208f7033da4590ce1e483eec451435c81efd3b9588a75a9dbda55ecbd4a1d5f9b105f83003ae62fb81802a2cc892363f55
 EBUILD cups-filters-1.17.9.ebuild 3469 SHA256 6372d07d70d24ed6951c3b37d14938fc4ff3cba3c55ab876ee62acc5ebb799b8 SHA512 69706fcdb1fd4d1949c87d743fab6f3584adce6efb284c89befc680f4a252823075cc931771658a043cc9dec45bf0dac5c35c3023cb8e443ee46ab4f0f5d642a WHIRLPOOL fc92aa6c3c4fe04f716163b15d22be208f7033da4590ce1e483eec451435c81efd3b9588a75a9dbda55ecbd4a1d5f9b105f83003ae62fb81802a2cc892363f55
 EBUILD cups-filters-1.5.0.ebuild 3150 SHA256 cb9c6930e39194e05f1a4b1a811b8be97772608c47ce141cff2f0233f7bc0050 SHA512 88b84a8aa467ef91686826387a7fd0d6a73d87cec3665e69825e47ebc35c8ddaae8b83b831cb0d4aaf368cb0b792954f27f52080b51b66c999e6f8e10877554a WHIRLPOOL 4bcbf3945b0b93730151d0c19f5019353c4090290c61c08dfc02ecfd9c3f0dc694c98499e3d867d9574e1b9b7c0ba07867827995de60ce23d6ba65266bc7a4d3
diff --git a/net-print/cups-filters/cups-filters-1.16.4.ebuild b/net-print/cups-filters/cups-filters-1.16.4.ebuild
index 2df6a72f971d..9517c9839cae 100644
--- a/net-print/cups-filters/cups-filters-1.16.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.16.4.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 6c39e2d68428..a962e7b03b79 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -18,7 +18,7 @@ media-libs/sdl-mixer fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-12 frei0r
-<=media-video/ffmpeg-3.3.3 frei0r sofalizer
+<=media-video/ffmpeg-3.3.4 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (26 May 2017)
 # toolame not stable yet
diff --git a/profiles/license_groups b/profiles/license_groups
index 32cfceb8d1f2..030fecc0abea 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -5,7 +5,7 @@
 # licenses@gentoo.org
 
 # GLEP 23
-# https://wiki.gentoo.org/wiki/GLEP:23
+# https://www.gentoo.org/glep/glep-0023.html
 
 ######################################################################
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 3f85934bfe03..e0750063ce71 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,30 @@
 
 #--- END OF EXAMPLES ---
 
+# Raymond Jennings <shentino@gmail.com> (08 Jun 2017)
+# Depends on qt4 which is being removed.
+# Upstream announced EOL effective July 2017.
+# Possible alternative is skypeforlinux,
+# which uses the same account information but has different features.
+# See bug #620722 and bug #608174.
+# Masked for removal in 30 days
+dev-python/skype4py
+media-sound/skype-call-recorder
+net-im/skype
+net-im/skypetab-ng
+
+# Kent Fredric <kentnl@gentoo.org> (14 Oct 2017)
+# 12 years without upstream responding to bugs, code almost
+# irredeemably unmaintainable and with no way to demonstrate it
+# actually works. Bug #634244
+# Masked for removal in 30 days.
+dev-perl/Apache-SessionX
+
+# Alexis Ballier <aballier@gentoo.org> (14 Oct 2017)
+# Beta version, breaks revdeps, needs testing
+>=dev-lang/ocaml-4.06.0_beta
+>=dev-ml/camlp4-4.06
+
 # Lars Wendler <polynomial-c@gentoo.org> (12 Oct 2017)
 # Dead upstream. No qt5 release. Use app-admin/keepassxc as drop-in
 # replacement which has very active upstream and regular releases.
@@ -340,17 +364,6 @@ app-emulation/vmware-player
 app-emulation/vmware-modules
 app-emulation/vmware-tools
 
-# Raymond Jennings <shentino@gmail.com> (11 Jun 2017)
-# Upstream announced EOL effective July 2017.
-# Depends on qt4 which is being deprecated.
-# Possible alternative is skypeforlinux,
-# which uses the same account information but has different features.
-# See bug #620722 and bug #608174.
-dev-python/skype4py
-media-sound/skype-call-recorder
-net-im/skype
-net-im/skypetab-ng
-
 # Hans de Graaff <graaff@gentoo.org> (05 Jun 2017)
 # Bundles obsolete and vulnerable webkit version.
 # Upstream has stopped development and recommends using
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2ea01347dc3d..188359b29bcd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4277,7 +4277,6 @@ media-libs/spandsp:fixed-point - Enable fixed point support
 media-libs/speex:utils - Enables speex commandline utilities (speexenc, speexdec).
 media-libs/speex:vbr - Enable VBR support.
 media-libs/svgalib:kernel-helper - Build the helper kernel module
-media-libs/taglib:asf - Provide support for Microsoft's 'advanced systems format' media container.
 media-libs/taglib:boost - Use dev-libs/boost instead of GCC built-ins
 media-libs/tremor:low-accuracy - enable 32bit only multiply operations
 media-libs/vigra:valgrind - Enable valgrind in make check
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 7596a8301ca5..373c24fd171d 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,5 +1,5 @@
-DIST osm2pgsql-0.92.0.tar.gz 1364481 SHA256 b741cfdf6489fd5def721f75a9558b8cda53165dda7ca9548fcc5b43e163ee77 SHA512 fc2afd6c06f8a44ce3c75e3a731d48cefa17b406c296208519f598531cb3d9561fcfd09c69bc20753ba7e9440087f3f5d38bfe117ab222d8b10987a8d3165ae8 WHIRLPOOL 4fd5d1c645e173f018618edb9fd49da692637fb59a9ccac13ddbef74003fd776af669f23fa2346bb33be2c7d89e121cc206892d18bd2c123debef032827ee45f
-EBUILD osm2pgsql-0.92.0.ebuild 888 SHA256 de7b51d7669c3323a599a6783f47ec9c936faa0476bf5370f2e446d22a0ff4cf SHA512 3d66ee0d1d00ac20ef30196c62e75487931ff6c46071e1b850a57500f330829bb2f791fc0ad1da4e8ed57bf71c6cf85bafdff427a9e64f67b4f76e7ce1e5c709 WHIRLPOOL 63f6f633dca2f70f602db36f69215639415f1bc8164e2ebe0b95e203045d53243d01f3d3dae027a1692eecf54c9b3b824168509833f23251b5abd77bfb979418
+DIST osm2pgsql-0.94.0.tar.gz 1203310 SHA256 9e67e400deca48185313921431884171fb087dfe9e0d21e31857b8b06f20d317 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e WHIRLPOOL 2ebc7f0c09079a9417f7c67b7c2fa8ea275b35f20df9cbfed1c9223d7ee1385af9313c6fc3c165ef410b7480517333284921e2e46c0e2706d318cb21d0761b3b
+EBUILD osm2pgsql-0.94.0.ebuild 866 SHA256 7d2d2fb795e6d5e92194188567bcf40e94e98f53464fe2ee8ce1ddd1eb0399c2 SHA512 2ece09c58afa949f288e4da1f158cd40dcfbeaa8aa74e1c284bf16ed3ad82967be54804bf4b8a6b39b00cc3d02e73a7516c9042dcd27af4936cb817dfc9b93bd WHIRLPOOL 2d1a4321b42a6f9c38de49fa6b637e0ea00ee91022ea1f513402e5ef89d1a808c236e7af78d4f545d5bec9a250c68b326c15c4de24b75b0194a4b66ab254bd6c
 EBUILD osm2pgsql-99999999.ebuild 812 SHA256 18d35e5106f54e96e17c4463630cc30972fa2a64b548cf51d7ec9e51f1b74a9a SHA512 a70c0352ec4299ddc7df14d5d10c3756d569958ca78789989ee55460e0918315a076157e03477b6054a5614e1f537ba9fe9bd680d5102f49f3135f0c1b5475e1 WHIRLPOOL 2f3445742def125b8d4cbf7aa1173da73008e19bfe829185c6b9db2dc259bfa686bcd5a57074aa6c4cf45da9fca934106bafdffae0e6296780752fe722953eb8
 MISC ChangeLog 4061 SHA256 90b1b4f63d1427fd2c137ed8d0f6a7ecafc975226d72d0d341cb11f13ecbf893 SHA512 02f35b4f1d8eede9fe50094c92dc8d11fd40d444b64f24ddfd5ca0f89a47a9aba4deeca7a474c53547f07b8a8bcfd26e22dcf8c91c813edb5b7b237af0c837d8 WHIRLPOOL 8a479ce07d1e7edff6ba0a1f8ac9e3e56a2ecb663a36c076b28a78b2dc8db2a023e4ac13a763550d2b7a2b818cb7669026e21e693ad583a1f70d639517f95db1
 MISC ChangeLog-2015 3619 SHA256 65fd7d4cbbe85203ecd823bb0ae3edc62d47a10545c159834e4a3e4c2fd2cb04 SHA512 974a3f117501e08e08b9c37930c6d423def1b692996e1b65ce331d9319bf66ef907f13beb05c6b275088f1ccea3c0c84ca8dd207e85625531cf2406361e02fce WHIRLPOOL ddd8f59931c46db64c8ac09dcef786d525c2b3dd104acfb66e93e0ce0dd67e4d2bddebccf8b33f4add04c961b3ba8cc95ac3505993b1f399e53bffe3376adb11
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
index 5baceefb803a..801da8b39d7e 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.92.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
@@ -18,7 +18,6 @@ COMMON_DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
 	dev-libs/expat
-	<sci-libs/geos-3.6.0
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
new file mode 100644
index 000000000000..88573a9c3b68
--- /dev/null
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -0,0 +1,3 @@
+DIST alt-ergo-1.30.tar.gz 380329 SHA256 2fd8428323efeafe1f0a92aeaf98242f4668784567a25eac230675451653b708 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2 WHIRLPOOL 45ac4e9f0f44e1deb30a32fb4d83624cf152dcbd734bc5baaf26f2460ac1eb67553049665ed733013bca3c3749af916510f8f0c3693eadada1d6df0949c017cc
+EBUILD alt-ergo-1.30.ebuild 732 SHA256 9778344f2ea04dc1c7d1307c472ef3b35c901fe6b6a4438f04e9f78cadf3a5d1 SHA512 39fed507ea5fd20dc150e6ee4c342ad5b48e766b1c10c9aa1957bf718aa60bf59bfa4888bc0ed48e7086f88f4ba84d4902c91b5202d4d66feee5dc05210b2bfe WHIRLPOOL efb76a45ba24f4bdbcb42a1b477d53a2c28d174385b4517e374a18177d0f4a24dcbec1015b5d10f1a348a8f6f72ea6aa59d0c4b0cf2af33c7bec8b5a8ac8fce7
+MISC metadata.xml 670 SHA256 7e84fe9865c5bd5b0998b506da0fae672c72e4b8923617c024f1bceecbc0ed67 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d WHIRLPOOL 5c224a903d9ab9bbb28e4c49041cd12dfbf6d969855a0abd071ffff0e852957becc1734575979086c3b4aea43709d4ab00a7c3593a778e03120e7e77576814be
diff --git a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
new file mode 100644
index 000000000000..46560c627430
--- /dev/null
+++ b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Automatic theorem prover"
+HOMEPAGE="http://alt-ergo.ocamlpro.com"
+SRC_URI="https://alt-ergo.ocamlpro.com/http/${P}/${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples gtk +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
+	dev-ml/zarith
+	gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] )
+	dev-ml/camlzip
+	dev-ml/ocplib-simplex"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES INSTALL.md README.md )
+
+src_compile() {
+	emake
+	use gtk && emake gui
+}
+
+src_install() {
+	default
+	use gtk && emake DESTDIR="${D}" install-gui
+	insinto /usr/share/doc/${PF}
+	use examples && doins -r examples
+}
diff --git a/sci-mathematics/alt-ergo/metadata.xml b/sci-mathematics/alt-ergo/metadata.xml
new file mode 100644
index 000000000000..8e305fa324a8
--- /dev/null
+++ b/sci-mathematics/alt-ergo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		Alt-Ergo is an open-source automatic solver of mathematical formulas
+		designed for program verification. It is based on Satisfiability Modulo
+		Theories (SMT). Solvers of this family have made impressive advances
+		and became very popular during the last decade. They are now used is
+		various domains such as hardware design, software verification and
+		formal testing.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 00c5a3dcdaee..f73970a58b3b 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,8 +1,4 @@
-DIST rkward-0.6.1.tar.gz 1529612 SHA256 7887bc22645a8e6de278da55e31a61acd91aca0ade777af11a110d0dfcfffde7 SHA512 5171b60ed42049de9e0f45b64f61a9bcf1fe8ba89e5a5a8b9ba77b9f7adb0d61630691adcb6636f5d5c5023c64a48220e85ea93c2ea09af34df2fa4be5d0cc9f WHIRLPOOL 2b195384dc0e093b445f7bf21c1f4bc2f378af7e51adb20f046a97e07d7f808b04eb3be9a35198b389b84edc79b3936d2f3d5e7eebc82ff3bb612465b813bcb3
-DIST rkward-0.6.5.tar.gz 3731011 SHA256 3fc5acb48ce717dee8fbbe32973ea4c61f30c335bd18a75471142b19b436a032 SHA512 7ea5016a0bc5bb6ed24e38252338142e32291aaff547dce9c3f61524b60395ce595803aa059580e56c38ed9600d09647acb2a8feb060819a0436475e4bf6f1b6 WHIRLPOOL d7dedc8cb1f65c124ea3d2a3f52c557477d3ce472c33a40df7e0c905d2ee18713dfe7980756058fc62d576661b26db4312f5ce0da017fac13477c670ea238904
 DIST rkward-0.6.5_p20170420.tar.xz 969148 SHA256 eb258cb901e65486adcd22d30d1520902533aa3bc8928041e22d5290b54ecad5 SHA512 904fb9065f7b0d14e5c015a20236a496bd8380ee8083f104203d1d9944f978da10b4e00be497ec55967c8137815f09843adcad2dd71051fbf8b50471a5c0c09f WHIRLPOOL 6288f68850ffa90c4f768921077ca5919f78ba91876cf8afeacd3dd04d83931192d2255d678c4e02789b3622ca100c01baf408068294058fde266b2c4415d848
-EBUILD rkward-0.6.1.ebuild 763 SHA256 38e9bc4f5b438c18b7e35beda858a9fef8e9d0606cd522133e803e266d9a3dc0 SHA512 3776f95949b81224cf46d86aab9840293cef64098e6132c8c1ab0285229b1f42003cb6b2bc1d334225878c9a2c23da75237ef464009bfdc45eeb5889f24651ef WHIRLPOOL c0346d311e77998efe25a095ddcf6634cddad04d55daec4e7ab2f9b2d8379f48970c43657a33007f1b5ee6db2f2bdc589e856db9552d91378a10f23ed9daba2f
-EBUILD rkward-0.6.5.ebuild 755 SHA256 7918208f519db8ecce23724f8dad35d28e6a273e6f81be33a75f6875317b7cbd SHA512 fb2d171365a77bdaf8392e6aafce803591d16a0334c3f92631240060c02a85937be223163ecbd7801a7c274478b91b7f21ddf4bb88ff29998266a52b2c7d5c4d WHIRLPOOL f4f834c25fd87e4bb6990d57609cc24979ee6f04f30d8d2530eb5fb6bb1d6366945cfa6247b4aea6d186ba4967193b9de02681ccaeb71431ac29bd579ee49408
 EBUILD rkward-0.6.5_p20170420.ebuild 1261 SHA256 300f03e20b66e40061b133a4b00e6ece7dbe961044abcf5a9b35518c42c59a7b SHA512 eba762c875a1f05c9bdcb8bb217a8e3c19a64e5af82023fc51539cd3526cadaca70795cfe37cad47491d924f518ce1bcee11e17941a370e1298d2088362eabad WHIRLPOOL 2b34365dee615cc4db9748903e8072df1f325cad98c7a0370e54afcdf8e6d8a82468715458ea611b0ae640d144f0c01ca0cb22bddfd6d3f9240f3f7e1ad51a3d
 MISC ChangeLog 2610 SHA256 ff634cfd1984f9504f5c900ab400704ab512e218ff27de8baa7b107330829360 SHA512 d66852fc9e5fd908bec9d7ec23668e58b43761c829bd82770e8b11df62d3cd3a6f3e69c376d0a2040b043f9efd116202d743a706d195d0f6ee1b99ff37477d82 WHIRLPOOL 1d0a98cbbe86317076d46b976339cf642f21f00955189eab6b42dae11799408bb987220e9eb32726474ba47a3d593936dce5e0e933e53515df71d02290e68390
 MISC ChangeLog-2015 6418 SHA256 b6190dd88880d49676fea2ff2e3067ce7a3478614bcc7ee90c2db01a77051283 SHA512 2f9161e4183bc9166faabf608e65e33b0fa51268594325c51a29286e426fbdc02b35f44201cba810f641fcb90da6e27dcb185551d15a567a6100e8c28bf7176c WHIRLPOOL 876e7af65774af827477bf5425429666a657d282dd5a74f696b98b9c471fdca3f949b9afa0c3f08289543156ee3f1c68a99feb68c1a82b024f951fcc57f28925
diff --git a/sci-mathematics/rkward/rkward-0.6.1.ebuild b/sci-mathematics/rkward/rkward-0.6.1.ebuild
deleted file mode 100644
index 3b6c48e9bc05..000000000000
--- a/sci-mathematics/rkward/rkward-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="ca cs da de el es fr it lt pl tr zh_CN"
-
-inherit kde4-base
-
-DESCRIPTION="IDE for the R-project"
-HOMEPAGE="http://rkward.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rkward/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	dev-lang/R
-	$(add_kdeapps_dep katepart)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# to have it compatible with R which had a bad R_HOME
-	unset R_HOME
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-	# avoid file collision with kate
-	rm "${ED}"/usr/share/apps/katepart/syntax/r.xml || die
-}
diff --git a/sci-mathematics/rkward/rkward-0.6.5.ebuild b/sci-mathematics/rkward/rkward-0.6.5.ebuild
deleted file mode 100644
index 9b46de92e179..000000000000
--- a/sci-mathematics/rkward/rkward-0.6.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK="optional"
-WEBKIT_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="IDE for the R-project"
-HOMEPAGE="https://rkward.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep katepart)
-	dev-lang/R
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# to have it compatible with R which had a bad R_HOME
-	unset R_HOME
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-	# avoid file collision with kate
-	rm "${ED}"/usr/share/apps/katepart/syntax/r.xml || die
-}
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 3835eef80979..9f5f94fc723a 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -7,7 +7,7 @@ DIST inxi-2.3.8_p20170114.tar.gz 422139 SHA256 ecad1522c786555c7b11d3066878f94fc
 EBUILD inxi-2.3.0_p20160807-r1.ebuild 687 SHA256 6da49904afd4b2e13b98836b5a03e11bcdb9f33b9dccb0634b3ac82902298828 SHA512 a4e00b2f909ed6692a43fc4de657424772b58f1ef33d0e8e2f5fb9af896d2ea227eafe03e47c31c1b7afa5ad7e49851db46d3d0f5b10d643a29070a6b2ca418b WHIRLPOOL 45b6881dfe895b446202b5f6329fe57daf9a25ee39d5f967ebfcf823e56841fb8aaf6e5398972ef7b4fbb5fedd7efb84983460d317c01b0505e2452d3e2d5e34
 EBUILD inxi-2.3.34_p20170805.ebuild 691 SHA256 184f16596be8c7168743e15379e4e32271f14e295c291c796b2ff95b125e9365 SHA512 24467d736e6b750f18c78f8d9a1e384f6e5fe1fb5bd04f28de4ee18f11e1f9c4f5581ba1355b820bb0de3def71808ca274a4f2708ab2256f4e147dc005f97201 WHIRLPOOL 6ef84aa77668dd15a5fde1e7de005149c0dc081a1e07c1c518317b6d8a08c466873e6892e1bd113fc4922ddae9256ec7764cdac12d30d1dc8cf88503c518b363
 EBUILD inxi-2.3.36_p20170816.ebuild 691 SHA256 c5e95d03c3e6218ef9a69b5d6aa89ee158ed510e6776b92ad80d64aec009f897 SHA512 6924100f657e0968d49eb5576cab42719124608c7ac65ed6d58db7573b00c1dfdd0932e988cfe3b97ce129acbd1b3703042740c01c379c10e2ced7916c57625f WHIRLPOOL bd57aa4238130cbcd99f643dc40fab5e086ef8aa1496f70ddee8e34c1c87738cb0aa44e1b16c9bc9bf81c23e95d40e143cd1ab63f23be3dac053dc413853071a
-EBUILD inxi-2.3.37.ebuild 700 SHA256 1d4f0ce96fae30b2a0416190ff695cfe538de46e307976dd4f19b35a8281b3c9 SHA512 3f77d7e5dadced781a201d7e95632809f049ca78a017ea3f7db357687d1175aaee72a4ea08df4f806073570e5fd7d2981ffaa06a73b28f268a53664f7587099c WHIRLPOOL 6c4efeeb89ea12f71038f56acd542e8316868c711a637598703c914f7f414f25f6070e09b71f5ad1ea97480fcab981a21a93d2bf6e05625a2e6cfa7b05696d1d
+EBUILD inxi-2.3.37.ebuild 705 SHA256 9426170994e9f03248156bbaa0c18568913097bb84a402ca95116a9a509e0f9b SHA512 a8f83bfea602259ed133fce417d78a92670e8df7a5522445a9abad078b12432b5cf66e95ba44d96b9a43299d40b8e0a5f4feb5d01a11f2347da397b42db73074 WHIRLPOOL 8cc560db05149a2f997cf1b4fc282dfcb95e6b7ce4812fdfcbc60a5bc7e889f8d9129d20c53f9f422d1db167a937ef8a0260c40508780d5b34326fe563b11f15
 EBUILD inxi-2.3.4_p20161104-r1.ebuild 688 SHA256 db05b277b7403c8c003fbb049937f7483fdca0ceebd1ca9110c9a33ff38dae23 SHA512 10b098f7e9f6d355fcf4bcd9811bea81009d1160ff1381703f16c030753093d148854061df78b00064f28a130db65d602a78511cd932e88a6f8a3e16179d28d5 WHIRLPOOL 338f27f21c891da2b4bdbee4ed226ff7fb0e2354a37ae60192b5d55c3f81c3eb8661bdd0e0ecadde8a28927676de71979addd36db677b85bfaf04d86aeb738ab
 EBUILD inxi-2.3.8_p20170114.ebuild 686 SHA256 5a66030904ebedef92cb35fe6ad8b0ae9922a7f64d7130799c28c7e66f48c718 SHA512 8504fbaba115a62659a722c40af8a7481f21c57cb081e0d7e9e7fd62733cee68ab5eb9fd71681f8588a8adcc732db5e74053ecd428716bdf068cc37c83d23008 WHIRLPOOL c2437044bdc9139bd5399ac7cd1e14d68251368f9b147395f0283661ede9b8fc8d8172fb955a260ecebc781a317164336c4897286c3fdc2a9546296e4230a961
 MISC ChangeLog 4021 SHA256 168dbf7c3dc087f9b1363d43d8819ccc5b4d043453946d07cfcdf41e4c53b396 SHA512 dada5d7153f85e68ab68de3acfe19300b9c0c13499b75a1a7b03b68caf9c99540d9f2799543bee541c652b806383a1d444456ad2a08c6aa8bc6f66624074d9d9 WHIRLPOOL 6fbed63bec13f0cfab3ab7e2f7f2f67cb8a0967679fc9ef27050208cde968d5a6c4388a70b2dac96dfcd0a5ab6ec1eca71789b7a0f18728e8e96e7f4d9ea39e8
diff --git a/sys-apps/inxi/inxi-2.3.37.ebuild b/sys-apps/inxi/inxi-2.3.37.ebuild
index 2cc895e4e349..f6d5405ae998 100644
--- a/sys-apps/inxi/inxi-2.3.37.ebuild
+++ b/sys-apps/inxi/inxi-2.3.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 8b263c2f21ee..ad7f54207b65 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -19,7 +19,7 @@ EBUILD openrc-0.30.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625
 EBUILD openrc-0.31.1.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.31.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.31.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
-EBUILD openrc-0.32.1.ebuild 10165 SHA256 6b2e5935d985d2ba23e39c9311b2d29ea72f8374165daca703f1d6d6676b3d81 SHA512 ac8c6fdbb75853d144923b0166095b769c3c384ef4714a6687ec3c3b0e0535cf10e04d3a74b3b88b72538d88d29a63ee380041b3f388917ff2795bd635b4d557 WHIRLPOOL 3065b7dc21325b069ebb500217dfce021c2eafdc156f0328f64e9d2b76b74c003b7dfef22bd19015aa9c0275b350babcef427a9dc77bd2bc9e107c29f2cb8c31
+EBUILD openrc-0.32.1.ebuild 10163 SHA256 5d6e26e91a49195bcd9b8d03a91dc36a3e5dba51ae1b7a7a8cef996beaa01d7f SHA512 397f27315e03e61ad462cc985faca1a1074f40015f2c4fd99837b9b953dbb84c2260496c2b31e87924aed0dc20bf0b6f90f776aa6fc0e4275eb0450909a5ff8b WHIRLPOOL ba108da257792cf69d3028067c4b3523e015fa39e04d58d9ab980f3bc445db141473de75792e4e3c0c1fd9a2600beba7275c4a9b9a11ad0b276a13e47cffbc8a
 EBUILD openrc-0.32.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.33.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-9999.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.32.1.ebuild
index d8265064e7d2..5526180efe6f 100644
--- a/sys-apps/openrc/openrc-0.32.1.ebuild
+++ b/sys-apps/openrc/openrc-0.32.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index c3043a4c1f4b..8275f66fe84e 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -19,7 +19,6 @@ DIST memmap-0.5.2.crate 14465 SHA256 46f3c7359028b31999287dae4e5047ddfe90a23b7dc
 DIST num_cpus-1.6.2.crate 8442 SHA256 aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584 SHA512 6136c6cd3e4a9c0f165f037e3e6af6502a3ffcdd0cc2d38635902f243124e5c6ccbd4db8e0bcb624e2ef824284145c0dd31c1cd5f708478334bc91f842c6050e WHIRLPOOL 9d32f8b35d52028ed36a56968875cadcace904c133a9c8e43ec7ab6a8525ef5fca23c6fbbe28387bf3981488b0d1e095a2a7a49c504736bafe8981b2bb3dc84a
 DIST regex-0.2.2.crate 193403 SHA256 1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3 WHIRLPOOL dafb61f75a55f02dd790201156f6dbf042eadf3b54c7e71732653e3dc8db4552f43d281d96a1bf196e7336b638cc97b5d24bb43f6223caf312cb7b0351be827e
 DIST regex-syntax-0.4.1.crate 121453 SHA256 ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f WHIRLPOOL 841c41fe9ba5fdc733d93944252c4e7d07b448435bf620baefc8db28a9e3891e97f619361cb1c80adc00be5be8721bebe36b85881b68035040ab870a23615b62
-DIST ripgrep-0.5.2.tar.xz 48910752 SHA256 e0fadefc1718d967ac15ccc22131255606cddf969b700ccc243c1f973be81d90 SHA512 d8bc86e12be80568de4565c911a03b0c3a15577b22dfa2f1fd9b44f4e77354da1e80852247b9955e225fd13a540acbb3ca7b5a00d686bfa65fdf3f5f329dfcd5 WHIRLPOOL c33a828471a925da2be2f6b3730c28146182ff79b2a75e4f193a0c94f540256cb1670d5cc79470a39d0b898e8c55e20fabe5fdec1c42124339001ad7b437d02c
 DIST ripgrep-0.6.0.tar.gz 470996 SHA256 102aff26fae9f455a8bcc435759d488f4944a34bee4b22b852f1cac3245b1b5e SHA512 219ec95598c080ddeee65233d1abf58320662ef28681a25cdf9fb63fd38bdb149c75471625545188dcd1deedf05fd58fc32e25cf39fd63943f765c57394ede23 WHIRLPOOL 0100649443d80973f102f23af115b4404756de8838eb4daad71a6ad32ff5242f8c2bfda359acc0818e5dd8394fd3409ac38653b21b15384bbb7d5f751c97703a
 DIST same-file-0.1.3.crate 7078 SHA256 d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c WHIRLPOOL efd0b9caf419b8436d54895deca5ee3d7a5191a006051b975d65c0e3d8aea32f3ee866f4481d6a2a8d4ce9b5af7de4b11a295990dd1ca7a9889a255bff345525
 DIST simd-0.1.1.crate 39577 SHA256 63b5847c2d766ca7ce7227672850955802fabd779ba616aeabead4c2c3877023 SHA512 ed58383bbee3d0a5bc537629cdb242d5ae8ff46d4e8911df16e34a9fe9da693f1347b89f77614d1835391f57c27176824c46feb9733de89915ed4709217466f2 WHIRLPOOL 2177fdbfb33203350e55258cf94ddd0861314e720d43147039db5b7fcb3028caeeef71a4759ba8aef59c5b3cb72cfeb05f806be3e9c6ecd36f07ec42a43e513d
@@ -37,7 +36,6 @@ DIST void-1.0.2.crate 2356 SHA256 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547
 DIST walkdir-1.0.7.crate 17883 SHA256 bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3 WHIRLPOOL 6cb9a8ea4803cc7d4bdae8294d44faf53a99f02526ba41cc80ac4cc189308ddc34fd7fbce996039b236c1bb8984e9876e06c478c12f2c0458f1919be7400153c
 DIST winapi-0.2.8.crate 455145 SHA256 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe WHIRLPOOL 3dce71a6927320e3882ba60a24630a9ba8d123b73d8da6b9330e422580af9d9b0a96748d7368767e3712185877ddec6978b924d40428341c4de19b76ed375af4
 DIST winapi-build-0.1.1.crate 669 SHA256 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 WHIRLPOOL 036080513776fe806cc9dd68bbf5b797776b98ca9fdceaa4bd77c87c66d2e5bd0eec8b0e7f0100dab8f2ced754da058f67e651002c786b4992c2be416a5d52ff
-EBUILD ripgrep-0.5.2.ebuild 896 SHA256 9aecaa1db07ed81e0214df0a27cabde014ea1bb850de62f66e30594f28823991 SHA512 324534cbe4567dbb79c22cbf55ae1d6b064ef980040b749b808579956849e829ac1afdfd5e0c1949c19fa840386a7adc752e2308cb7943bcaf7d74371af6d0cb WHIRLPOOL 2a46991e5e81d2c7721c0371c1c4c61ac4de431ef2ac9871663f104d5d29da0a293e632b6fa7262e4f52974e5d03b8296140fc617575fdc6b04d6b6453212907
 EBUILD ripgrep-0.6.0-r1.ebuild 1244 SHA256 e41516304780a342e06e5d5e4f876d893abc8a90f57725f7a1e9d195978e8f39 SHA512 1cf77e3b841efa4e00b522e4bb8daa02d490393d17c4d34b4a64ea3ae58804d9020d8cd7e5f272501ee2296d17d483dc8cf45fc4b9ffbc10cc6fa598b77064ba WHIRLPOOL bb97f8605cd9c529fca7f9d384e9059f63a3af66790b193abb0b4a733224ac4eadba0852a5d4d6e67b0af83558dc2cb9d6a9f70324628892468d87fb05af169b
 MISC ChangeLog 1216 SHA256 3d967bc66c95e23bf577cfabe17dbc4783cdbbeb1f8a4aefdb1c1d1ad8626cac SHA512 8767c09bb2cfd50f755b98b4a86cca864bcd9d99b2516995456141f20a755bd69ac4c9d3c0e2383232fd00b621d9303cbc0d84e4f8a1d878a43cce8d236bb1a4 WHIRLPOOL ec18b3e66ce8c8ce7a004b6ee568d7be178fd5d5bbc547d76d9b4fb345c164176d293f18702c1037cbba41077018d73bc695a8cd50c64a6992077f8889bd3f34
 MISC metadata.xml 339 SHA256 2bf4aa2d3198a58a12a261b549da995a74f5e765b19ced77c275923dc17125cd SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef WHIRLPOOL 8324e194fb3165cee2231ad3b3198d92e21f59506777cd87ad6cabe93150b33d76c49b41f23feb611c430fc34ca42f5379936675004dd57251d9a63a4406087f
diff --git a/sys-apps/ripgrep/ripgrep-0.5.2.ebuild b/sys-apps/ripgrep/ripgrep-0.5.2.ebuild
deleted file mode 100644
index ffb5e3686d04..000000000000
--- a/sys-apps/ripgrep/ripgrep-0.5.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
-HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-#SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# custom tarball bundling all deps and index, otherwise cargo fetches from the network
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
-
-LICENSE="|| ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-util/cargo
-	>=dev-lang/rust-1.11
-"
-
-src_prepare() {
-	default
-
-	# move cache dir where cargo expects it
-	mv .cargo "${HOME}" || die
-}
-
-src_compile() {
-	cargo build --release --verbose || die
-}
-
-src_test() {
-	cargo test || die "tests failed"
-}
-
-src_install() {
-	dobin target/release/rg
-	doman doc/rg.1
-	dodoc CHANGELOG.md README.md
-}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 6358e33bfb37..6f6d9cb45ae9 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,7 +6,7 @@ AUX sandbox-2.11-symlinkat-renameat.patch 3418 SHA256 74036803fd8cc07e903abdc220
 DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192
 DIST sandbox-2.12.tar.xz 424252 SHA256 265a490a8c528237c55ad26dfd7f62336fa5727c82358fc9cfbaa2e52c47fc50 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9 WHIRLPOOL 4f3089746a11616c60057165f387122b74e8d2f30a2d77db296405a2b6f401fc625645bca73092436162f5d98a88bfb2a3b42909b0eceb9a59ab810d803441b0
 EBUILD sandbox-2.10-r3.ebuild 2168 SHA256 a76055435a8059b56c6079481c021cbaa9f42efc321d4e67069c6397e23c35d5 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc WHIRLPOOL 12709e670cb48f463352ff3f6756f3f5193f21ac138b39d27171d97fe11950170c8c664d48c6e25e6187476d932652275f8656d596607d81c4b01f479fb21912
-EBUILD sandbox-2.10-r4.ebuild 2246 SHA256 00e5cf8df08afc9c615b85c67c4ac2b11ad0d8b62a666888a785eb3c3058599c SHA512 c4ac416e2853d97971b4fbf399e1975ba4330316acab944f46ab1d94350ee59a7e21a021f9703e3640f968de1e737ffa037a95b1f8cb6c70a2f326803c5dc7e2 WHIRLPOOL 991c1c502cfea04d4b30e9b91b4822c2380700a21f72b8fda1ec04167a7f44ecc98d152db7f5104a4dfe5fa84d686998f784d257d6bf36f6b32e86b5a565e9b0
+EBUILD sandbox-2.10-r4.ebuild 2244 SHA256 2f7f43a1b62720340285ea1c6610411d5e3eaff35fdb0e6058ab30c345e8926c SHA512 82badd56d8cf1c4a7c5672bdd051bd787193f3fddf6caf92cb2b3c4a9a327cb424ba7b67ceb3f5992844d1e1ba84806dcf6983bbc0caadb0b789c89543875f34 WHIRLPOOL 1ca230c586d3675f720a7f3e1caab927108950e735354214d43741c4b1211756f8fc1746edd66a24ee6071b87543caa699643415ed1417e0a6be65da36de12c8
 EBUILD sandbox-2.12.ebuild 1950 SHA256 51a702c9e6232003be3c10345e1be943b057211eeb4f6f07fd27b9edef866b22 SHA512 f0d3e1707225171c280902e612a5109ed78703d4bcd658a827c61e48ffbbb71c3ed86d2a2ae00289d07e46b264b10fbf48a962cf8e35c4709046c9263a473da0 WHIRLPOOL 968d03aafb5a859dfd0a2720dab7db20ce4e6d055adde0dd744021047e979464a2fb48a262dadb1e99ce799cf07204086dffce32764d173b731c7280df7023aa
 MISC ChangeLog 6831 SHA256 eb110ced56d7e173fa1fabd434fdec445259453c13ccb48a554947f9b5b359b6 SHA512 879732fd45e678aa041c18148f44db585bf077ed6ad237725dffd16be0cf4abc37ecf1aa683864b89a547e835927e6a05f0b6c24aec3f034d9a8d671d39cf3bf WHIRLPOOL a9786489a8235518c08350ad190563b8a782de07221cdf44a54bced7f7b4df51867a7a2ee6f0bfa015c514cac07f75d36bdb6d17e3942ab4ec1a5b1a55cf4093
 MISC ChangeLog-2015 25325 SHA256 9e1e3512cb2dceb07f7f480661aa00528d23e41765893244a6dae27bf039f0f6 SHA512 6c714a72b2d1848381543031478dca397fd8150a8ac82febdf4017a339ebdc0dfca8adac95aef4682311e2ada9742aaf9b86d49c9bb6768ca9c802af00744a53 WHIRLPOOL ebffa03ba18522039481fcdf1bfccc2ab5936e0fd4e0d081ae56eca0c784a8e250850855635e7a20025cb38e99e8f7dd80e448bf9e1ba70e6b8295f9aa502312
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
index 999ac487c75b..174ab5a3403d 100644
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 94620e46e930..0388abbbbcd3 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -9,7 +9,7 @@ AUX shadow-4.4-su-snprintf.patch 849 SHA256 6a9c8f35de35a5cfd72b2983a58619b189e7
 DIST shadow-4.4.tar.gz 3706812 SHA256 2398fe436e548786c17ec387b4c41f5339f72ec9ee2f3f7a6e0cc2cb240bb482 SHA512 c1e0f65a4fbd0f9d8de38e488b4a374cac5c476180e233269fc666988d9201c0dcc694605c5e54d54f81039c2e30c95b14c12f10adef749a45cc31f0b4b5d5a6 WHIRLPOOL a22fc0f90ec0623cbbcef253378a16ad605cf71345074880e3fd12fb5914058d3e721f378730c9684497cc597595b7defc7e710206268ae320a090c8c35fd41e
 DIST shadow-4.5.tar.gz 3804933 SHA256 ed2d53bd0e80cf32261e82b8d93684334e8809266dba1ec7a42bfa747605989e SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b WHIRLPOOL 73552aff621cf34ef977095a05d9b679b7b6ffa78979d69eeb43089564aca5cc1d841dc9cbb6f0fba4c4f712f0e89f6cc683b733ea1041e4633b5d9fe58b5499
 EBUILD shadow-4.4-r2.ebuild 5520 SHA256 6faffddd4a8a4d950d3d5e962d6b09a9ca178c0ad4312e2a5698ec9337992f62 SHA512 c6becedeaf7faf85960cd3e198dff4c0e60d13af6b27127110f146f049bac0fdf068b65ba472ff035c97afc18aa3e9f5d2cdf2f17869b76828329ba7f481a51b WHIRLPOOL 6b0295f648bab88918ddebf10fd187a73790f42a9d1f152bb4f8595bdd28ba02c4ff36d28c81460f69e41d972d610147bf582d43234afa454b929d5e8a224a47
-EBUILD shadow-4.5.ebuild 5363 SHA256 ce3015885fd40e388d534a75af4442a5904251f7ce941ce871237fb132534ec8 SHA512 4f24d90b0e0e796915d3a0b6c4c100d2fb3d186e269bc64b973281d9e5f4071dfe0b22a9a9b38f07fb85f2153b01ce35174bb1dc46f9a2ea453bbbc172d8a936 WHIRLPOOL dffb76d9dfc424de739d23b4a8da3c5e1a22cbe4aaa3922969e49d45a07eaf5af4e0339c32095081daa7ae0b61d886a9d99783a2c0eda714e032df868be63dd0
+EBUILD shadow-4.5.ebuild 5362 SHA256 72e56608ca3ba13ebfa97e58bad8c806541f41cdbea3d24d869420086c795fd7 SHA512 85fba6dd27209a31fc9b8b655f3d60f2998cd43cdabdc80f116ce9272fe2a88712e15edbd5b588bc0c55e384c5b60c3f0175d9d1b7e2181af5be375fc71141e9 WHIRLPOOL 65b32a5b2be762d1f817436b09c29c079b372f581eb59c96627dd0a9e343b9bbc0f986ff291109cf27c73a72a171d87b96a9e201d1b888c25b62c735488c5b47
 MISC ChangeLog 4723 SHA256 b09aaf93b341c840a85e4f81ed72b1ab7f421d1ff4e6e55410f79cbcd8060b15 SHA512 366b0aa5ff325929c4a8d9523e82e4eeda9dc0ed4e1dcfed123c08a9c632a7d79b50baee39c2c5a26325d7764295a03438d990b2b28f1dc3252ff4850fe97bb4 WHIRLPOOL 513e5c3afa9f5fe3036a35639b8cf926f42627101836ee201afcd4c9c8c463b71f387197e53112184511e057739ce6b43942a87a71cb49e77affe282e5364526
 MISC ChangeLog-2015 51089 SHA256 bbd5750c5403da96d5875738418b68a3884025a85391885fced1d202f97187ee SHA512 8741d75131d25e4524c7a243338e26e614ce81411c0c58725028717c16ace08ec3aa665b8af3eaa4a6f94a23debfed07524bda6d2e2652a05bc290c30322b9ab WHIRLPOOL eb08c4506cbab719018752c00167a531cc6ca5075965921466906cfc3db75dd69276e06115a5893cb7a22f099a563a86b295ccac7e410af037c968ea53c1620a
 MISC metadata.xml 565 SHA256 22160798da478d70befbd4da3ef283bc66ad650168d2cf8947a4aa9935748dc0 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469 WHIRLPOOL 2194536e374b86cd2e2b078e076f2ce6b3758794ac8812a9db2a189d88013c35f142bc34e0ef4320b04f3b253632c317a8f8c2a901e965c0a85e9ba5bb5a32d9
diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
index 343a1aa381d0..4585a26e1b85 100644
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ b/sys-apps/shadow/shadow-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="acl audit cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index cae06215d756..94a6cdbd110d 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -3,7 +3,7 @@ AUX rtkit-0.11-gettime.patch 744 SHA256 8e7f796228f334544544bf0bbd5db6095682a377
 AUX rtkit-0.11-polkit.patch 2074 SHA256 80f33894e4eb2130460d7160f1a309c3497a235a3ec6f9e5d088b00cb1667b11 SHA512 cc4cb9879235398f828c16951e380e0456c9e5bbd5acc2a0968153c5ce361fd1aceeeeac8ab873c21c0556c5d4677cdad8ed9e23dd3b9b5a8a73cf9264ee5a4b WHIRLPOOL 1a5170423876ccc178c99a959212a5a352d7fa92bae0c1e3e9f6bae6f5603cc6c6013bba681eb7d09fc1d825aea550417706cacef6499c9caac21c15e128caff
 DIST rtkit-0.11.tar.xz 126748 SHA256 68859108cff6410901502b58365eb7607da37110a06b837762f771735f58acd0 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22 WHIRLPOOL 7036f2811aeef28dd7680f24fcf16e2cf8708937d86a0dfcd1411fcae469be3fe673b12dc640f9cda9be951ab2879f2b7ec2374577e7a0b532c59d8abde176b5
 EBUILD rtkit-0.11-r1.ebuild 950 SHA256 82eef9922d29e0ff309bd88b1d8d368e4d8bb9b59397629e4bd4237608e21687 SHA512 7ea241a9f99d42c0af9873b1c6549f9ac7f90076944f93734974d1c39dc9c1e96c09e70b8a1c1f3739352fefe4800ca626ac45cf7e8cf7f6d0bfe302ccdcbc0a WHIRLPOOL 7b4e294de64e5b40555d487f7e56afbd2eaa73e8192c0a2431f9bf2dd4b8a992df4c1af1d75c5dab8ef9d0122a6aa00b27a229e0be9cba4f3574f0cbb3942faa
-EBUILD rtkit-0.11-r2.ebuild 1346 SHA256 718b86538687a11904f51afcee5f1a3126fb788407ab496d9fa2294610fed2d4 SHA512 e4d59e83254681f0813a8975d85267ae8c0dc33ccc22f7ab7f018a21fe935acc94658559aaba4fa6e2dbc65b8d072024158a7666bd02773f2e8746515b7ae424 WHIRLPOOL ef58dadb81a4eea89f6702f006496f6d0237977a3ad54ef9f06e3594f8d90743a3519c723510a9d60d0d953217d2f72be654101c4d481a93326359ffad2fd2a1
+EBUILD rtkit-0.11-r2.ebuild 1344 SHA256 19a6b31d4042b7c3f5caa61e643055cbe12045cc059a126df2d8c6651d4f7bd5 SHA512 54e22580bbd1a7065be84f73829a77a4adb9e222e3928443ec7612807ff129b24555cd181eee5d50671d0aa41054f9afdf701883cc869ab13a632a0fca7777b5 WHIRLPOOL 7c954c4f1bb6d086c4332b5e917728665613d606ac7a2aeb9edd196e027ec0070d0d053aa30cdec5a111f6994dc25128ab17c6e551bd5514db236371c6c0997d
 MISC ChangeLog 4717 SHA256 827d03d004de1624a763e4acc1f777533a0a7354ab2e2af7449a857e5968556a SHA512 a5681594df5dcf6b87d7154c46830e823ad13deb49f4ff455df0fdb1b630eb237742f30dbe4536412545df64e3121b46ed35812f7856ea16ad2928e6805e8754 WHIRLPOOL 68ebdb11dde75b2e8d76a40eaa9d942d52ab7f7b15188a130ec1fb79ada0e300abee9385ab4ff1da3624463f96fa3e109adc600afeb7735447cb15efbdb0cd16
 MISC ChangeLog-2015 5449 SHA256 5bc415edbbb8a18930c939863de6212af6410d2df0041b931897369774c1e514 SHA512 2a6d476e1ad14b8681bf4ff7f997dfc4f934d07e28f8032705d5960325094dce09fea18b3bbc6566ebca7edb90bcbd19f03bc1daf938a3784dd5217d1b7a2099 WHIRLPOOL bab1e798b7b5ddce4e1d1562234130753168f29041ef627d366d70187935497e708bc1623571e6bce23304b1f987aa8607170a340b497c55c93846cf8c45c6d5
 MISC metadata.xml 455 SHA256 e9eb467895d6dd0a3d58f484f78acac159067e422beaea2304e381bd130a952a SHA512 90bde656e242fe6cd7b408671f419ee54f73a781b67ee9047c8cd06d7fb29fee2882aed7ab95b42f22fdb65570f389e04931f8fa24506307b1bc8387c213850e WHIRLPOOL abb79c949c97c96c63c27f835574cbdb166ca14b8e4cd321e6bd8cd50e1ee7962837f5509783b4bd0b7435824b78c17a17e893fbb42329fa81aee07ea98c2903
diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
index 14157fe384cb..3558c4d3271f 100644
--- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-auth/thinkfinger/Manifest b/sys-auth/thinkfinger/Manifest
index 2de44b1a3fe3..ebe996728905 100644
--- a/sys-auth/thinkfinger/Manifest
+++ b/sys-auth/thinkfinger/Manifest
@@ -8,4 +8,4 @@ DIST thinkfinger-0.3.tar.gz 372053 SHA256 9741ae205aadc9f576be73c382596266300e70
 EBUILD thinkfinger-0.3-r3.ebuild 2032 SHA256 b56de65fa1c9737cf5f701f215d3e1eba3cf8fb87fa395471e1d2e5b24fdb3df SHA512 db039efeecf66ac460f5f4903196b4853dfa1df168da5d6ced830a0a4b8173aa076bc22027a64de490cd161b46a40b3631f32d20665a18ca5429f98e709d3a2e WHIRLPOOL 59561424899c669465daaa48e32c78d60eb58b35975b28246dde5b0513abaeabbc8b1a2d6bcb9f5dd24e1f86ce1da53e706346be25aceaddcd70ffe41bd1b120
 MISC ChangeLog 3044 SHA256 946de3d6a482d8e7a40ffdff5c16f80161bfd326d83ac64291726bfdd11595da SHA512 c2db8493340f9e7a3ef682e2059a41bb7d4cf042c04136f31d077131b94225f11de3fda133935a3b5b712244c24bad62f909546b093660f9d169c32c3398200a WHIRLPOOL 5d0014da33e60d7be95f084f965f911f5f5d7d5922111c387d952e96acc93c9ba3254a0b33cf96cc55b14406fabac168266c4867b102c816c5236fbac7cbcc3a
 MISC ChangeLog-2015 3889 SHA256 8deae1ef9a6ef4989e4b19d04fef8041ca5486f064fe5b59bd524fe3b9296b75 SHA512 8b4c2be89661ddd1964696981df56d29cfccea77422e6a06b08c949fbd2f5ce0496eee79dcecc768447c8b3faf30423e55671b5c4ece6dbd5c9cc60040db3da5 WHIRLPOOL 0ebf08dfdb069394190ed5ba7fef16d0769bbaf0048ffb3ecc1c0513ac6b0b6f7af8bfdabd3b1174f096482d91641a23bcb031afda08ffd3196333843652fca1
-MISC metadata.xml 600 SHA256 4c3c65b70389dcb8d2a5ff56885ee95b907d0047aba44bd00e251f0612b4be85 SHA512 612c8cf26597a4ad78644d20f3feed7ff7f1770c3a62650669892551ceed8e97d0cf2db432ca127e3986c6b6c614070f3b94ce76a6d00360e29d2bbbf6d3deeb WHIRLPOOL 1c5ef62c470c3a145e8003e1ca9b8a431a174d9bb574ac29e44f369f8339b1457cdbc023e2d9210e7534c8bd0e952ba0c85655a087632b905f50aa92e3a716f7
+MISC metadata.xml 362 SHA256 1e140c60b6511ac06ec865b49a87f3275b1cc4d1b77a5d89990f823ed5501ded SHA512 14e0c9aa290bc41f61c7b9e12539ff56f80141884969ff08e63bf96d4baeed4bc726469f6969085fb124df0626532a4b8cb7fe52646db4fd89f627cfdc102d7f WHIRLPOOL 81787d30efb64f5652322d156a75d1486e4f85a6e9f3434c761a92bd031a2c92ecb1dad3d3af975d05302b202e1dbb3151b9343db50cd63dacf10f8b52f8d12c
diff --git a/sys-auth/thinkfinger/metadata.xml b/sys-auth/thinkfinger/metadata.xml
index b61739fdd921..eff251247431 100644
--- a/sys-auth/thinkfinger/metadata.xml
+++ b/sys-auth/thinkfinger/metadata.xml
@@ -2,18 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>victor.quicksilver@gmail.com</email>
-	<name>Víctor Enríquez Miguel</name>
-</maintainer>
-<maintainer type="person">
 	<email>xmw@gentoo.org</email>
 	<name>Michael Weber</name>
 	<description>Proxy Maintainer</description>
 </maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
 <upstream>
 	<remote-id type="sourceforge">ThinkFinger</remote-id>
 </upstream>
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index f44c31fa0763..2537bf77cc28 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,5 +1,5 @@
 AUX kube-proxy.confd 53 SHA256 a64f7683e165325c7ea27d75f1072a9aab33f3bb6dbd3cde10c62e0e39cc4876 SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018 WHIRLPOOL 06b0c1feb540972544331c2b34325b78dc70fa25ae89a131581fa796eecb3f5a84c3825f875558f34aabeff161e1936701b922c5e3f74e104f590117c8a1a809
-AUX kube-proxy.initd 528 SHA256 d33e0bc015b9212f6105070880d5b87d272b3b0225433b3d365ab831e6ded38e SHA512 74dbbc24d811c2251c180cbf17beeb072f315a931e0643e668e6f804389d087661cc0c6e7be371329021b3ff9a47e67696b276481bad10801896d1d4897a16c1 WHIRLPOOL c054cff28b25b6bbaf72d4d92b62992f847098be79d1920312a39e65b446d3d9d2634408d84289507b6642e428b042dffe7fc22ac59d6ebd6549a4303510fe6f
+AUX kube-proxy.initd 507 SHA256 b8da03e55d7ab6265a202c664b8a128f173caa146335179d5ee25cb1f58a9898 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364 WHIRLPOOL 915c7538815aadcd24e71fb664e51c00243d021c3d7769d147d5ae0c026ff8e957109219cdf7ab1f6eb5606da8ab4e0773405fe20962bbffd3dfbb6f02f6fff1
 AUX kube-proxy.logrotated 80 SHA256 c9a2cd891aaa1a4193d8244ffd857400e2bc258d6b43fb4796c0787f3a06fcba SHA512 866e25b63e955ca4855ed6bff2d98225b82e313155a6f24ba39c3063bf0d66a2ed87be4f940a0a562d5bdb73cd90daf11b9b4748a880e64db4ec5092689fcbe4 WHIRLPOOL 13e918604291bb3378105e59d6e27108e6b3bc9df0ec314be5ff9f117e81267585257c0a8b80d8bcf1b840d9ac3827f015c4ff6698f5d49b70452c3588d09355
 DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
 DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
diff --git a/sys-cluster/kube-proxy/files/kube-proxy.initd b/sys-cluster/kube-proxy/files/kube-proxy.initd
index 10d51f8785f4..18a75adf0b64 100644
--- a/sys-cluster/kube-proxy/files/kube-proxy.initd
+++ b/sys-cluster/kube-proxy/files/kube-proxy.initd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 description="Kubernetes Proxy service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
 user=${user:-root}
 group=${group:-root}
 
@@ -15,6 +15,5 @@ start_stop_daemon_args="--user ${user} --group ${group} \
 	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
 
 depend() {
-	need net
 	after net
 }
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 3ba80e7fdb04..2bed27609ea9 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,5 +1,5 @@
 AUX kubelet.confd 58 SHA256 c1476a6d4af6a40296c990ad46bd5793d9b52c8b12c0c7764ee177962022938e SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e WHIRLPOOL 95d2f220e8afbe315e146ee76cab3df06d63662894c59d4b03fed887ed99c17e71baf7bdf3493d4e904cbcfa10cf7848c6761184112714fc423d611a8e5d81b2
-AUX kubelet.initd 532 SHA256 7b46dcff102ea5a01bcb01da06578a392d91e44266fb038e780ec20a3bdf5e5d SHA512 6f8268eb8626d2e5d884e8a714861abebc92f1e7ebc9d50ab6d122fdec4e88aa672a3df900c3ce1deac36ba9991c914d7564adc0ef0e965b5975a86d51874962 WHIRLPOOL af49f279f6b8540147e0ffc76083e36971c3e833e1393f656a466e6b055de63e6070e2dac9005c76d286ccc5250957c06ce3f55a1fafb854e3f2094cca2c869d
+AUX kubelet.initd 520 SHA256 76dda0fed830ea6a0dac72d91252a9c82575281984b8049e4760e2f27dd4f4af SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0 WHIRLPOOL ff5c283443b303485b58647666577dc627f81eb11b4ed1f03a44bc8381be78777f24a4ae4f4fac33f32e476bea7c5fea7f70f044cdb1f277ff64656878c260e8
 AUX kubelet.logrotated 80 SHA256 80eb18515e5c7f12d2bcbe907ef6fc218f3c83274c18f22535bf59feaa8003a8 SHA512 c51f65a691fdd280798610cb04f9a48766045952687917828dd9c554f626a2303220ecd717a5d6be8f838422720a69a7c5e11576245a2e7dd75311a975a8d72e WHIRLPOOL 01e7acf5a8f5b3fde6ccd5633ca0eb0c612a2918cf98cc9cf191d87df908dd0d4b966c363cb9aba7f49891aee14ec5b6a616a06b07d81a55745293aeb1665312
 DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
 DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
diff --git a/sys-cluster/kubelet/files/kubelet.initd b/sys-cluster/kubelet/files/kubelet.initd
index 2f6b4eaf5df5..363f635b5863 100644
--- a/sys-cluster/kubelet/files/kubelet.initd
+++ b/sys-cluster/kubelet/files/kubelet.initd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 description="Kubelet, a Kubernetes node agent"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
 user=${user:-root}
 group=${group:-root}
 
@@ -11,10 +11,9 @@ command="/usr/bin/kubelet"
 command_args="${command_args}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/kubelet/${SVCNAME}.log \
-	--stderr /var/log/kubelet/${SVCNAME}.log"
+	--stdout /var/log/kubelet/${RC_SVCNAME}.log \
+	--stderr /var/log/kubelet/${RC_SVCNAME}.log"
 
 depend() {
-	need net
 	after net
 }
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index b5d71c74980f..698ff48abda5 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -9,7 +9,7 @@ DIST Pacemaker-1.1.14.tar.gz 4729808 SHA256 2f73043a5de5e66a47462d37cd68c4c6861f
 DIST Pacemaker-1.1.16.tar.gz 4897772 SHA256 dffcae035975669a66ab545d45216a637496a251ee2114fa03d58acfcc969202 SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534 WHIRLPOOL 8beb0188968743d6415c7158790582f01192a643a13246e61cafd6eb8e0d22cd2565dd31e5cfcda04b3aa3e9c749b4c1f0c44bd9419c3fffcc815909e836a92f
 EBUILD pacemaker-1.1.12-r2.ebuild 2357 SHA256 a410522c772ca704ef6394ab90ae023c0d1c0667d85ec02d48075a52ce76f761 SHA512 2d1eceed9491e95b2e87b37056ea8b63c1a0fc491ed88a91d4e80a0c79144714392887547f5491ec2c43c9eed272a217fc847097bd5e4dbc6517f8d5b34924f4 WHIRLPOOL 53c34f179b7c6b91b8774115c849606d4618b5b2856b5f6e143c573f6ad30c8029fd1344556791218864e37263d76824f10421139a04b981a7d6617cf2c05a71
 EBUILD pacemaker-1.1.14.ebuild 2197 SHA256 ca8c48d1db3e32fd6cf957af2f96b2d67ac364102cd584b4c177007f3f441c44 SHA512 e39e2084d9a409df027cf3fa9f506e8b5076ac93c6217219d29e19d1b69585ce42094e4873ed8249366abb1b330dd13565a1b0363f5993946fa197ca908ff13c WHIRLPOOL 8a9098b8e876b97678a8b27f4db328e1d0a4aeacff85d8b272be4cf0289388849a6482536ced08259580318cf753b80495916e67f16d026f9a246b031d6f4b0b
-EBUILD pacemaker-1.1.16.ebuild 1801 SHA256 8a5fe2a0c9578a03bf10860155e72ff02db8bac532c27d9ad9f4af375620cbbf SHA512 c01c388c60cbd0be7bef5b7df979994fc57cf0ed2ab4b047c6ab64fcc794d8e62b6778871206fc6d2cfbaf191cc75e6aea5c5458ac2442b2d60f92fe2b7d9b53 WHIRLPOOL a3e0bae2bdb0ac005018795aed526aaae9fae388fc035e6ad5deb1bd3edbdfe3e99ab565870675b127d32fdf54a1bf68269712b477d13425da867c238c8cf194
+EBUILD pacemaker-1.1.16.ebuild 1800 SHA256 a5f259c80c2f7ad6fa2d5f4b52906dcca6e19124cfe14da907d15ec55744482d SHA512 549a2dc99b5d0df356c55bbd873cf96f3643e7b64984b3fa4687f0cafd5345cd57ce69ae5932a78687bbfa9b4bb861e032d311c0a5461397752dc78eb21e71bb WHIRLPOOL e20fdd7df99b43b9347b401cde407113cbd7186e90d7c5dcd2baa5fb0a96a16550ce554d8bf2fd08ea9ee1e21adff7d664ad5318500f26378d79455d227b3f9c
 MISC ChangeLog 3264 SHA256 a9e5b5eb2db190c0d44147947d421342c0c34556cab75432f251e31b6fef8855 SHA512 ce1c6977a6f90f1b56364c468533b91ff101bc0b9ad86fed50ebd77c5d2f61a079507e0c477863095b547aa73641ae245bea553f593f7fe1714f8e4e8bed4262 WHIRLPOOL a77f6cfd51b825f16743a77dc76336734b03089ad5b5d806956816b0d7ea3f71ef3e6aa4275f3d47eb5b6cd34fcb532a3f4d0ea5a215773e5b6d5dfecfebaa2f
 MISC ChangeLog-2015 8024 SHA256 7c53f5f74ec8cf5d30d97a1a5ea752524b0b5cdf2a6a48de3fb5382412f23750 SHA512 fe69e97802784a74be5cd102b18ab6e1fac13927a2529e58d5a4035740cef11b8cee857b9fff708aeda614633c73fc903308561db08bbe9f1bde739d358ea0ca WHIRLPOOL 9ab3163a8c0565d19e7854fa3d6454c0955d9076fcbab745555a49fad215b7d57fb99f5c1ce8bbf0b6f086e10cced069f377b7fd5d3ae257af2a892b5a0b4005
 MISC metadata.xml 983 SHA256 181db433b3073e72221ac0b08fa2ea4df98f4de896ac190080daf7752c808fa6 SHA512 0e0f2363d68a4bfb4918b0ca59eca6377c30f6a56a80eb9b12f14a13f59b2a52c3a74ae2152b9866a82b451c75bf14e6040d650733373237c3e9fcc68b38f157 WHIRLPOOL 022877eb7bb335f3215d2b953d6e6ca508b8b4e2644fba29effc4be090a280ccee37d386ed30270b9491b17f21a933b44f4560df1bc4e2795d6a9d5a1b3da1a9
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index 300cc72025e1..a1744825da24 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 REQUIRED_USE="cman? ( !heartbeat )"
 IUSE="acl cman heartbeat smtp snmp static-libs"
 
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index eebc366d5818..3b42af2d6f78 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -5,7 +5,7 @@ DIST autogen-5.18.12.tar.xz 1018412 SHA256 be3ba62e883185b6ee8475edae97d7197d701
 DIST autogen-5.18.4.tar.xz 1017936 SHA256 7fbaff0c25035aee5b96913de2c83d9a5cc973b8dc08d6b7489ecbcfd72eb84b SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6 WHIRLPOOL 109cb5637558f8e16cbb9afcb629a9bbd3d5ceae6b897a00101fce99b1a39b06ecc497d9b43441e40b58981dd2402027e89ce6ae76da73b73db934c64bca2b63
 EBUILD autogen-5.18.10.ebuild 1155 SHA256 4a08964e580574b6b92f9d8b306361163ae413f54943a249f6a3da52ae8d19c1 SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa WHIRLPOOL d906ea64b6f01071711b045ca00ce71adb9b95d41c9b2c38f87f04d51be48a8ae9ec58fb3fbe575ec57f905e2ff4e4c671c07385ddd4ac90ba5bcce39c152898
 EBUILD autogen-5.18.12.ebuild 1155 SHA256 4a08964e580574b6b92f9d8b306361163ae413f54943a249f6a3da52ae8d19c1 SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa WHIRLPOOL d906ea64b6f01071711b045ca00ce71adb9b95d41c9b2c38f87f04d51be48a8ae9ec58fb3fbe575ec57f905e2ff4e4c671c07385ddd4ac90ba5bcce39c152898
-EBUILD autogen-5.18.4-r1.ebuild 1009 SHA256 62b3609c34610dd3037131503697bfd79d57b20c9b96c738659bd62afc5b6a3b SHA512 3c0ab7ef30de1e838f5a6c8658d14ddc86e96832606c5f206f1b4a9bba5dd65b63d0e6eb6d2aeb98e1b1f281b108553714e437337b90fcaac638bf914095e3c2 WHIRLPOOL c01d0339cf989730f30192f8d4bd0ad40f3fc8ed3cd995faec7c364b6d8b3843ac68a96c28bbe3c1b9fe6680fdc3926ea69d12fb09319eb4418391ed1761a97d
+EBUILD autogen-5.18.4-r1.ebuild 1008 SHA256 57775a93b5369946e348d6177a6d993f9f04d8bf77e9957d2c4d1ed5f2332f40 SHA512 d2525d55688addd145d7b7d6033139c716047fd2c19ea9e9c0b7ff20a3b06d69a1ffab660f1c952fc74e46abc78cec11e2c625b3af3cb4c2c550a5e981e261ce WHIRLPOOL 707af1e5705f1e482ec3660f16db6a0ff02534bb37834ee8533cbda028c2611671d529fd3b41de69617aa79230dbbf9ab444d98d94acb8e856a1e1b7eb3b1bd4
 EBUILD autogen-5.18.4.ebuild 988 SHA256 125667dd5f60611d45542c66efb441018f9d8b35ed42396752ed3c8e2c40db0b SHA512 703592e8e47e247aba37a140e015d25a46bd3c9d1b1cf4ad1ac49782e39b35b7a376cd27437d8f6969056d879630e0fb55d1e35fabddaa4730820ef549cf936b WHIRLPOOL 7cde847ec269488a190d27a19e16d39f8088e685a964115e2d4bff973bf49d21b78477df8b70f8201eb425567d20f7a64e5f92b279ae91c9102fbc9a1c082663
 MISC ChangeLog 5924 SHA256 6cf9205c2718a40dd62291e018e83598b8a790e348d83b4712e4572797759e93 SHA512 a30ca95519c3ee89ffb2bf7747414a863413813087ec4f5023503d7ba9557f402bb5d109da2f70568fca2705e2f49eecec8a6108f88feef990f550a596b78c29 WHIRLPOOL b63df1b7675cb72778fa3e0a53ef7df8ac25adbbbd7c67e4e219fe3232fc492d23aab2b3e602585714103c86b5d3c156dd9b576a8da950c138e5e99d09840f73
 MISC ChangeLog-2015 13238 SHA256 62ffc05bf40267540954659a8e6d8ce6111a1fc65c13edcfbba23c01989a1b2e SHA512 7a649ee0b718eb91376fa0a9672a4c2d7681d4c4341fc1a2685c71e594105f8cefa3366006413b2214189049f2a7eabbfcefd20ac289bab03d27b6c4778771ed WHIRLPOOL 8f00451bb3e8b1fda71b6178eca2d5f2e963767624df0a650f904730f395e398542bb5667078fc6dc29cff7cdfc20b99a59fe2a37be0a65aa62a378b07bccca0
diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
index 3e0546e20d4a..b9f650ad7513 100644
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND="
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 0c85dca0affb..0e40c68da476 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -4,7 +4,7 @@ DIST crossdev-20160602.tar.xz 22292 SHA256 12dcbbdedc3f89a7b782c2b61c2956da050cf
 EBUILD crossdev-20151026-r1.ebuild 965 SHA256 68480dda88b0f5adf07f9ecf0669c0d1abf78dad60dad09b205933f1ca738aa5 SHA512 cd4084c2dcf43b410e35d4a99bc04b3fec726b3665834acb5dfd6403ec1cad86632a424fcac8afc72f98b3ab37f15e4de8ebb783c9dee81d4a472902a08b9da5 WHIRLPOOL 54d4a2d3fc80bd5d31d01729a792cea58d9b90ba478d5c3dc615035bb0af7364dba42c0674af6a1b9b7647f0aba246049a3595cc7c70c23067216d4608c701ce
 EBUILD crossdev-20160602-r1.ebuild 927 SHA256 88ad6609bbbbcd7b3af4770ea6ec71c6b7af3c2ef7619d68295d76bd43c18c28 SHA512 fb4831d068fbf4014322bea03ad49a4d458d2f0adff9a2d2a712215869bc5d8c057c6efca4e0f2997926cbecb343c9dee57441861317c38630d37fa4902560e7 WHIRLPOOL 3a659d2d084c2064fad9d6a1dfa217352978784ae667b14af8592790b2538b133b1087796dee478264b1366405b261d3d1e2db7661139ac59fb68dac0af12d98
 EBUILD crossdev-20160602.ebuild 978 SHA256 dee066c408d4f1f28abd288f44ff371cf1568266f16ed3deffcca580357fee85 SHA512 234953b134b82e5119e3333ab8b90c24dadcf6c498ac5f9be1a45d94f0c65f9b11b4d759a59a59284fc49ac20304777f8e05c7ee3d8920668f207d8df6fc8e2f WHIRLPOOL fe0608dafe2ac6c0449305e603a1a3bfe568e0de07eaafe2774dd70babed2eaed28aed5b1d34ac6998fe8076ebd88ef4cff7e285d800e142d6b62773b262f857
-EBUILD crossdev-99999999.ebuild 927 SHA256 88ad6609bbbbcd7b3af4770ea6ec71c6b7af3c2ef7619d68295d76bd43c18c28 SHA512 fb4831d068fbf4014322bea03ad49a4d458d2f0adff9a2d2a712215869bc5d8c057c6efca4e0f2997926cbecb343c9dee57441861317c38630d37fa4902560e7 WHIRLPOOL 3a659d2d084c2064fad9d6a1dfa217352978784ae667b14af8592790b2538b133b1087796dee478264b1366405b261d3d1e2db7661139ac59fb68dac0af12d98
+EBUILD crossdev-99999999.ebuild 863 SHA256 4f81437b6e5bebf83e72836dce21bfe38ca761fef08d1fd307e415c92e45688c SHA512 eb3a69d9e09b97ec56b036e6ff14ddf306e0971d7de0b6d5a0a21229058a095bf59b7d04d7960d24259af054bac72faab3b39f0f7fb7f05aa31c29dfcf62c9bf WHIRLPOOL 581c46f748072d878c9df18896213423a5c7b47a0e824eb8e69f9e2b9765d2d9f38023775bcf87053a0db06ae40392bf6ed21ef5f668f7a286f8e507c3deabe1
 MISC ChangeLog 7302 SHA256 81a0251e4cdc95041916226306b71aecca0e1204c1c2aea962fa800aa3bad179 SHA512 51c9f31a5887a6b55b0c2cb63279e62644baf9729e60b97c8f9222ed23f5b1eadad1a1aeeff81737e875404602b68bf672beb8a61345485d5fdc2dbbc1b1e893 WHIRLPOOL b5b953e13badceb3fb2b395498e0cacf56c59d6b04380ae76fcf980636e31f2e670621632c99af9d2d9ce49d59d2a8a97e5db111a85eb4df7f68f043ad4b50a0
 MISC ChangeLog-2015 21393 SHA256 a745a149451a73b6ec5524cdd805f5673aa53962414c51cb87e82ae626c696b6 SHA512 60d6f1b4b631b64a5a05ee1bc128e8e63f84852d434831a1d6f115d921bc9a70802a2ed6fe69983ad3af37d0fc314eb13aa03534f9b15de92a79d02d8ba592dc WHIRLPOOL 52b94d9cd41b844964ec49656879be0fc68bc9578a205cca32bd3004894fdb15c8f2cca9105b85a205567c14ee2806c698173740a4c3826cb967a625206b42d1
 MISC metadata.xml 430 SHA256 8097c98d7a184fc7efc881911e122a84127583a95bba9ba530dbc6fb62dab4fe SHA512 6a05b45977ecc06a9862ba62380f056148ea99a990f26769591e2ba4f2dc0ab231e292cb29371a3ad5d2ee77b7725e6df1271bbf141c32118abb83e4dd4d0212 WHIRLPOOL f812d97ee9896b88d922e722cdda38375f56a9e8d1b4b7d73f2898000cb86239c2716e164aaeb145c368200b17c3a9a88aa16712c0f67395a60dfbaf09ce6870
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index aa413719ace2..724d297db4a2 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,10 +26,6 @@ RDEPEND=">=sys-apps/portage-2.1
 	!sys-devel/crossdev-wrappers"
 DEPEND="app-arch/xz-utils"
 
-PATCHES=(
-	"${FILESDIR}"/use-new-path-for-functions.sh.patch
-)
-
 src_install() {
 	default
 	if [[ "${PV}" == "99999999" ]] ; then
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a898b1973c94..1402f6560301 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,10 +1,13 @@
 AUX flex-2.6.3-reentrant.patch 2816 SHA256 461f0843bc4a1fe2ccea751453d89716502c31a374b5645703ec3a333427c5ac SHA512 105017a1020b339f08ce0c45c9c41ba6b5e42bb9dba22b258947f8d18ed697804c59e5cfa5e995b54652a54e6a500ccb2036b38001bab433d7af6f01c71feda4 WHIRLPOOL 259d44d39dd3e01613654d694b1356661074532a58955356ba4c707ed2f16fe786d9c065b54517bca7f5504e45e507732050e0d1345d4b5ebe69241d5ee346d2
+AUX flex-2.6.4-fix-build-with-glibc2.6+.patch 20281 SHA256 5800f9abcfafebcdc1115bc7791af6c9da757f7f33ae425268ad94640d231aef SHA512 e9a03bf18a6fbc3546d96213cb483d46fa0b18609e03b37c4e5ac5427935d2694bd86ee73cf5c28ffd6bd7cec018f203e82e7c685e9426a7ba2e6d60d2a44135 WHIRLPOOL cd41142bfe03075aaf727b5a718a17204dc4698bac703723a9a1d602ff44071f8b6d9985187c7b3f750999f1f6cd47ddeccc112ddcb81f243d158cf5cd5e4b1f
+AUX flex-2.6.4-libobjdir.patch 770 SHA256 4654e3b9aa13e220b12b797335ed910b4c15ce553848ec2a54f728f0ca550110 SHA512 76e3a3e19fe9c9b6b3e0fcfea98feb0eaf03fdc683e3695045b3246b57538a52842b455a9aebed87548d2b8ee3e7d34dca5ff355f06648911866b3b621b40f86 WHIRLPOOL 73882a6121d6084fb0f0dad389af044f5f645545f81ca5c30fdfd1a2c3bef818c6b5e77272b3747e7b7ed24de9a6902fd70aa9c111d2ef40a57b40444955bc35
 DIST flex-2.6.1.tar.xz 835048 SHA256 2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1 WHIRLPOOL d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
 DIST flex-2.6.3.tar.gz 1405560 SHA256 68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00 WHIRLPOOL 266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2
 DIST flex-2.6.4.tar.gz 1419096 SHA256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e WHIRLPOOL b19880ae3d760e04138ca93c848da07baa004bd193616855f1e650a170648288727d6a2bb5e657f05b204505d4b5b70e76a795037c81c6a19e1767cebadf8204
 EBUILD flex-2.6.1.ebuild 1913 SHA256 ee0c9e6314da38de312f2884ac7fff9bfda1bf0de90cda2ec9cc55bb0969edeb SHA512 c0c4baca0a0e4373599be51d6490b46b25ef39d3fbf251a2bd531f438800e1f9dfaec839e9f8c72a66c1928896cfdb69fe52049ab1e1843d9c151ff21be0542e WHIRLPOOL 0b3c6734c549fd5d61ad44dce75d361e168564b793667282de63ca6fafdd7b7146ba4266f8bd65119844421e5563afc838bdc5e4b60dd2b814b12228afd138e5
 EBUILD flex-2.6.3-r1.ebuild 2061 SHA256 a71c37379d143e3abcb1f05fce3ffccce5877d8e17ad42bfc95a114f09058971 SHA512 d798c09ce136155b5e67b144d6eb3ac0e394caf0445678fa1e3e887f2c766fa6975fe2288b843a3f7ef6631193986621dcc2f4d46142ca73e693384d2f8b61e5 WHIRLPOOL a23f58c72c4d6ce243842485236db003198b89356a5e3b3a641ecf0dfe9841d813661b312dfbc597c90e9984e2d0df327b12726e50212f7516debdfe0740afda
 EBUILD flex-2.6.3.ebuild 1987 SHA256 ab00926b33bfb3998722f58731189312c0db1c6279f77573851347b02e6f1816 SHA512 54737594a12c82faf520ac12a3fe9d17b8b2658d9d6736ad25db58686250e2e97ef27c5341df96fa28ca78376f607d139ca6bea85f00ec5e8d52360b94df336f WHIRLPOOL a944131ecfc0e1e71ecf5bccca80e4b5e4bc5534a31367aa55ef2fd9830908d0777c6d00ced7057667689ebd26c98227accdc8c39400c478a492c653731afb9d
+EBUILD flex-2.6.4-r1.ebuild 2111 SHA256 7f384a46a51615d02f879730afa25f9369c0a5c66437488bf594d36128f1d4c7 SHA512 2121ed0c99196303041e8c5713ee43944c165bf5108d9c5fc02cebc12de5356af9a47c7b59d044804f35c64d9f3cdfe7778202b611382f359f097ca5bef42933 WHIRLPOOL 1edc2d0b159307ab73fade41a50fc83f1a560451bc611b7d7adb5b98c4706cf04efe6b481709cf010e6138e7fe9ac0727a7ffde6a679107b2156a7330111f94b
 EBUILD flex-2.6.4.ebuild 2026 SHA256 62707a253c137ef5f571a80e297e7607a7055b2ce2aa3efce719a2e2fc927b2e SHA512 4070f280ecf38f09cfd9210b41b5e42d12e2f4da06cf5db775c6738624016a3f58b9b2367b47f6b8a5b1d1b78730922b2c56582d5e93988dfd1edcb6b2e088cc WHIRLPOOL 9d0454152ecc9ef55073d38baf10537278b59f65d146877d14a05b9d744a6571143d7a464d0b16c27227d5cfbe33e047f2074bf268dc5e9dbe122ee8b3645ccf
 MISC ChangeLog 5656 SHA256 1d23877b1b816e90923b7e932f8e4d673e95d2ad3aa5db8814518f29623c6388 SHA512 4e09457657a237398e8b3833c7c934879686527059267cb59b17597ff84bc1a1a565b84f03c86583bbaa246d183a22570ea6627305e167c955cc1ad4db0f9106 WHIRLPOOL 98e7b57d707a18fd7fe5be6464fbedac1953d3beac9c6c251df9b4627da55b82c3c9f844a335645eab33534ed5710ded404abf035f5cf974e5f306181175e8b0
 MISC ChangeLog-2015 14123 SHA256 559935be9fec248b903e470b5e311f39e4e44790aad69495b78410e469604fc1 SHA512 673d316fb9a79bb40b7e241a2653009fecccabcefb7c159b078a31c4b8eac8755c8e404bdeeb3f4d871e6cef63faf7ece9e2b8625331a06f4c618349cf1102bd WHIRLPOOL f12d6b587e8cd44f7b17741da51db8213128f9a9a562d19aab872dba2b20e54e2ebcf35b74b0e195e1faf884c1abca0bc584bce66fceb14049d53606f691bce7
diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
new file mode 100644
index 000000000000..328b57524565
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
@@ -0,0 +1,767 @@
+Backport of https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
+
+Bug: https://bugs.gentoo.org/628744
+
+--- a/configure
++++ b/configure
+@@ -3605,13 +3605,142 @@ test -z "$SED" && SED=sed
+ Xsed="$SED -e 1s/^X//"
+ 
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if ${ac_cv_prog_CPP+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++  break
++fi
+ 
++    done
++    ac_cv_prog_CPP=$CPP
+ 
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
+ 
++else
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
++fi
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+@@ -3744,91 +3873,208 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+-$as_echo_n "checking for fgrep... " >&6; }
+-if ${ac_cv_path_FGREP+:} false; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if ${ac_cv_header_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+-   then ac_cv_path_FGREP="$GREP -F"
+-   else
+-     if test -z "$FGREP"; then
+-  ac_path_FGREP_found=false
+-  # Loop through the user's path and test for each of PROGNAME-LIST
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_prog in fgrep; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_FGREP" || continue
+-# Check for GNU ac_path_FGREP and select it if it is found.
+-  # Check for GNU $ac_path_FGREP
+-case `"$ac_path_FGREP" --version 2>&1` in
+-*GNU*)
+-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+-*)
+-  ac_count=0
+-  $as_echo_n 0123456789 >"conftest.in"
+-  while :
+-  do
+-    cat "conftest.in" "conftest.in" >"conftest.tmp"
+-    mv "conftest.tmp" "conftest.in"
+-    cp "conftest.in" "conftest.nl"
+-    $as_echo 'FGREP' >> "conftest.nl"
+-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+-      # Best one so far, save it but keep looking for a better one
+-      ac_cv_path_FGREP="$ac_path_FGREP"
+-      ac_path_FGREP_max=$ac_count
+-    fi
+-    # 10*(2^10) chars as input seems more than enough
+-    test $ac_count -gt 10 && break
+-  done
+-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
+ 
+-      $ac_path_FGREP_found && break 3
+-    done
+-  done
+-  done
+-IFS=$as_save_IFS
+-  if test -z "$ac_cv_path_FGREP"; then
+-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+-  fi
+-else
+-  ac_cv_path_FGREP=$FGREP
+-fi
++int
++main ()
++{
+ 
+-   fi
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_stdc=yes
++else
++  ac_cv_header_stdc=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+-$as_echo "$ac_cv_path_FGREP" >&6; }
+- FGREP="$ac_cv_path_FGREP"
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-test -z "$GREP" && GREP=grep
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <string.h>
+ 
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then :
+ 
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
++fi
+ 
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
+ 
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then :
+ 
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
++fi
+ 
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then :
++  :
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
+ 
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      return 2;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
+ 
++else
++  ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+ 
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
+ 
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ 
++fi
+ 
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
++
++  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
++if test "x$ac_cv_header_minix_config_h" = xyes; then :
++  MINIX=yes
++else
++  MINIX=
++fi
++
++
++  if test "$MINIX" = yes; then
+ 
++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+ 
+ 
++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
++
++
++$as_echo "#define _MINIX 1" >>confdefs.h
++
++  fi
++
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
++if ${ac_cv_safe_to_define___extensions__+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#         define __EXTENSIONS__ 1
++          $ac_includes_default
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_safe_to_define___extensions__=yes
++else
++  ac_cv_safe_to_define___extensions__=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
++  test $ac_cv_safe_to_define___extensions__ = yes &&
++    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
++
++  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
++
++  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
++
++
++for ac_header in dlfcn.h
++do :
++  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
++"
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DLFCN_H 1
++_ACEOF
++
++fi
++
++done
+ 
+ 
+ # Check whether --with-gnu-ld was given.
+@@ -6898,288 +7144,6 @@ func_munge_path_list ()
+     esac
+ }
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+-  CPP=
+-fi
+-if test -z "$CPP"; then
+-  if ${ac_cv_prog_CPP+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-      # Double quotes because CPP needs to be expanded
+-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+-    do
+-      ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-		     Syntax error
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-
+-else
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether nonexistent headers
+-  # can be detected and how.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-  # Broken: success on invalid input.
+-continue
+-else
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+-  break
+-fi
+-
+-    done
+-    ac_cv_prog_CPP=$CPP
+-
+-fi
+-  CPP=$ac_cv_prog_CPP
+-else
+-  ac_cv_prog_CPP=$CPP
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+-$as_echo "$CPP" >&6; }
+-ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-		     Syntax error
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-
+-else
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether nonexistent headers
+-  # can be detected and how.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-  # Broken: success on invalid input.
+-continue
+-else
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+-
+-else
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
+-fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
+-if ${ac_cv_header_stdc+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_header_stdc=yes
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <string.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then :
+-  :
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ctype.h>
+-#include <stdlib.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) \
+-		   (('a' <= (c) && (c) <= 'i') \
+-		     || ('j' <= (c) && (c) <= 'r') \
+-		     || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
+-
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+-  int i;
+-  for (i = 0; i < 256; i++)
+-    if (XOR (islower (i), ISLOWER (i))
+-	|| toupper (i) != TOUPPER (i))
+-      return 2;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
+-if test $ac_cv_header_stdc = yes; then
+-
+-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+-
+-fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-		  inttypes.h stdint.h unistd.h
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+-"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-for ac_header in dlfcn.h
+-do :
+-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+-"
+-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DLFCN_H 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+ 
+ 
+ # Set options
+--- a/src/config.h.in
++++ b/src/config.h.in
+@@ -207,6 +207,9 @@
+ /* Define to the m4 executable name. */
+ #undef M4
+ 
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
+ /* Name of package */
+ #undef PACKAGE
+ 
+@@ -239,6 +242,28 @@
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+ 
++/* Enable extensions on AIX 3, Interix.  */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
+ /* Version number of package */
+ #undef VERSION
+ 
+@@ -246,6 +271,16 @@
+    `char[]'. */
+ #undef YYTEXT_POINTER
+ 
++/* Define to 1 if on MINIX. */
++#undef _MINIX
++
++/* Define to 2 if the system does not provide POSIX.1 features except with
++   this defined. */
++#undef _POSIX_1_SOURCE
++
++/* Define to 1 if you need to in order for `stat' and other things to work. */
++#undef _POSIX_SOURCE
++
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
diff --git a/sys-devel/flex/files/flex-2.6.4-libobjdir.patch b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch
new file mode 100644
index 000000000000..a652b9236b1c
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch
@@ -0,0 +1,26 @@
+https://github.com/westes/flex/commit/24e73c4446841eda8d4ea01298e887059e8c1472
+
+Bug: https://bugs.gentoo.org/625508
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -79,6 +79,8 @@ COMMON_SOURCES = \
+ 
+ LDADD = $(LIBOBJS) @LIBINTL@
+ 
++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
++
+ include_HEADERS = \
+ 	FlexLexer.h
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1688,6 +1688,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
+ @CROSS_TRUE@$(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+ @CROSS_TRUE@$(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
++
+ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c
+ 	$(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp
+ 	mv $@.tmp $@
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..b221d35914bf
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic libtool multilib-minimal
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex"
+SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static test"
+
+# We want bison explicitly and not yacc in general #381273
+RDEPEND="sys-devel/m4"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bison )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
+	"${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
+)
+
+src_prepare() {
+	default
+
+	# Disable running in the tests/ subdir as it has a bunch of built sources
+	# that cannot be made conditional (automake limitation). #568842
+	if ! use test ; then
+		sed -i \
+			-e '/^SUBDIRS =/,/^$/{/tests/d}' \
+			Makefile.in || die
+	fi
+	elibtoolize # Prefix always needs this
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Do not install shared libs #503522
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-shared \
+		$(use_enable nls) \
+		--docdir='$(datarootdir)/doc/'${PF}
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		cd src || die
+		emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		cd src || die
+		emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc ONEWS
+	prune_libtool_files --all
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+	dosym flex /usr/bin/lex
+}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 23f074641539..44400c696695 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -3,7 +3,7 @@ DIST gcc-config-1.7.3.tar.xz 15088 SHA256 2c6cca69a028f157dc54e19ea10efc240e0d26
 DIST gcc-config-1.8.tar.xz 15020 SHA256 2453e2a07521b12267ca62b9b860eb2d2bc606cad0f29bf42a1c9543673f5a1b SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826 WHIRLPOOL 4899bc1da43a158cc486022f68661e5318db7e4e83afdb5d892fc7ce5098a4bdb059dbab3c50e632901e577cd8760b2386da3ee24f5e944db12d3e246d9c26b6
 DIST gcc-config-1.9.0.tar.xz 17468 SHA256 3e0acf3fe683dc6193b0135fe4b26ce7f959210296fff040a10bccc33a247d1a SHA512 658c8ce26fdddd6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc WHIRLPOOL ed341f1fa72958008d4e1c1a814a2cf025be7404d21c963c6b82c36dc951ba15849f7809211fb21e5fb4a18ce5c12f4f4b36242822e568d4b4f39a8f9f26aa0a
 EBUILD gcc-config-1.7.3.ebuild 1022 SHA256 d4be3de8d2b3d47dcb586d842cb4188262dd35c41c22c3cf7d3eb518bd39ad91 SHA512 e48c80cfc24c0d701594fd53dc9ea7875bb8d4a43022331093db33d3a8d0b2652c9216e79c4f245b583f62a324a3ad9e2438adcf4cea53de4027e3de3cb84061 WHIRLPOOL 420869fffcd7f959a8164b58463c1ec7dfdcea574d6897320f429df531128a9c5ca69bc47b5ed10ad9414265e0b0e854bb45d9c8d0f05a87d4ff80dd03814c9b
-EBUILD gcc-config-1.8-r1.ebuild 1182 SHA256 d3843e2910bb994ae6c5cc8635088e817a8c647086f20f32b2b6e3b76350a055 SHA512 615a3b5bec263f1268c42dece25ecbc644b9f701e6b1f69c14b48194c122ee1f54160bf513aedfa210b0a542c4db8f9639dac27f49903621b96840d4714206e2 WHIRLPOOL 0b63c772319f1440db4e91ac2cd30ea31692ab3024bd32350e3c5c6a41593edb6dabd0ac31b2679f7f44bac55501a020a27b1fdabf1c9a62f8c800861bd9787a
+EBUILD gcc-config-1.8-r1.ebuild 1180 SHA256 079a64f6d28805b73294745a86eed6994d6e319100a6d46a01926fcd08f8cb1d SHA512 ba3676f5d8a8fce1fd06f954d9a6c8cbf105f82dae50d562b0cc385812fe583482d33586e69924148e344ffae892927c0d7aa26d92019f985f456695d3b0c8cb WHIRLPOOL cd0b2e22192d2d63f07d231c1eca1eea341492f63034e6162110038547100c852c61dba23008741cae0465e2075bf68000179889e68eff7cc2a167aff61d8644
 EBUILD gcc-config-1.8.ebuild 1035 SHA256 3a51617ea066a94c043f7d9e637c0a0fed064f7e3a99c7285e56f26096da8821 SHA512 8ed8f187fbb6c50f019a94826798c427f0d7647ca5a4369a551bc5e8571f4ac337c3c99066e1f6ae5ac562723500f1a718a2cbe3f54f24535caf7c4264a33620 WHIRLPOOL 3f41ddb2aab0446cdd0748db83c49a392913a5ddec99ac2a29a965e9e4eb82c1ec8aec4d34d835f65e329db26dc29c98782d48d7771b41d9a0214c67a6a5730e
 EBUILD gcc-config-1.9.0.ebuild 1079 SHA256 0645387c1a8188fae5f24d3a230913394d2504a8fe5ea89908945ce0c5bf8ccb SHA512 a91175f3690253014f695d45a52269c57bc7d6365a38b00d902502bde984d02aac6c59f28f2475c84dfecd2b538441a6c8b49ab92713c67d3dab84715d767d47 WHIRLPOOL c240040acc2a9ac7843cfa5ee1caafb1fb4010904dfc9816844087b0e4a6dc767b10d0765534d3548fd1394d3e559bea051b11b44250d24c4df85bbeab66720a
 MISC ChangeLog 4613 SHA256 ac0232e8affa3a08338c69ee52e3b940d915ed33a4a12d140e1bc8a2fe06d67d SHA512 d5b53be1dfd0160cb6c8fbba02317bc70c3eb48bf1cf08779029a77072549ebee21edccf819e3193d262291d11621fdfebc19c1b3978566c2fc3050c4b1786f8 WHIRLPOOL 26a1d4e53efa5e223f93b2510d71c5b50b7970fe332810f8c43d6c74dcda50e36fe49fc2ebf9b4a05077a984d2f39273cd8773fb04adec8406ed008196cfcfbc
diff --git a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
index 48324fc6aec0..fe4b4fbf8cad 100644
--- a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 1b4d9886ad2a..49927b4ddb41 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -11,7 +11,7 @@ DIST multipath-tools-0.7.1.tar.gz 329008 SHA256 d788aaf3ea862b44b5aa07eaa0e56960
 DIST multipath-tools-0.7.2.tar.gz 335187 SHA256 e4273527b8a8e31d596221dd74fdeb9f2b7558d59e514bc7eb040d077bddf24b SHA512 9637e6c69ecfe8dbfb55794569017051961dbe39fa1019000e4be9c2c888a5b6d13ae360af8738bb1fb89a8d27ec833ff0075b1d066b8b3ca21cd9832f477046 WHIRLPOOL 051956ab5c899ce98833925f84245f7450c7c01012edafdb6fff39762cf87908f53413c42f2ccb6059fd2717d29bf55ded260ade027b37ef0227a46b8266d8c7
 DIST multipath-tools-0.7.3.tar.gz 344030 SHA256 b59712c3068b9b33c2fc769eb499c637a0ddff7b46ae9d2cc411c4d61e233ffb SHA512 fbcd5609bcb4f80a91410cec86882e9f39ee056edb314382f25db8e1e1ed5c084e14849a67502be2b11a2e980dc2cb5d34235885476ae5ce62809a175bee9ace WHIRLPOOL 03b99202d2831513ba1fcc3e504ba3554b970c5bc366288a50e62e2225028dff972c102b7ae93d026026bea6614b5305a605122c91e0b8deeb91f9c98a68119f
 EBUILD multipath-tools-0.5.0-r1.ebuild 1728 SHA256 d25b74bb8a7ea90ffd9d1b9d54354218ea4675e092cef2defda8a45bd6b0dad6 SHA512 e1de58801f4e2b71b44a4d60d385bd2067aa172841a90c078a5f6dc608999bfcd23059cbc730e18c910a7606bc44bfd9524a2e466b49ff38b90cfaac143def86 WHIRLPOOL d92239d3dce0810260250437d573d0f26ec2ba914c17403082e5cd61e4fca75f0f5c14aefa6bcff0a6cf892b5b47e6002e854406abd9fda5cae0a824f7d494a6
-EBUILD multipath-tools-0.6.4-r1.ebuild 2537 SHA256 d3189bd2734a565ae0389820fef64f733e1286bbb1d3761a87cc141ef0bf5f97 SHA512 f8e9876a166eb809c161fc94c1579a9a059b81e23b5424721b068d9cc2bc88c049707174c42113840bbee7bf6b1d4209d5b688e952d8aa34d3fc95674fa9fe0d WHIRLPOOL 3cdc02d67db7497bfc58bc31dadfb8d8d509e055f6707297e59af8f2a1f3b91a635791a2e772d40462a4d1b14cf02dd965d3deed947833364529dfb1a1613d80
+EBUILD multipath-tools-0.6.4-r1.ebuild 2536 SHA256 5e891f337ef0214f94d7fec39008a6767c144d7a54552c374455cd4418c472d1 SHA512 af86370408def92d6452a0bd8a12ae7a9f3824d12cb7d55e9762ac8e23384d75b30f8999e03641ffcd6fca3b4fabcae1b7e90e294ffbe240095190b44c80c523 WHIRLPOOL e2d000496f515d31a0de731349e1b3bf6ac87e2252d1b055cbd5ef9c5ff3c63a313d1066fae5fcdf02bd2177167b4bfa5e6b42b1b56bedd47dc6421e0ad505cc
 EBUILD multipath-tools-0.7.1.ebuild 2189 SHA256 aca0361797e81a206b6d047cfe733225d30fd2d011ec555e4561a3aea6e9eb9a SHA512 cc1fc9548eec536691d4357d920a2920afee52729d74b662549dc9c70569f68ff02ee8b55facab6cbec5400880d0514b0696e0eea22e6be3682baa06d09a417c WHIRLPOOL 7f2d209590f37bb099c837e609441938104e6fd9afb491d2831c24f83b9f4a3cc180a9437d0f2d4d72e8f6732a376bce616bb1ef1659a601dadf97200ab48b7a
 EBUILD multipath-tools-0.7.2.ebuild 2189 SHA256 aca0361797e81a206b6d047cfe733225d30fd2d011ec555e4561a3aea6e9eb9a SHA512 cc1fc9548eec536691d4357d920a2920afee52729d74b662549dc9c70569f68ff02ee8b55facab6cbec5400880d0514b0696e0eea22e6be3682baa06d09a417c WHIRLPOOL 7f2d209590f37bb099c837e609441938104e6fd9afb491d2831c24f83b9f4a3cc180a9437d0f2d4d72e8f6732a376bce616bb1ef1659a601dadf97200ab48b7a
 EBUILD multipath-tools-0.7.3.ebuild 2260 SHA256 c67ce364ae83c0d18b91969c32d7ba5d1116ce52e0c2426316d2fedcf0481e65 SHA512 7eeed0784be1ffa31fc153715c2137c32d2fc0d96102ae57818b926502c6978394875a0901066fc16ad7c45744eb1f4c4e837972b52f015160cd296e6d753cfc WHIRLPOOL 66c1090fd07fe33b180932f6a190d5c5debc34b5e7a2816453d13cbce0fa371548820f0f440cfdec7254135fb32b6cc837bea439f21e4c8cf54286db6a9c6b86
diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
index 652a8f6a1a6a..76ae822cd830 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tg
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="systemd rbd"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 2f95341789b4..0961d5b02bd1 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -31,6 +31,9 @@ DIST genpatches-4.13-7.extras.tar.xz 17400 SHA256 25b8b93102267a59e9b586caa67073
 DIST genpatches-4.13-8.base.tar.xz 170820 SHA256 ca9c0edb25925391405876238441e8d7d76dac4801bd621c6570078c25ebb01b SHA512 b3804343f81c951b851747c669605ae1a652bec0668c90e530624ed17aa817c2594f72d91fbe0b058a839782a044cf1c0224f9395a458d9cca67f4f586505a80 WHIRLPOOL 909b6a495533a6d9e344ae4901426a3606bc15fd1619438ea6f6efe6ded6e6ed0776167d1bf8577c37e9c6b689d3623eebf33be962557ffccffa309b6f47aa0a
 DIST genpatches-4.13-8.experimental.tar.xz 5184 SHA256 3bdc5c643a87277723334f1e78fcc5c327bacb3363900c67f2050de610737f86 SHA512 d8c9b1925eb9911ebbc0cf6902d2df009f38b09ffed0138c047248d36d215932bedb0fb32a2de9a10c61544bca5dd15a1fdb92a057f872f241b3c575cf8eef72 WHIRLPOOL 77b2a52d350de7eb157aa37e21876669e921cfabe22a9412b9af4c59d04e880cc2b510a2256864ead8d5f69636a7a45e840d7cb27266c33eafb381db654fff70
 DIST genpatches-4.13-8.extras.tar.xz 17400 SHA256 9653d6207d975592974ea62b9d84d4ace8ac5cf84e9d08bb411125899bec9d16 SHA512 7656a9f7e93c1e88974b65281682fed3b1148bac5c96c59c1fadf7c821a27afbdaad27cfc61d9d3178f5b010578e31183ca35bda150ef2a42e153d254c849261 WHIRLPOOL cbdc0feb916fbb05e2c496b56009d4145190736942d3422f615aeb330ca67068f562c15e26f43e1207b3341930f945cf1aaf24f5df668302ca77bac69dbd907d
+DIST genpatches-4.13-9.base.tar.xz 171724 SHA256 72ac770acf46e87d762d9a45a1cac88fdd8a77c5856e04482e63b8b758c53636 SHA512 5c0f9bf950828b1c846abc2067b993982eb50be381e0498c712ace8e1e306ae1c3dcd47109def7ae83de8feaadc0601e43764de1de81f59138bc28b1ef992921 WHIRLPOOL feb9e7d51ddf74392c62c2a31b56d638a6aaa3b6b7b7ae243348b1ad6e0f83ed1842e221fabd469b09802f5d51c957231c923058a21644f249f61ec144a2774b
+DIST genpatches-4.13-9.experimental.tar.xz 5184 SHA256 83f753d1627b8e0a6fa5486f74db730f50820efc21fd81824786967c62c51da6 SHA512 35f050d00b497e624ec0538eb555680681b70a5cb8d6a43652cf254af0602ebd34f49c124a0af6779af6b47af61f6a400386fd4ccd0aa6b11a575842e9baaf8c WHIRLPOOL 0bf30768875a3fa32703a375273c446cf4476de69bf610508428aeeccb50571432d5e6884d6dbdf0d99ba9a388491f78f6cb002b03caaa1a30ce7a9f6df397b5
+DIST genpatches-4.13-9.extras.tar.xz 17404 SHA256 ced99b570b13dfe785c606851ac9b7aa2cd51b3d2f3fbec690e47a460979b912 SHA512 e07bd0bdf1c2944fa8ca2023add499a9b5d4cf2621e9a9a445e051e29dc9aed757c5935c772cface6ed5b0e2fcf99b933f1213fb2c6390c31740575e2a6c8df5 WHIRLPOOL 4e9c40adc134f6e5aa9e63aefcaa9e751503dacf178c6d198c86aaacb20f0017c9718f4c2bbb29d0a362066f05c64eeb346933fdb20d63ecd81b320102bf4f4f
 DIST genpatches-4.4-91.base.tar.xz 1428436 SHA256 d6c806bd868856a9021b35d0bc3ced37029c8803846d6b251fe7fefadfe46c69 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554 WHIRLPOOL 8de12e7bdba76256e8fc41738605bbe961fa3fa0ccbe1fccaf0c8cb3708c692bb65a27db7675e42ce5558a22c81b9017742b14d6776ee2b93f4d1d92535942a9
 DIST genpatches-4.4-91.experimental.tar.xz 87760 SHA256 e04a99c94b4dd9f5856dd08ed4b286b19c765d8d0fe40237dce256f7c874dbf8 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f WHIRLPOOL fb6306af0191198d466b3349c348139342a70de118bcce0563e3209a7ead8a9d56291f3a4155ba4a4d211db8fc1e20ddec3a3b463d62fff5375df823646f7b02
 DIST genpatches-4.4-91.extras.tar.xz 16468 SHA256 6cc85cbae6d2ccf087104b5f719abf10d186d3b630572caeb1906c344c66de76 SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d WHIRLPOOL 81f8fa1676856f0941bc6d09e7e602d2213740bed6edc914d9341bad590650d5a5249fd8bbd2d640380a638ce2a12fd4ec66e0c3753c8d9d22c1fa2c3f07aacb
@@ -84,6 +87,7 @@ EBUILD gentoo-sources-4.13.3.ebuild 741 SHA256 520e638fa8681e1a617196918fca6b048
 EBUILD gentoo-sources-4.13.4.ebuild 741 SHA256 4eb9c3d37fd31a53c9fae66ae789cf71557ac78c52ca9e736b3ab978f9972c3c SHA512 5c4ba68cd82fc6dc9d12f2be0cf068b738f77f6bac8d0c8281a61f70ddea4ec2493a98823983c26175ebaa4cf18e36484d02ff49eb4de11c34a72cf4fec29bd0 WHIRLPOOL 3396e4a3cc589e3fd9f965e6d396ebbb1bdd8255fe0e3a9d8264b83a28d945dcceb3a938c12ad2fc5d074ab152469537f6296943371ef4965844776d374b17cb
 EBUILD gentoo-sources-4.13.5.ebuild 741 SHA256 47492a4b589606ab8a1567afc6461c10c0937db1cd2dd042d1bf9cb004e47c43 SHA512 2fdcc7f85ee790ebed2e6399409bdcda8437f1cd92a541bb4a8f1cf8eae1eaebc84b691aa0b65c44d5dd684663e99088d6a716b8a6fe18e94a6ea01d7d3107bb WHIRLPOOL b850bc548d9a3982c1fc27c2740ef4221817792abf6a24b8870c5e464fbfe28aa3d567e86d90218a49b3121bdd45a75d6a06338225c94783d43c8e546946c681
 EBUILD gentoo-sources-4.13.6.ebuild 741 SHA256 e5293566f98e578af8770b38f3e41f6a8b68d64dde54d1949993cb56d49fdce7 SHA512 f532e57cab7ca86c90d3780750f9fbfc619fd5cfbb2f6980b57ed212c1a23709a175ec33d447dd3678368d4a98ff4780243cc8644982f803e303b989994b1356 WHIRLPOOL 409ed217efe6232631524bd0ae1e589d473de243929cb5eb646f97de2c6ac9e790d8b589adc2fa878ea768fcae38af47804cfcea6f5ab03a1986678db0895136
+EBUILD gentoo-sources-4.13.7.ebuild 741 SHA256 0057d229f32cdd726d038e54e701e2841d3bdfdc2677b3f7747b2a90a0071676 SHA512 d81563edd51f3c1fc9fac56461960e10da3752700b232208c07edc1ff9a271d61a5ba3cc6ef800932e7da86966b04affb1c20066029af5cd3441ce79d7e269a5 WHIRLPOOL 3b1ce47758dfe8fdb80e25b094d9c94f6b4fc8be7adf2887e2e9dc2ee0edff7443b56901bf47b60e0ab8f85d868d7aa735e75a7a5ef86d0b5edbd26f38894f48
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 SHA256 dd44b061141d2d116cfca2e34588ff60addce6a8d252b43a95520f303e69939e SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff WHIRLPOOL 6093bca2f06d92d49241a7fbc2ea68b0306c494dc657d6ac3908e5d5406b60624a75b3a09e063c8bbe667309e31aeced4193897ff388fff11a48b4c9dfd5a179
 EBUILD gentoo-sources-4.4.88.ebuild 742 SHA256 2eef4d5dcb46222d98612ba2c3b2cebc936b2d48e7318a4f02d6048e0dfce86a SHA512 e4e8e8adb7132a19b0740aa31bfbda8209e313dec8f813097ee612046b36f9979744ce41b4cdf119573c5ffd9831bbf3f69f0be12c5586e6d8775f16796c6f54 WHIRLPOOL 1811598ac8c0065bb3798657a14799de1afc3c649f273f34711327fad8a3dafc0c07a717e665658387447b6ccf5b389f49711e0d03143329a83f3517b20af30d
 EBUILD gentoo-sources-4.4.89.ebuild 742 SHA256 ef03c103cf943eda72c589a9c7f1efae21e820acbb09ad7c877d0078de4000f6 SHA512 79f1868dca998e66cf75fe50da1def291f4ab4f0d02333834649a488a9c8b27d0962df1fe8dbefa949ff0b574747be21fd4bc5771aa6071256d05ef9ebd37d47 WHIRLPOOL ac8eb63e97a2244fbb90923daf5eae82239997eadf076f268799dd3d99beed5923b28f27ed0f535ae00a82babacc433dcef8340de1e2416315f33eb9f501cc91
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.13.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.13.7.ebuild
new file mode 100644
index 000000000000..eb77713526b4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.13.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 0251f10b0bd5..f3a96dac97fa 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -11,7 +11,7 @@ DIST patch-3.16.49.xz 1715976 SHA256 6cac095f27e2dc714d1fd17b904c600179b042f904f
 DIST patch-3.2.94.xz 1789324 SHA256 67e6decb1358fe532b18021d019947530994e416d3b37d46d1dc1e1a588bc968 SHA512 969c94d9801eae41a279bb7792a4d81d9bfc65e7f3e700febbb1d36b733ec60f923054d84dbf19fff27aa3e3807b93cdb5a561216e0c4f361a491e939b61851b WHIRLPOOL 536a689a34499d9adb30501f706b0d5cd71467bd7feff9269cbca3df00eb5b24a530344454cf185cec91113f80afc6f78749ba68808e69dc11fed45037f6ded1
 DIST patch-4.1.44.xz 1171508 SHA256 e4af9c7bbcc7b8315ef59f8d5c950d330d387118ccee4e96049dc67b30ddc976 SHA512 8ab36ac700eaf4e54ed5aad56038c67de7127c72c107f7d3f86ba992ef770eb7869eddb581f0ff2e0435a9a4273144505256b0cf1ddf80ce3fff9d845bc560c4 WHIRLPOOL ac01a884cad4f10fe92b0203e618997107662ebe2d8e1335def112b108375353fbd4e4e8435178b0ab883694ebb136a75ffabed6fa905cdb9101b27f6b2ef8aa
 DIST patch-4.12.14.xz 237356 SHA256 999f3e0d97e1b9e7a09c8c0889f020ac9e342ec2391d0458521d4b8bff1cf945 SHA512 8bef19b2a87147b4ac7c5852d6cac0281c7df7deb84460c6462c981b9213d288061c19535bd9a4da03db73f8a9fd2fb76bf9c6d42b0b6ad1f30c97d5ee0964d1 WHIRLPOOL cd7c1173430eea9a33386fdfca10e1112ee90a5420180f30c0f375d7fb3ddfa657eae93cbae1a1d2b1a1a5d442eaf402e6565028ffeff79fc78a08b6334b1873
-DIST patch-4.13.6.xz 165096 SHA256 12d897b7f547c7d03a81be690b3dc0e0e5b9becfbd63e3dbf9f7258db861ddfb SHA512 40e111f3969b622f982bfb75f8c35aa59d9989a627a4511d8e0090b0c7bbcafcc90567434f5166ef2d17831f0beddb52762107e523414523e1877f67f66ca3f7 WHIRLPOOL 84ffb5f228a46d5551de04e8dcb8fda2ed72b40f0306198c909036610f58f6d5e6299d71bcd08e235f3c34fbfffb5d6dae805aaaa2dbef220ae94ef844a6890b
+DIST patch-4.13.7.xz 165784 SHA256 0fe89c96e956efbded576214eef0c8e43cabe41dfca245e3ebb79fff9bc8715d SHA512 4d96c655ca4c720b872e1a88ba9989a419880cb5fec2a4a9190077588066f205c5dce2591a76f26375f6f50001334ceb7631d489d3b24ca443d10e1e6879ed54 WHIRLPOOL fb192f3acb9d3a249a2ecaf6b7d6c6eca0ac684c17c01226ed1ca69f5aafefa782aeb80000bfae5753672e2d8bb93b07377e8d1c0ca66b5dbdb1332d77ae38a9
 DIST patch-4.4.92.xz 1376520 SHA256 198196ec8cfabdab83687535b7655796a78d05cf7dddf08f976226f2e191c640 SHA512 5f65d59d386dd7810f7f0309b38e5dbb9c8198c6f145a539ece4b48321a9f26cb7c7418dec566a1872cf8ffcf0ee1b233c3c344d0f7e4afdd8a05be6a99decff WHIRLPOOL 30ad8543adfe312bb66a1feef49a27f3810230cde88c5977c8818ef0280bdf17bb48ec667590d8491d2ad58bc5693e533675ec5989cbbb77649f48eace4b8a3e
 DIST patch-4.9.56.xz 1059840 SHA256 a63aacf1f75a2f02a1313658b7f86be922b7a0e4bab41dc377449dfc0b7c529f SHA512 9d926ac7e06ed3d4ae7e2747b06045e6e2dd61c279895067141e4c5abb252488252253398ac2bb87f297671c8d47402f2476f065b0cabf73d9c1c7dae9da8243 WHIRLPOOL 063d112999c912d50b95af8f3a068d4d2c0b9e319d690a2f0927dc21ca4926518f6fa6130d8f04fdef9b8ac702db6048b241e4dce62cc99e7f7fd6457300ee2f
 EBUILD vanilla-sources-3.10.107.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
@@ -19,7 +19,7 @@ EBUILD vanilla-sources-3.16.49.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90
 EBUILD vanilla-sources-3.2.94.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.1.44.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.12.14.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.13.6.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.13.7.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.4.92.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.9.56.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 MISC ChangeLog 48866 SHA256 5e96c40666532838415dc80201535a16e22c7513cce19c979effe9592694c294 SHA512 06ee49f4aa7730f7c92a4ca500f6fcc105591d6b4ab7431e77a77b29821b81d7b882852370ac800461d2ca2efa68519e64504367534ef2e94dcd0da21b2fd9a0 WHIRLPOOL 31715105c3f96167303a5884816f10983a03213fb66fd96e032eb4b0cfbfeb98ab1ac662c585143e60f7a0f85dd465554498b4b03ff35887e5061fd1f2b8be60
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.13.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.13.7.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.13.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.13.7.ebuild
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 689340378c4a..3e385054e0f4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -56,7 +56,7 @@ EBUILD glibc-2.25-r5.ebuild 4966 SHA256 ed5fdeab50bec85ee4c5127b598cacf66d1f2b74
 EBUILD glibc-2.25-r7.ebuild 4967 SHA256 3793570b4b1bd9bfc3475ba7edca14683b7c5ec9653141f2d1a67751d85f8f65 SHA512 242db7036410f38e18d9dccf75599602d190acdd6b36c344227383d62853526c398c44f88612628de857b7a8ee6f1194d123a1f4e13c23684ca46482f540f91e WHIRLPOOL 952248ef8b7b31c45e6136141cccbf6544f11f01d006ba9d9ba44528c8bdb8a4cf2dab9a0ce707c74987d71bd5b792e618309750457f72242932870a2d99900b
 EBUILD glibc-2.26-r1.ebuild 23722 SHA256 899859c6118f79e8a74ea4bf962ad05b9c6f7556aaa5fecc725529e4a5139470 SHA512 3ca6176057d707eb408217d19801cffc180f1c1f29b7031ce1b60b600fab92843354a4b41b3a05e195a526c81b3aa1c8b9fe936773365d69c6b3195eb6a4bdd8 WHIRLPOOL dc1d21e11cddbdb3e62ddfce6258fd69e2b79f159a9a98f769a6e38fff723cc074136923a7f2cc426f188fb25d780a0f8a48c752208c830f5b05371a3d7b97b6
 EBUILD glibc-2.26-r2.ebuild 23725 SHA256 f67f77719efc019599fcefa6f54e1c5dd6f8ed90a0afb42307994d7d42b5ced8 SHA512 e9ef1fb2811ac3df63ea69f6f72d34c049917e8760ddb6526d10cd372d11958bfcff7de6d170553970de9a1a59f8eaace01743fa456a5bfa7156461059d30329 WHIRLPOOL 091ad1a6e474082e960a4a0b32a8fd461826a5e7a71b932f0c309c3e0eed7e97e664fdd109f945848a9fe77c6f5abc059555e0f4c258d3a9656201ccbc8c5aef
-EBUILD glibc-9999.ebuild 23727 SHA256 4a47827f79af8a242f802a8bc4931edd714000a2cdb94f3844a96163c0ad612f SHA512 64fe6c86b3bb288ccb1f60a035d3cc26762b1d950c178b8c9717f422390783974417e7a40e4f29f77d790c31571e3d6bcbdd0200f401d129612c81c3d80b4f4c WHIRLPOOL 8fa3b2d67e4eac18332461e3a40a3ff11293fdf0ac866c21f4a6a7b8485e2234e1d471b1eb6ec264fcbeb12efe60872b653484296ce6d9a3fbf20ecb7c9c2348
+EBUILD glibc-9999.ebuild 23470 SHA256 de9ebe62576c2aec9b4100f721abe27e59654a44dbc28e760eb162da153c9264 SHA512 b8d8a5570e0979e6e64fc918ee8a6d62ce85aa66bcaf63c71f1b3ece630e937a0f0ae474858d3f18971c83eb0ca2f97743f73ef5f248d8745ab78b478bc342cd WHIRLPOOL 07f2d457468cd1d0f6062d696a9479963bf533dd2615a2d1e387a2c0e5bf390e5261ca5a308a2ce3acf34b4f9277969570b2d77f48fb15597c5b685050242345
 MISC ChangeLog 17234 SHA256 6aa54d20b4de284c51e7d0691f861af52e68376d48e91788c79f8ee821300a91 SHA512 39aa17d86df6c1d53c9c2ad268b2123bafccd45a226e064e3b759bda73294c7896d43f9846bf2fa401d29fa04efecee414674d923bb632915175adf7e8b24b2b WHIRLPOOL d60c804c21d7b0065aca45a3f761f0c81f96fe681d60df7f33ce13c879325d23a9908a134f948e50f3c57b5c596c93d1b04932bfb501e88d6d1d88847df62d32
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC ChangeLog-2015 77895 SHA256 d7c16b77521b14a7e1c148f1ad699128e4fcf7caf41a77b46844508ba68acf15 SHA512 1a7fee53e1ec55d0b16b949543b01ad6f429f74293cb6ed730f05a3ddfc4a21fdaf7ee80c0c839d456587a207780ccfefdaf68a236989db5129ffba30c77ff5e WHIRLPOOL 48d46ac586309e415b7d669598c330062afd6fcb2668600d5c62e234d5ab8c3dfd2e81d4f528689efb6d5fb5e2ca5e24c68a4c58be52e1c336127d63224e18fd
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index dacec0b7e245..f8e270e663ff 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -15,7 +15,7 @@ EMULTILIB_PKG="true"
 # Configuration variables
 
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/glibc.git"
+	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
 	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -64,6 +64,10 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 
+just_headers() {
+	is_crosscompile && use crosscompile_opts_headers-only
+}
+
 SLOT="2.2"
 
 # General: We need a new-enough binutils/gcc to match upstream baseline.
@@ -108,6 +112,8 @@ fi
 # the phases
 #
 
+# pkg_pretend
+
 pkg_pretend() {
 	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
 	check_devpts
@@ -191,6 +197,10 @@ pkg_pretend() {
 		fi
 	fi
 }
+# todo: shouldn't most of these checks be called also in src_configure again?
+# (since consistency is not guaranteed between pkg_ and src_)
+
+# src_unpack
 
 src_unpack() {
 	use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
@@ -199,6 +209,7 @@ src_unpack() {
 
 	# Check NPTL support _before_ we unpack things to save some time
 	check_nptl_support
+	# todo: 1) move this to pkg_pretend? 2) use proper functions for kv
 
 	if [[ -n ${EGIT_REPO_URI} ]] ; then
 		git-r3_src_unpack
@@ -211,13 +222,6 @@ src_unpack() {
 
 	cd "${WORKDIR}"
 	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-	# pull out all the addons
-	local d
-	for d in extra/*/configure ; do
-		d=${d%/configure}
-		[[ -d ${S}/${d} ]] && die "${d} already exists in \${S}"
-		mv "${d}" "${S}" || die "moving ${d} failed"
-	done
 }
 
 src_prepare() {
@@ -277,7 +281,7 @@ glibc_do_configure() {
 	# we accumulate crap across abis
 	unset CXX
 
-	einfo "Configuring glibc for $1"
+	einfo "Configuring glibc for nptl"
 
 	local v
 	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS ; do
@@ -296,18 +300,6 @@ glibc_do_configure() {
 
 	local myconf=()
 
-	# set addons
-	pushd "${S}" > /dev/null
-	local addons=$(echo */configure | sed \
-		-e 's:/configure::g' \
-		-e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \
-		-e 's: \+$::' \
-		-e 's! !,!g' \
-		-e 's!^!,!' \
-		-e '/^,\*$/d')
-	[[ -d ports ]] && addons+=",ports"
-	popd > /dev/null
-
 	case ${CTARGET} in
 		powerpc-*)
 			# Currently gcc on powerpc32 generates invalid code for
@@ -325,12 +317,7 @@ glibc_do_configure() {
 
 	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
 
-	if [[ $1 == "nptl" ]] ; then
-		myconf+=( --enable-kernel=${NPTL_KERN_VER} )
-	else
-		die "invalid pthread option"
-	fi
-	myconf+=( --enable-add-ons="${addons#,}" )
+	myconf+=( --enable-kernel=${NPTL_KERN_VER} )
 
 	# Since SELinux support is only required for nscd, only enable it if:
 	# 1. USE selinux
@@ -399,7 +386,7 @@ glibc_do_configure() {
 	# this overriding check.  #347761
 	export libc_cv_hashstyle=no
 
-	local builddir=$(builddir "$1")
+	local builddir=$(builddir nptl)
 	mkdir -p "${builddir}"
 	cd "${builddir}"
 	set -- "${S}"/configure "${myconf[@]}"
@@ -420,6 +407,10 @@ glibc_do_configure() {
 	# to lie and use a local copy of gcc.  Like if the system
 	# is built with MULTILIB_ABIS="amd64 x86" but we want to
 	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	# This reqires net-libs/rpcsvc-proto now (which provides
+	# rpcgen) !!! Needs analysis how to best add to deps.
+	#
 	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
 		echo 'main(){}' > "${T}"/test.c
 		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
@@ -504,10 +495,6 @@ glibc_headers_configure() {
 		${EXTRA_ECONF}
 	)
 
-	local addons
-	[[ -d ${S}/ports ]] && addons+=",ports"
-	myconf+=( --enable-add-ons="${addons#,}" )
-
 	# Nothing is compiled here which would affect the headers for the target.
 	# So forcing CC/CFLAGS is sane.
 	set -- "${S}"/configure "${myconf[@]}"
@@ -544,14 +531,14 @@ src_compile() {
 }
 
 glibc_src_test() {
-	cd "$(builddir $1)"
+	cd "$(builddir nptl)"
 	emake -j1 check
 }
 
 do_src_test() {
 	local ret=0
 
-	glibc_src_test nptl
+	glibc_src_test
 	: $(( ret |= $? ))
 
 	return ${ret}
@@ -719,9 +706,10 @@ glibc_do_src_install() {
 	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
 	doenvd "${T}"/00glibc
 
-	for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
 		[[ -s ${d} ]] && dodoc ${d}
 	done
+	dodoc -r ChangeLog.old
 
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index e8ffbd33d838..37ec08b85856 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,6 +1,6 @@
 AUX fraqtive-0.4.8-qt-includes.patch 438 SHA256 85a5e6e5617edb867a2bc6af51a963de7b4270b0c59f9ae9a3ef0bb32489bd80 SHA512 0e5ea8dce236a5cdb8086ab0671360aeb15a4d0ac9703969be28373315288d59ccd31b013f932c77bfb5a64faf917f311c30c7cd25c006f08be5a5f40f5735c4 WHIRLPOOL 538ad07ee418b2436f12bf32b0dd7b08b6f39c217a644423410403416a4106305544632c15d083271a3430f99120ee1df893d2ca6a3e90c84068ea61daf38ec0
 DIST fraqtive-0.4.8.tar.bz2 260484 SHA256 dbb21b5e6305cbf02c27aaedb12c5125ac873600bce10d12e88b2305a2083cd7 SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942 WHIRLPOOL 29bfc8574d63ac6e77c36531e1dd9aa63810af12e6669f8248c364f6dd42088ac1418cdce6c1b760dc922bbded65b148e0079f8c56df69e27f42b093212ee7c3
-EBUILD fraqtive-0.4.8.ebuild 1301 SHA256 7d98b616423abaca3e82edbe42d11487707b0ca4877a9d39cc49c7347f00e64a SHA512 5ac3861ad1784d24a8695896a2dff1cbb6d1180aef27e4d0a2de1a87d0b1f2f789b9ff75d880f478326b7337e7e413f17220e9110bbd989fedb74677c628b3f0 WHIRLPOOL c520f76b07e099bbe921d2447074f8dc34b46e5fda3b3e092c6889d5c5912d323e2eb24ed95ab942a9492cb64b10e0de38776ea83f88f584ab26469e36858f5b
+EBUILD fraqtive-0.4.8.ebuild 1178 SHA256 227c976456eec1e4804a508889411c659153c4af14ba2ae36f1dbd8e74121830 SHA512 879eaed73ee04e303bf92e7f07002965f1f861e04413919c9b3eab5c1581f1f3659e75987e861a86c37d06e40f09ec75a24369c4b48c6e7650f53f976d6b9a32 WHIRLPOOL ba14136df08a4293b474984211e144568b097b2229188549afe3aa666ae83035c0ec0ec75fbe5666e4af71ebebbffe1a009096be6ead7d9f8876e4ce800dcb33
 MISC ChangeLog 2484 SHA256 f0c8360f73c086127cc39258f77236a17cb6cdc554bb9e7aea98b8452c36e910 SHA512 508bb483e09c5dc14b588534cae00fe586db410992819fa1210d0f3d2de7d4e85e2a889ffe94de3d5a0def11d6f8869bef3dc8ba1c531b725d72be700fe2eeb7 WHIRLPOOL 04c7834752fbbf0c696160210eef57fd7ebec7980d511998903ff335b51432252936eabc120990be29ea73f5778fcf857d43465a50bd166dee7cb444e311fb31
 MISC ChangeLog-2015 2744 SHA256 511829def18d1da90f9f525e7a408019f5a7b6d89151225730bedcddc188f99a SHA512 6427191396627d315d93c0d87008bd4db9236fd9bce8697387cff38f99ed1ce42e0f3854a76e9b8b37fb37db38b4214f6ab57166e2ece532cbee953e66e32d81 WHIRLPOOL 1a475069923c7d21a00334f823b5b3b101b57a67723445abfad571c32fc85f93bc20589ba84f6651a360fc3d29248dac4f50c3ab1c495f2a4629ae8ca3b84a1e
 MISC metadata.xml 364 SHA256 d101c47652c2b64ab73afe9ac7ce60807cbc33dea4e455aa1243a797362969c2 SHA512 b3343bcc5cf584c4bbacb0d54e353bca91c3112d9d906dc920ead427fc964e7a71bc632e810f6047a293d00325dfafe532067b6d0d5fb9abcb797ae83c587604 WHIRLPOOL 12c77ef311a443b106e02e8020f73a233394951ba5e6f9e1747f001c7b0a948488a9d3cdf2dabf353ed049c14e045af76624c12773205a348efb9a12e52af8ad
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
index 5c0a787ab56a..a97d45c95d52 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
@@ -5,25 +5,18 @@ EAPI=5
 inherit eutils gnome2-utils qmake-utils toolchain-funcs
 
 DESCRIPTION="an open source, multi-platform generator of the Mandelbrot family fractals"
-HOMEPAGE="http://fraqtive.mimec.org/"
+HOMEPAGE="https://fraqtive.mimec.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="qt5 cpu_flags_x86_sse2"
+IUSE="cpu_flags_x86_sse2"
 
 RDEPEND="
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
 	virtual/glu
 "
 DEPEND="
@@ -49,11 +42,7 @@ src_configure() {
 	# Don't strip wrt #252096
 	echo "QMAKE_STRIP =" >> "${S}"/config.pri
 
-	if use qt5; then
-		eqmake5
-	else
-		eqmake4
-	fi
+	eqmake5
 }
 
 src_install() {
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 96ee32199d96..303016075d9d 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -3,6 +3,7 @@ AUX sddm-0.13.0-pam_kwallet.patch 391 SHA256 dc46a0132cf0ea722a69cff45ed1ded3c93
 AUX sddm-0.14.0-avatars.patch 1470 SHA256 b091f02d6d5b2ddc9d5208b17213a181c6e8deae23e5633d694119e79b66d38b SHA512 09a2b487767c4d84e9bb1225d27e21a6716c7c299b5f3aff5fb4934d1ddc3659658eaffcf30dd60f2c83389a461b4fe91c23cab4646c740ef5eec658e14a1eac WHIRLPOOL e84ffc8ad6c6d40df7dad24ae60d5a7c0a387c5ad0dfa93d29cc307cedd541180398d7caf1925177e43fbff093dbc1fc36f872e40c57dcd80bf12ca2910355eb
 AUX sddm-0.14.0-consolekit.patch 322 SHA256 a998f8a2594cd1e81f402605f01075477a017269b0ac93a22f5faa7d355d18e0 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a WHIRLPOOL f438b0ceb638a4d6fc0d2999771a1c6dad280f4dbb263d73d458e32c09bb6884b32efac24e92001b4abc324e4e347a3360b533beab82c06022cebeb6edc7d6c1
 AUX sddm-0.14.0-nsswitch_conf.patch 1158 SHA256 8b31740cdfcc540c81dba5e190482b1ccdb29dbf2c7d14225ddfda701c3730c8 SHA512 9449c0ddb984e685c6440a9b8537cc57410df8092d549851a8285546ee0541fd3ac2eae7a62fe57a670006e930fa2cc54bb9671ba373fef914f34a9b219d4529 WHIRLPOOL 2341cd5f142fcb76b4319fc05992da0e4055e273a433d47b7b040cd7f9a99584927b2ad07636e5b390e401a09262f147eca0dc3595ed1013f86af7f63c6fc30e
+AUX sddm-0.16.0-ck2-revert.patch 918 SHA256 450679a1ca87e6694c1ae0c626660b35d831f16f6ccb1a1fe491271a0b7cfb3a SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60 WHIRLPOOL e6c700e24562387c58237bcdb384928f385d68462b5948bae2bfd6bc189190ec1a671de7d0e6eb7bb33522fcb2c773b95ff4d970bb4bf349be24229065cd8e12
 AUX sddm-enable-elogind.patch 1754 SHA256 b216976029dc425bc05486ebe276ce65b8d188ebd142856f13f44904ed733a4c SHA512 457a49650b07df2edd836201f00858245b1567476e7e1f6cb4e74e80deea404588504d1895d050cab4278ed3273e71131d70226867e5cf8846a7472f98f23ffe WHIRLPOOL 6d88e1c7eb4bcff23805fffe5b164462f43727059b0058a22140a953dbdf3c153e526513c2ce656f9894cc58eab22c1914e2a30b209dfa75388c05e09373420e
 DIST sddm-0.14.0.tar.xz 3298360 SHA256 7e348258618b20f777767a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366 WHIRLPOOL d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 WHIRLPOOL 48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
@@ -10,6 +11,7 @@ DIST sddm-0.16.0.tar.gz 3523735 SHA256 f7f73c6dd6d544ec2c5e4657e181f60467ec31d84
 EBUILD sddm-0.14.0-r2.ebuild 2332 SHA256 1a0083b134f33feb4b1014a2c3a5227a569ac6a2904feeabf3a09e41564c223c SHA512 b67ed7c8582b205972ebe2847d87a08cd24c3c9c2d6f77bd81bc89503e49cc380c6fa7af6722639cf92df1414d96a21bafd4978b0b08127c37e2419651e6bd71 WHIRLPOOL 1dc114783af75071c4e174897eb1deaa0c0e0db45aaae378d4ccce83f61707e1885a0a8e915e1b40f30ebc28d15877ab810b530028a4f9d749eb66aa11e1ba60
 EBUILD sddm-0.14.0-r4.ebuild 2542 SHA256 58114e9adf0f20ccb18e573a02164c4c3a9745c83dad1f3b83655ffc440769f3 SHA512 2cc87d0c84fda296121afd7c8fefc8c237f8c4ce682e6f552d861f3dc6a318c105e0cfc6066c87fe9be1142cef9ad83125e9b393f0c17f0a51a81e31d82e39f9 WHIRLPOOL 5393d4e0510c45a8de9bbd5a39b287af11ae06697003664e7060e0e40b06a2e269aa20aa0bb84517bbea2da950b0e5fb7095658e95bd27eafdad520cef5d9489
 EBUILD sddm-0.15.0.ebuild 1578 SHA256 6e738dd5bf6f6439256555fdc1f1deef106852a5b4767ce6a7ba657cf2e41194 SHA512 1635e9649279e4a8899e7478d13fe4e63fdcf43ec0204685220eaaf1716dbdf4c4eaada9079b8b6bae302d0c10c412a47b5fd99b774f498746d0f46dc7a81dfd WHIRLPOOL 4b68be654dc880c1a71eeb1d029d324174d986cad5de4f3f06b29d254238fe2de41f1af320d4ee89bd09c9c17f81143e2a52ec4b6f4b5650df9bc184d4c3cb56
+EBUILD sddm-0.16.0-r1.ebuild 1628 SHA256 e976e4e79e0f9448b0fa645b78fd82cee9a469510500d7b75aedb3f16a989f1e SHA512 fa13f0f94e8eec28d8851ef6963acbaf188d96e8f365b940e2efc2110ac0376903f14b7a311ba30ee0598222f93083235cdb299db617ac620bc6a6a7666573db WHIRLPOOL a93d7a20fd1971c30fcb1c29af1149ccd7d41bcc9d02e0a206fad16fcdf492fdaa1cbb2cbc65d07825ba57e7fa4f146744d3f5dfd46ff36320d5cfeadb9b7ca4
 EBUILD sddm-0.16.0.ebuild 1578 SHA256 6e738dd5bf6f6439256555fdc1f1deef106852a5b4767ce6a7ba657cf2e41194 SHA512 1635e9649279e4a8899e7478d13fe4e63fdcf43ec0204685220eaaf1716dbdf4c4eaada9079b8b6bae302d0c10c412a47b5fd99b774f498746d0f46dc7a81dfd WHIRLPOOL 4b68be654dc880c1a71eeb1d029d324174d986cad5de4f3f06b29d254238fe2de41f1af320d4ee89bd09c9c17f81143e2a52ec4b6f4b5650df9bc184d4c3cb56
 MISC ChangeLog 9132 SHA256 b3c4811eab359e67c259d59550832dcb14fb4ab3ddeb71d23edc2207bda83c15 SHA512 32fc4d222b2316a4247cee25798050094983b69873e3358611d908ec030ab7c5b43c64c92a59e88aa37ba2c3ce97556ff1e03d33c6f0b90a0fdcec0a9825c2dc WHIRLPOOL c427eb05f0f819c4d6cff7d007e8d9ab7816e1fe9462af81f688bac0f649028b2137798ef40553b69d2be032a3eff971ac7875065eaf2d73759bd23e29bcb390
 MISC ChangeLog-2015 3391 SHA256 3512268a5a75b764800ce67e516270f4482390a1f9ab958ec0627dc4403889e8 SHA512 3ec070987205570ba6efa11b7feca3fa42a96d2ae4997dab21c713eab043c883d9f6b7073c8572314fc6793374a6061dfa9c0eba812de21de7869c284e5b3a6d WHIRLPOOL 440c4354b7e61f5022f1f728d3a1346b8cea88eeeade570f9b3ba83a67faf26987e532e5566f272df49d3af30c7fc745983273b1cb8733625690e5fa1a6776a1
diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
new file mode 100644
index 000000000000..bbe2a272840c
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
@@ -0,0 +1,20 @@
+SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
+has the same interface names as logind.
+
+This patch forces sddm to use legacy behaviour when consolekit2 is detected.
+
+Bug: https://bugs.gentoo.org/633920
+Bug: https://github.com/sddm/sddm/issues/903
+Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
+
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -60,7 +60,7 @@
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+-        available = true;
++        available = false;
+         serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+         managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+         managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
diff --git a/x11-misc/sddm/sddm-0.16.0-r1.ebuild b/x11-misc/sddm/sddm-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..3aaacde32ab8
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtdeclarative-5.6:5
+	>=dev-qt/qtnetwork-5.6:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.6:5
+	>=dev-qt/qttest-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${P}-ck2-revert.patch" #bug 633920
+)
+
+src_prepare() {
+	use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}