gentoo resync : 31.12.2017 (final resync this year)

697 files changed, 5590 insertions, 7082 deletions

diff --git a/Manifest b/Manifest
index 72940fc865e7..8f9d9c3c2102 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28822 BLAKE2B 573a40549a72261ec7805b512f56fdb1c43ed50eca83cdde3f5e4b955ba391e3722407ae017e54505a2d182cc16333c49e0ad1d73d4157fcbdff14b60298dfb2 SHA512 e113a24df8987be20df33c86373faabf5aeffe0168662f9b49f2acacae1987747b4bfb353dcbe6b73682bc409e4646f5c655cc2eca1f336f4c79f2e796db536a
-TIMESTAMP 2017-12-30T00:09:34Z
+MANIFEST Manifest.files.gz 28830 BLAKE2B ea82ad5b449136e07781b11078d0439d545b011087e99d20fe2a89ea52aac3845653d4ffbb8729c0cb0cc2aa3dddb705d46253bd8d81bc125954270d5ed2ee15 SHA512 2c382221eb2665d9abb7d43cccabbed30cc9d134365e0f1fba806f286ecdf212223474b82e3c196d05fc651a1b36163440a9e14bf407fb50364027622397425f
+TIMESTAMP 2017-12-31T21:39:38Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpG2T5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpJWRpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAPkg/9GlnnDbrjRHyWdqIaCazb/mVCmfyNPjn7MTqtkg3H5YpYUaf22fyKeoQ2
-S443NRFsoakiZUzRmVNdg3p9rWZ2+jl6oUTgPyg9efSVe6SS41Sh7PV70GPk9q1M
-Dg8sYb6ypcAYubUmY7+B0VCzNEVitV4C2z984kYBEeG9VlrvWcWSVpjK2OLJcG6s
-tlIVRtQOVsT3LcS5dCW8a2jKixxDu1vZFQpJoDV6ms8pSQYZgTuIiqK0BNqkZEEU
-/shff3cN0qR2ws8wx+5zlB7g4f28dhvEhWmXE6eI4INhaq1buN8iF3uJ88f0P9Kb
-wCUDLzUUXSy6xDIe+Trb4bKCwhtzxJmmzl7O6sKPgNPxSArQ+DX71l1epcpRum9L
-+LAJ4NTio+LCBN8CJtNMUYrQVikelj4+rZh9efHbKgrfmNS2BqW3UP+kSrjBtF7C
-IwflZ7LNIsJVMXPhfI1mtmdYOQT4VRbB/WZCXMyhqb+PSMVDkuU/W3qyLL9E7MMa
-wnHwYb2x1dcJIPD/vTDDhMn8JQerl76gpXgWz7ts9k+1NYTxmdpa7BupLZTyCoAk
-FMCeTIfThg4bNjJKWcXJDJut66SkLcoMwe8y/xWPucvjDEaJiCUO3U7SH4G887Ol
-eF9HcSaemwJb5RzttNmg5PbTNodaJtL0YwTFqLRURW/VOrdM49k=
-=3Ayt
+klDitQ//RiMxye6e7ip4xwRyAApjRY532ipOWsTepyA/ZQVy/SkPVssr6WnT5e1N
+DBYGRwaSHYoHKrEDDyQ8jxPk/fj61Zs5uuP6yClHz3n5Y86Pq4mLQzVwsyfaYmIC
+mAGhtnO2CsBoOxBYL0nCcHSZtWcKzdMvXD7bJXJifPOrIPC9m2zz4i+XLyf0J96K
+BOX8qj0PawQ3Z47oRXCzAztLxsbrLQH4E38H6ya/ZpLZ5qMi6j5wcn4vyvVguYUw
+uRTzdFSsBcNIgtHRIoinxYLksv3C3cYoUsCGH7QF78FmfuBI371jFx2I9CSgEnYt
+EMVeS+0g2wRp6cNBLt67WSq4fgKt+x7gLcL8zLZPpx6SaoJZc+zUgAAPvHynY66d
+TI7/xiL9sSbLXQqmuiwmL+as9+ORiCWI9Inp3nswMc2CS0YTMQNgxX1ggBfeCvFE
+5IVP/zfby5A/47/LFz2yo/cZMJ+lWsD2M5U1ypKY7UODYPyvk+xuWWbksk9j4SD3
++pWogZPH/NUr1SBl0d48nC4crSsxhL8lc/MsLGyOLEOzketd+xWLKoz1B1JIgv3a
+iY5zqylKXnK2sQ4D+mEDSSJ0Y7nFT5q9737H+MTpqHO4sgIbgFl32CCWcfCYBkiX
+w7EWHbEf3Gu5Wf7vKOcJgTXoK7hIfPoZeOb8SD4a7sCXJOOt3Tg=
+=oPkL
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c859f2c4d177..82f928bfec70 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 19939017c1d4..9594cfcfbc35 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index a3283d04704d..2b7fbc689afb 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,6 @@
 DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
-EBUILD ansible-2.4.2.0.ebuild 1447 BLAKE2B 7a8f001745877bd10f5dad1d1d9b8b684acd216bbbab30b5fe6ee9f8cee3de36999e264402f3540237586f9e75c82d1bc2244342912621805c8ce1839c134b95 SHA512 3e5787d43637e837f50f793dc3e85e3cda21496248021639832bffac8ac178bec9977af653a7514d82f1b31a9c0070691a407ee6107dbc413dbdc324b2a6a9e1
+EBUILD ansible-2.4.2.0.ebuild 1445 BLAKE2B f00ce2aaff90cbdff9a6eee800a61bfca78491671a3b8e7c931fe8f24cced9b6b8bb5552f42d34b106d8b101173c373f4ee69f8dba8738936af3866e946164df SHA512 2f731321ff758ca6db6cd90701ae234cd63fb84f8dcfe730c6b2cf824fb8f801ceb174e1bde7b3f3e9d14723574ff5c18d5ca68c82b27192aef3d4b355df5ff0
 EBUILD ansible-9999.ebuild 1516 BLAKE2B 7035a4e11737fea1c9ab5256fe315214e73650630c4437f55febdf652e4900bd8bda1dee61e5e0a3084705910da86cdb29928e6088a42359669be531860c27ab SHA512 8e36c88f99ac27adc56de04d187daabf63278ca902ff4fae23317d5f5e900e856b2f65b6a44067cf5a0169d152d7467dd34c53751e34ab1bf86afabe479e873f
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.4.2.0.ebuild b/app-admin/ansible/ansible-2.4.2.0.ebuild
index ce8483dc7145..bbe7fb86b296 100644
--- a/app-admin/ansible/ansible-2.4.2.0.ebuild
+++ b/app-admin/ansible/ansible-2.4.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index 4b4c5e5ef424..13d27bfcde22 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1,3 +1,5 @@
 DIST yadm-1.07.tar.gz 34240 BLAKE2B 11952a693c38aac2f2e7fa3efd469dc640941ef9c75a8a1e70974b4eea37c506df7480b2fce84ca8482c932295923ece4ff52cfc13bf9b52030dab0500f07c86 SHA512 9bbe33c82a137375cb27916ae5b5a06f06c25a75ae05688be473103c29154309d3472accc0aa0670a80a4714bc6523ab85c41fd6aa8d1909586437c5778b9144
+DIST yadm-1.12.0.tar.gz 47340 BLAKE2B ef710f56c96244c082bfcc887cae4aee00aaaadec5e7466500dde263c5e4f43df046e11742fd275e989bd9704b39a123f17248cd70d64f6ca552b28db6c44814 SHA512 402a67770154ce3ae7ab947ff4d4e26ca5040d343110fb749195ca5c3f4ee435aba1d8cdf02d4ecf4a81d3f331c1b891bed4fb3fcfcc893867e0fce45b9c8cd8
 EBUILD yadm-1.07.ebuild 895 BLAKE2B 30f232a9b56113aeb38d9b500fc4964e21d705095a3e74214159854a4b2613635a29cbc0ffed322a627805de7b6d25b41b4749e4a5fb38a652a919b9410a5b56 SHA512 7313f9adeb78b32db14351ddead4d8c13cc81c49ec3cc7ea9d78ed4318bee9704d99890a9fc403679069e830583acbe8e37d32bcf91cf4fc25839f9715a239fa
+EBUILD yadm-1.12.0.ebuild 1234 BLAKE2B 73b60da066947ed5ff45950e5809695be1b234e01005103eee4076efcab65fc3acb193716590974caca0a5c209dc13fff77ef85f778c5aa2f8c65d1c67e9ffbe SHA512 9321ffa59728389909b187a1da4cf230467ab180f9ecc24e3137dfc1909329ab68e40066c622ad1c411ff5ed3dfdce9c6b2c1f69ec77f248d7e2361e38f99218
 MISC metadata.xml 825 BLAKE2B 6fbf4554179cf6141396b8e21be3dada54c0eec7c5c5bd1e18860b73f1d170044006b92010f7dd5d3c2238f8545024ee43dc2c86305e8bc91871acdd497c8749 SHA512 0c8facf902245118eab0d6c4b48eb5a2fb63aa6cb7fe4581cc0353bd164912b7620eb2f42984b45410065d3a6e1af1cffa5028f5c26a4ecd38a9983da6b34feb
diff --git a/app-admin/yadm/yadm-1.12.0.ebuild b/app-admin/yadm/yadm-1.12.0.ebuild
new file mode 100644
index 000000000000..e6b2381a71ff
--- /dev/null
+++ b/app-admin/yadm/yadm-1.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="A dotfile manager for the config files in your home folder"
+HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
+SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zsh-completion test"
+
+DEPEND="
+	test? (
+		dev-tcltk/expect
+		dev-util/bats
+		dev-vcs/git
+	)"
+
+RDEPEND="
+	dev-vcs/git
+	app-crypt/gnupg
+	zsh-completion? ( app-shells/gentoo-zsh-completions )"
+
+src_compile() {
+	emake "${PN}.md"
+}
+
+src_test() {
+	# 109_accept_encryption tests are interactive, thus fail. Skip them
+	# 113_accept_jinja_alt.bats are depepending on the optional envtpl
+	while IFS="" read -d $'\0' -r f ; do
+		bats "${f}" || die "test ${f} failed"
+	done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -and -not -name '113_accept_jinja_alt.bats' -print0)
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "${PN}"
+	doman "${PN}.1"
+
+	dobashcomp completion/yadm.bash_completion
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins completion/yadm.zsh_completion _${PN}
+	fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c43e8263c1e2..891ae388cf8f 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index 52036f6a8a60..57ee2140c233 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -3,7 +3,7 @@ AUX Makefile.patch 350 BLAKE2B 67a2e4b01be33fa0151f018b06a80711e4c68084fc5ecadbf
 AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 DIST afio-2.5.tgz 179184 BLAKE2B 2e4e31b27ce7c7cc60ea81d6d7101289e8cfbe4ff6a52c185abef482e06d233c739e60d40bc2ee35c79405606e5cfe27746813a8e74dbbe1b407d4092707aee5 SHA512 8e8fba115989b60284d09fb37b8f4782b6adc4a0887a05544615a38e62c6b3a48c3194b53ea4496fea64b25d420ff89cf6faab31646998f3612082118fcbb052
-EBUILD afio-2.5.1-r1.ebuild 691 BLAKE2B 064eb754b4257839ab92953a2daa90611014c1714f3c30df2eeae4c5f7cdb525ffa786834a1235028c696ea1b9917a47922fbd66de78e59cd83e47a261c17155 SHA512 f058255a379de4d9c2ca78c2b0c860ab0cd36c87daab8116d35120e8f080591539e96e218a7983c692858cfc534bb0bf361f8428dc16e4640f2c9976448ea60c
+EBUILD afio-2.5.1-r1.ebuild 690 BLAKE2B f5aab1c72bbc7f21b741563586e9cd714ca32ad4834128635c3f71d5b33c359ec5830cc1fbe52dbcf65dade51ec738bf21cc05370f0950135031369848b8d2eb SHA512 63dcb8bc259e45c5757ddac95df5c2d3987a76107d75f1bd047ec7d0a85bcc4515a97bbcb94f8d0895726d3efe577faf8a3897507f1944a725e08ed848831175
 EBUILD afio-2.5.1.ebuild 666 BLAKE2B ec8dd3cd9796a9a865c3d6ef985ae57e1ed2aefe1d86a4ab1141a0140edfde4863428c20848562c2716fbba84f91ccc8f92f5d3ba7a7c9adc80429ecdb789b3d SHA512 f1e396c6fa251be9a1753af5c0bf979af3bc348d9b6bb1d33c6ba048e73436729df9ff342a67e55ca72689cdb588fa3b8f3db533b5b99b4ed7a61d78ce483cf1
 EBUILD afio-2.5.ebuild 929 BLAKE2B fb37adb79739b5c0b5ce8fc9bb725f41ab7074c9b0ad8f2751bb682ca086d0cf350e6233f5a57835ffc0b9d760695ddb0767c9ef7af76d7b1f3dde82a5764356 SHA512 884f402c47f65285a694885626ec5250117ee2d988496d4b4c631ac3708b3fba00e254bd54ec25855782225640612f1355889fb0ae1b15c2daa0f93627f4e2eb
 MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
diff --git a/app-arch/afio/afio-2.5.1-r1.ebuild b/app-arch/afio/afio-2.5.1-r1.ebuild
index d5037ac66c3f..25f3a1dd310b 100644
--- a/app-arch/afio/afio-2.5.1-r1.ebuild
+++ b/app-arch/afio/afio-2.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch )
 
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index f58cb20c51a9..ee19fa651ab9 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -3,5 +3,5 @@ AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af4
 DIST makeself-2.1.5.run 38210 BLAKE2B b3e68e1c12cfaa2fb66cc53104fb0ec8148b93fac3a26a7e4e5de64672fca5709edd500039a9ccad5e8a6031997332e1096fe6dc5e92fbe83663aa1f2757dc15 SHA512 c556770deea504573c50bc7c15340ed91c65d372e93c47dfc10fd6e8265b2462842da12b36898d4291cbac9e954ec12f2f6972bcf40e97ed82dbd22af21d3a91
 DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
 EBUILD makeself-2.1.5-r2.ebuild 611 BLAKE2B 48bf67bb209957e2c5358f4b6d1e568fd8cdb9a285e636b0dc0cfa0c0583d815724f26e573cffd36d61ba29b89f85a979896ea1c773408a5dd33fdef7eab4e46 SHA512 15fe5dd43cc8ad08ce85839797acd99d17e7ddd2981eb13a05e266c4f90c232e72990186daaa78e81e6795a9fb49cff86dc52ff6d18569dccb6be5c4c235148b
-EBUILD makeself-2.2.0-r2.ebuild 716 BLAKE2B 80f733052775326ebc5022488696c9a019e1e4151fec02e8cee4febf7313824c8bb6a3f05bdc1ebd0aeae7c09c05dc1973f2aff1a474c06d7c06a8ad6fcefe1f SHA512 4a7bebbf19f7399b078306b26a3a4acb2e9c1c212f7034114ec69148a2042072015fba630094ff0b043c7a1ca2283f7b34ba7112318bdf9acf9adeb79621029b
+EBUILD makeself-2.2.0-r2.ebuild 715 BLAKE2B 7ba61bb3f72497ce715f8ff967fa445bbefdea0156cb031b0e526a482548fe611e872bf50ce2cc9350b6510a45ba8ef6469e9cf60e5a92ffced85356e11db439 SHA512 77745020a9a88e05407bc3e17fcbdfb10780a74ea3039c029c4ad8b66f85157c8ef56baa750d2e6506d81526c883f75a8cd4f8827681ea6aa74f25cbf07a6d56
 MISC metadata.xml 254 BLAKE2B 3ab17d846132717878fe0587992dc65ac209a16e145e687773a2221f2ea17cb0568d03b4c3b20954ff4ad7deb6e15ead243d5b0410742c2c4c7dd24c56d69081 SHA512 fb782a70e1be3e60d1cc5465b54e05eb5eb3956d281d0951cc53a7b0f320255bc0ec62ffd08b18c765dd6ee0ad3f8c364c93c52ea884375f2782a1bcb90fb9eb
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
index 52c5aa12b2c1..46e3361cfd15 100644
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ b/app-arch/makeself/makeself-2.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index b45df0e9f7ba..46e2c08af4cc 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 4d366c994a15..4df0ad8857f3 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,4 +1,6 @@
 DIST borgbackup-1.1.3.tar.gz 2942183 BLAKE2B c7ca37459d35e06694cf9fdbef7328806cf03e6a4290368d47a2c06e1b6a0700d9dbba3efb170e130c7e59951d65ff8ca677955782150154f0ad2d12b93fe57b SHA512 8378e4f805bfb3e9a4e454f5ccfa58eef0517f13a2e8a2c3c6cbdb0304b763fa67152963b17d677daff09590eb777f12fbe1f3f69c3459bcc68781e5a747cb49
+DIST borgbackup-1.1.4.tar.gz 3390046 BLAKE2B 27d1743718b9fdd303dbc7a01a586b9f87c119ed7f2464582a229bf2357c3f7d929bdf614689be7d7306a707e7332b8ae0ce5bd9898cea5af2311ca2210c5f41 SHA512 0853033f72406a2913dd74c6ebb8b33a318179843255c92481f5e4fdd0f436de6e4c77eed259a422e00bfadcf260facdfd00c813bb0628b82b8ff63a87e1bcfb
 EBUILD borgbackup-1.1.3.ebuild 941 BLAKE2B 385972a0e8f3321c04148651c1d6ded98bfd520235000762a1c29fc89b4226cbdedd64fc8e3191686e082982670261299c9e4dfc4b7733712d991b82d62cde91 SHA512 17d9992a780a59564a41410ebc583dee3a7acf16e26f349856c37cfc33feb2b2f09366808969321ecebfcbf04a86a1f3e305a6fba7e3dcb8ce077470bd2b0ebb
+EBUILD borgbackup-1.1.4.ebuild 942 BLAKE2B 5bafc749262fb831056a1f600c5f1e7e90a118f272182b32464563ee52978aea6c2134700ceca8b1eb5ddfe32c7bfd93b2061b68828c58ad9aa6256660ec806a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09
 EBUILD borgbackup-9999.ebuild 942 BLAKE2B 5bafc749262fb831056a1f600c5f1e7e90a118f272182b32464563ee52978aea6c2134700ceca8b1eb5ddfe32c7bfd93b2061b68828c58ad9aa6256660ec806a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09
 MISC metadata.xml 380 BLAKE2B 2ac9cd2f49c605955fb4133ff30d52e578bb45b0717348e6909cf7cd172ce9a7436d30394466ece7d889d02802f500f86297072a755b24905c17342cd7aee5e4 SHA512 4160c5674dbb51e9e3fa3c0d29fca6b7ab4073f2e2be1a2eca88ff049b4b5f066d04c747130c45d31a9c63ee2fe3bcb5f521017a581e7f6b69eb07fb94b83661
diff --git a/app-backup/borgbackup/borgbackup-1.1.4.ebuild b/app-backup/borgbackup/borgbackup-1.1.4.ebuild
new file mode 100644
index 000000000000..664c1f81223c
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 73b43d2f12da..d931cc242514 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 550d746acd2d..dbb48aed04c0 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -3,27 +3,31 @@ AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
 AUX xencommons.confd 109 BLAKE2B 6a2023a95cd1e411abe57c321e1c5f13096b51299817ce547e8ff042cbdbf859a5c1f50135e946fe650e0ec9221db3389ff50bc23f6d88d0c0fd1805b64786be SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17
-AUX xencommons.initd 1451 BLAKE2B f4a0d356e7135c88a7e80f93221bdb21a4222566a3fe3faaa3c3c09b1f8eaf8df494ccda481c97b603db1fe0b92f416910eca6ad49f33b50b2734c1a8046ce91 SHA512 7cd2f2c8b45ce36bac158d7cddd1c33a20b46beb521f33584249338dcf9ac6efb32fd09bdbd67651cda6ffb6304b21043e29e79e62a61903884a8ebcaabcb4b8
+AUX xencommons.initd 1451 BLAKE2B ef0cfa4fc7c4071b7a5822f4ad8983b9f7c386505e8b6967139c8921b002ff03a0a2be235060160d00d3890cffd15300b588c2b06a67a839df110c3737bbaee5 SHA512 1d25ae65ff073a5fc00aed2011af9e38f53d179dfadd06f791a4599c070a5ddbbf75d80b37e219b6de5d09e3466510c241311cbb018ef22cd3c97ce3b7c15b3c
 AUX xenconsoled.confd 44 BLAKE2B 865edf537c1a935cb78b682be805a8284c05e6c53e4a779bdabb4f43fcb1cfd5224b03f8c1febf8e5d49181ee08099c33970e39ff01028478a038feb7a061522 SHA512 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d
-AUX xenconsoled.initd 783 BLAKE2B 4c75a81a713b2f6c45f655315cff1c0c092f4b595e26faf0d57f0e4712b4b2b96f82b8f950a3c48af804cb5ae0f39a1bad18dfc96fbd3394942b5809cff0955c SHA512 fa8085a6988754e2fc6f776e4a4fccc53864d6946f7c06a97cde759453a8fde7e0577c6f23fe329534f10d25e78592a13399d7f7354f438bac23d0f5ef3c7454
+AUX xenconsoled.initd 783 BLAKE2B 1903532f7e6cea87e0154e752d8263d1d6df29e4722dccca330185012de7f443950fe165d009466b138be378ec19c80c45c0b0a5cde7add94707aac5e67c23d3 SHA512 90f3bdb9d670c039d34fcd082769cb2cf90d4b0f6a46e409bd098795839e63fef11ef856bec99cd712ab36ecf7f2a43db2ca8454daa1a19feddf2e18b92e7824
 AUX xendomains-screen.confd 890 BLAKE2B 91eb128682e7d81436cc3c82e7ae873bac4fbcc5d5f70e70c0ed16eb5af3f4cb61799f39ab275bc30b3d5686f5cbfac8c09aba6937f827ab6afdfe7ed995f352 SHA512 fb7bfc1806608c6e30bb7db367afe9cf75d44e809556c3ba2794cb3ce0c9f35bcfd7f2bfc4a15a8d805f3d57ff082fe9a525cbac3306e64cbbd0ee5cef554505
 AUX xendomains.confd 291 BLAKE2B 8784abad4db4b4b649c4e57a3a1f818cb431e5eaa2277da65e6272f36e421230bfe7feb52b9cade50050c73eac379acd1684d5307fb89ced073345a213b4c56e SHA512 8ad255d39fc0b390c854a64ed82333b6a3041e1247b7a3934cd8274710c168c0017ef2dddbe32c120268d7ea946f8c1b148d7d06a3a4bf415a77eeec36dce2da
-AUX xendomains.initd-r2 2805 BLAKE2B e1cc46e08f753843ea6643e1092a99d7bcf383c035404c492bb015780609a72733db5883cd17ec9ceb89670327c1fc6b50d8dd529e787aa9ddd056675fdd86de SHA512 60aa6b57985b00a4be98ad68d39b6120147947d5633e6dd7190fd35ad1336cc6ade057981fb6697363ce378331f43352d556c18b076f0ac8f22932b008dfe1f1
+AUX xendomains.initd-r2 2805 BLAKE2B 6f5e0cd4a9e3e0e2b4f6ad9b9f9fd9e399f04462e120bb1bf68f63d2afe73689522f3dd127867751e8055a735a2764393aaa6ea5aa10f8191fd5c503f01cee04 SHA512 cbfb37302b0930f608def30dad8942a0c52e1ad8c3f9068a1b125428777e9b8f4d2f41b0cbb1f26cd78d569a196946ff58e21cc8a87f8e955dc1a485f4769185
 AUX xenqemudev.confd 156 BLAKE2B 566dbe6e3a3d3bbbfd1b3cded7b0677b8b94ee3382226f4e8bf30e9e60771bfdca68c5448c63abf94be41c28082f2cbab6f9ea21335b41d24ba7b7e0347769af SHA512 d3cdeaed625e65e60fb22128baf24dceb45143ddf494d7db26464497abc42dbba0c0c9878f1e3908e2910557f4c4d600939824e944938aa251609ec5a1a86ee4
-AUX xenqemudev.initd 1828 BLAKE2B db01ab9f24d0d5b0abef886a8f0b162f4c00289d9f86a545a689e5468e4c4810843b995228d623d5e07108f1d3ed3035cd7ffa82b289525dff96b8ece20e6dee SHA512 6c391f52659117e9d1c8eb8ccd4a9886b207e009903c48f69e1c92c67a1365e64c6e6a02bbdbf3c844cca9c0cba01fa35c235fef0621ee16bfbe75489247c739
+AUX xenqemudev.initd 1828 BLAKE2B 695090fca31cff426c8434fe7a766c491725bcc91975b8338a8bd7d69bd51409bc8b586597866f7dc570e93693c87961e327c720cf44e7e941e1b83a157076e3 SHA512 d9ef6c0446cd2510f79d2117f0ad9ea3605854d1f5f601526706d9563abc72b71b4777c773e39ea1a9a77772e6ac70f6111109696a2621bc4b98c4518c7b589f
 AUX xenstored.confd 42 BLAKE2B 61153f1bb17c78614e215f25f59642f35185f7f7a2e911e04285a7f589c6a69856f914096621eded787b0c23a3f8994076ee15d2dd3e2a36589a65cd585c7946 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4
-AUX xenstored.initd 1058 BLAKE2B 9fbf48f4245276ead9df1f47583b160d20b15ece27ee59b288a1c0e5231a0864c8880824a844e71563735e9fab1199b5596fc4e7390ed47dd5ec8e98856c6e39 SHA512 195a7a8d50d28597d8f66416141d416c32095af5499d5978c6163996ea9cbbd6bfb343f7e0fe7a8835e39c8924906547cfc662e2ddd96ec571f47b3da79de090
+AUX xenstored.initd 1058 BLAKE2B ef28c6f9f1f91dd46d5d431a70736d76a9a72b215b6b8f7955e5cc11abcbadb796d464a3a084b26afbfbe315617e929c207c66126bf5845520a0d9ef1ee75bab SHA512 f07febb0436d65dfab03e2125380b25dc2bcd7512a533879a152ab939a12b1a954b70babb69fc854b37bcb039a8897c2dc84a3988df426946f1e4af310dc1392
 AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10
 DIST ovmf-20151110.tar.bz2 27518370 BLAKE2B c4ba51e59ca3f597d75639a792b1f307a70dc6127917306e6ce182a76646435bec8006f7db9ac5c580e0ad79465a2b2902cffa90139d367c89d16e28280a978b SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3
+DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d08067d3fd639c83f2a379670779ecc60c74c2671ea4eb4a6659fe08ac2d7d4ff337b010b42a908a50829a2d18eeb SHA512 f65dabde3df967224e2072817211786ee4fc3994ee31f8f9d6f67fd74e3479e1da459c720169dd81020cdc1777e4600e531bb124b4625c2ded42c6005bdc802a
 DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c
 DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 BLAKE2B cbc7bad4703fabd05b703c66268df0670e2ae97b77007895dceaf6465b12a2f9fbe3773c7735b307427ad18c61711b20beb7f3ae6b1f1b8b5efda2a847fec0ec SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d
 DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 2c9da971622b4e52fe78fa029107bb1c5f945a63605406493df607c410c6f2a8c2cdb38b1eb30c1bc1c8bc6e5620efad977c3ba55e04c579c01d51f0104afcce SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
 DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 BLAKE2B 6d12a5a5bb7d2be7ca6bb8636648ee219c9526dd34086c929d8cd32d096d2454d6cb499d459b436f228fa49f42ef3a1f5fbe9b5c84557e4054565a9edc0daad6 SHA512 98c601d791661a306e3dce5befb37b80de8a71cdd1759f3da00b199d48e3b9468efd1332e26ae044ad616b41a02771ad07a1c96972103b7e0aa39b93fb556999
 DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341 SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
+DIST xen-4.9.1-upstream-patches-1.tar.xz 24592 BLAKE2B 774c5219d6c14d729358e790d880a1a31fb4cda741e54e71879bff164e79bafbd8492eb8bccb7becdf7a2f9605e71266bb4fc15848deff8f9028ed7f8844f915 SHA512 edbc7cad2f6f8a5c7e8aac8efd5454428aa25e0e13018438f78c7f401cfb9173345267e16c7a5dfa78066a952980b172976409a0c63162094b7f507058e712ed
 DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
 DIST xen-gentoo-patches-10.tar.xz 27876 BLAKE2B 8efece8548a046b47c04e5b9354ca8bdff55affd6c6bc67315ac7536778fbaa183d346e0ff83e365030df2433bddf845188a1c3fb8feaea2e93d5ba0dd1c779a SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece
 DIST xen-ovmf-patches-2.tar.xz 4344 BLAKE2B 1514c89dcba05c84281e9d46ec5c3e9e946ea777dcbe64d1d7689298e187aac2c9a5febf407d79bdb3ebe47563972ea66e0f5204590c5abc98df9cf24549b92d SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3
+DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.8.2-r3.ebuild 13955 BLAKE2B 52f60a82e49dacfd8125b7bafa850d9349192814f4c9cc1ce25e00f0781399f06faa90161941274dbc730cfd8c3c477110d0f4786e3f5dde71b3bb41e6f529db SHA512 405bf5661339cb4384e59cf2c019fbad39074f595dfc6bc6dd00347fb433ebfd843c5c02e29b918cf760390731569fd58ced5f57073edd2db626ca51fd7b1fd2
 EBUILD xen-tools-4.9.0.ebuild 13941 BLAKE2B 5fa54a3ca4a191aa9ca927eb3bfd2daa2a6ef7ec9941e9761369dffbef7f0a2aac9097abb68ceda913ea69ffba9f33f716ce85079f4610c26909afa94617e1aa SHA512 ba54bdc680040454856aa7f950bfed5dc9aefeeaaa9256059160814182a51b3c2f8fcfdffa22c961e614e8cc67eaa1aaec473720982d1956d9dea46abf28bbd4
+EBUILD xen-tools-4.9.1-r1.ebuild 13741 BLAKE2B 65366b9f3a106f1860ef5a7496ec1048f704aee7dfc4f5311636624f5666816d4d241cd4b7baef93a30a93b7e01bac507d98d14780d45eb88144e9df02daf77f SHA512 c765d1f1bcfd9b01878d33abda3c4f8b252d6b54539300a1fcb02833132517ff6cc12a7dc0a8d3ff4df7a110aa44ed535576a43e1175207b0264a013484dd7a8
 EBUILD xen-tools-4.9.1.ebuild 13741 BLAKE2B 52b179de0a023ff0045c819eeeface99bd48adbd3087f4d7c615dc466164cd12a6fa75aebef9c14f2a923c6e34a0baf7c98110148f437866143adf8a4ac842d8 SHA512 2eaa8c4faafa3f191bdcc52d61fb7965c53216a75ef0ee4e65c4098ef77cd06b28e75761b7bd85e80acf0d3ecb66b9e04e950cd382b766649eab353eb757f8e6
 MISC metadata.xml 1267 BLAKE2B 8b9111b781201a51e373b606c888440fe42630f9cb08a43a4bb5a512456f57e7bb4e4f2af0a23d4cbf75489ba01efbc38820a6881317f16a459c96f8717d2b52 SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647
diff --git a/app-emulation/xen-tools/files/xencommons.initd b/app-emulation/xen-tools/files/xencommons.initd
index d1fbb181c3a7..a7c1efed9abe 100644
--- a/app-emulation/xen-tools/files/xencommons.initd
+++ b/app-emulation/xen-tools/files/xencommons.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/app-emulation/xen-tools/files/xenconsoled.initd b/app-emulation/xen-tools/files/xenconsoled.initd
index d31737af7fc5..094871cd0478 100644
--- a/app-emulation/xen-tools/files/xenconsoled.initd
+++ b/app-emulation/xen-tools/files/xenconsoled.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index c1a70815c26b..0926498ceac4 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="status"
diff --git a/app-emulation/xen-tools/files/xenqemudev.initd b/app-emulation/xen-tools/files/xenqemudev.initd
index 90da3ac6865a..9dcbb3f2244e 100644
--- a/app-emulation/xen-tools/files/xenqemudev.initd
+++ b/app-emulation/xen-tools/files/xenqemudev.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/app-emulation/xen-tools/files/xenstored.initd b/app-emulation/xen-tools/files/xenstored.initd
index d92616b5cb90..1b7eec92658a 100644
--- a/app-emulation/xen-tools/files/xenstored.initd
+++ b/app-emulation/xen-tools/files/xenstored.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
new file mode 100644
index 000000000000..4f9eb745833c
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=1
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=10
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=3
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05
+	OVMF_PV=20170321
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+	use doc && dodoc -r docs/{pdf,txt}
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 0b422f392116..276f98c7e998 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -5,9 +5,11 @@ DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 2c9da971622b4e52fe78fa029107bb1c5f945a636
 DIST xen-4.9.0-upstream-patches-0.tar.xz 58780 BLAKE2B 6d12a5a5bb7d2be7ca6bb8636648ee219c9526dd34086c929d8cd32d096d2454d6cb499d459b436f228fa49f42ef3a1f5fbe9b5c84557e4054565a9edc0daad6 SHA512 98c601d791661a306e3dce5befb37b80de8a71cdd1759f3da00b199d48e3b9468efd1332e26ae044ad616b41a02771ad07a1c96972103b7e0aa39b93fb556999
 DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341 SHA512 97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
 DIST xen-4.9.1-upstream-patches-0.tar.xz 6856 BLAKE2B 52a7e3b456d330444166c36ce68b008150831b7bb5b64b4a3dbebfbbe8cd024311f3d7aadd1313b194bd5ce7a20cd2ca5a424754e59589b986490eda97bf5d06 SHA512 9af8861443a708c60df52c21512099a55a6018238350ece962a715b07ade9141cab2d46540b5d5e8e20347980f786f7d28ec130f7e8e03c46ff4808d3b36a913
+DIST xen-4.9.1-upstream-patches-1.tar.xz 24592 BLAKE2B 774c5219d6c14d729358e790d880a1a31fb4cda741e54e71879bff164e79bafbd8492eb8bccb7becdf7a2f9605e71266bb4fc15848deff8f9028ed7f8844f915 SHA512 edbc7cad2f6f8a5c7e8aac8efd5454428aa25e0e13018438f78c7f401cfb9173345267e16c7a5dfa78066a952980b172976409a0c63162094b7f507058e712ed
 DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
 EBUILD xen-4.8.2-r2.ebuild 4933 BLAKE2B bb5a4b58eb2820d1aaf50d395fca36192fbda8c0bb337771f22745591e41fb405798f53e8994771fad1a9c6598cc7c71864aa7c5f97d053847636af3227684df SHA512 ce0551c26ed51598405eab862b42c872bccfe05e2064b2dd589e56c34828820356f4f39ffbffaf78cd07408e91569091de947cfe0cc0602faa3503063d3a7fa1
 EBUILD xen-4.8.2-r3.ebuild 4788 BLAKE2B 7d86e51fd58fa5f817d045d0b1eb8c4941c05258fde806e90d0aa442b6f293e58ea3e8c93dda16597df080a8860bac2f88597ae5a64fd6a0518ef22688e9a83c SHA512 0a284557d9bbe0baea2c72ddeb2fcebfa3a72ab11ff94b68125644249ac7675d053bf5c3962e7f571aa3557404e472866495d92b0c2d4d9e990b82cb4679476a
 EBUILD xen-4.9.0.ebuild 4907 BLAKE2B 79f07a9604c8d3d20903d9da5f410d2ce1b85fd0b888d8f0b2ff8d768941abf0f18a006bd1748cb480beac6c9cd7c1434a0005b15e6d33c4bfc0e81905009498 SHA512 a70419e05a800da71ef24b097a950b7eea338c467fb0313d69fae25e7f6555b8ffdc3c7c27f18b11081625e315f5a90858668a56fe863cc21fe7c94357c08e57
+EBUILD xen-4.9.1-r1.ebuild 4715 BLAKE2B 930781effec60cbaeb35fb579b93cfaaee2733cb01b3c00a446f25135294616fa017a3015e9475e3416406147f378ab03eee1288df4240ee54d6f6e0cfca610f SHA512 292fc89c18ac5c282a1e2c64dad5a76a4e35043e18b1a2e9da978b3c22bee83f21ba66a80fde5398af5c783611ca6f78dc3865ff82f37627581c13f1898c9321
 EBUILD xen-4.9.1.ebuild 4715 BLAKE2B 3b7fa7af4b51afda5effb7e723e169be2a3db76aefcd4496220362d3ea0d07d51e78b99547860efd4e036c5156f67ae1ba77f4404c98e5d978a0820cebef0ca3 SHA512 955c0089c6ec4bd489141d60ed4f40ce5f21769dd25231f332db9674badbadf9aacb47d8783b80fcff7d076e384456214ea227f71f6de67506d82e03f32edf2e
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
diff --git a/app-emulation/xen/xen-4.9.1-r1.ebuild b/app-emulation/xen/xen-4.9.1-r1.ebuild
new file mode 100644
index 000000000000..6b7b46c13e64
--- /dev/null
+++ b/app-emulation/xen/xen-4.9.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=1
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 7766d2c7e5e5..9e8ab91ee06a 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 4a40e227c690..b9e04a1f94a7 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,6 +1,5 @@
 AUX 70_mod_php5.backcompat.conf 850 BLAKE2B a907b37f6492097dfa4aa87486b0e754c1a2ec145ff32fe941303c9564e94739fa87c2687602fbaffbf943cd36ebc92e9356d21d86aff235aa7a677ac9cfc26c SHA512 eac982be5e48bab849a9b0ec11a336234daf450c7feb8d8955159108f1dfa7a91013b8b2e2c3eb39dbb8d90aa6e21877a7d955598592c40735b10ec9e8f15cad
 AUX php-fpm-launcher 134 BLAKE2B fdbb99bbbd0d171975aff6f55ba7c41fe152c330cfb05dff81ab033d2490af27c52b8e43e5ed1ae80ee3c6ba8a1471adb01778d6b76bdd7776845f7c93e12428 SHA512 4304ea6df7093af06f1b7df5bf5d8ed7692403cc64a5c4c516e49d36fa866b33e4815876d28cc365f5ccb1e301ef7ce9b57e15ed959a41c91fb25af7236fed29
-AUX php-fpm-launcher-r2 256 BLAKE2B 5ee39f28424c42081e181a0920d38c0768d49dd7bdd00a6a4c57152bbc1cab576611cb7d87213ed8f2a40072b322dd02cee4544ad7f88e1f800ddb6fc8baa011 SHA512 9d2cccf40cbb515fa3c232e525b6b3a8b3459917ecaaf6b133f321e5ad040047c12720f60007f524c3d8ee6430f0b29ac5048fde7059ab506c14289c23825953
 AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d9691b6c3179df4f05631d904c1c3e5647dd080ff2080c346bffcb71bee96d4d4123f6c4d3be0120161c960 SHA512 9dfd36f88457a57a31c17cb251a8aeeef505f811f9ac59c5715532c3780b543034a6a9d356f4111fab1998883299ece0a68508dd3e154bc54de84ce6805bf351
 AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042ddfe7d817c1589891235d88edc91e213215b7a632fa9358795290599223097ac66f546085c1c SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
 DIST eselect-php-0.9.2.tar.xz 48356 BLAKE2B 9ad886b78c0a0ca71c1082d9265f28b1f9ea46dddfd52ad1a1ebb1a4d008954a59baf4cf69705e9b527fff64e8dfa3b25a2d522e2455e2e9ce550e917112ee58 SHA512 ebf4c9039aaa3ffad79dee181b5cd77f144a4b1b49d80291b290377b7ca5a9618d8b18922f0624e646c4d80266c58199bb936a7b8dd5d2e2bdc296099f583edf
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r2 b/app-eselect/eselect-php/files/php-fpm-launcher-r2
deleted file mode 100644
index 3a6b2720fa67..000000000000
--- a/app-eselect/eselect-php/files/php-fpm-launcher-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /lib/gentoo/functions.sh
-
-# If there are no arguments, then "shift" will fail (bug 626496).
-if [ $# -eq 0 ]; then
-    PHP_SLOT=$(eselect php show fpm)
-else
-    PHP_SLOT=$1
-    shift
-fi
-
-exec "/usr/$(get_libdir)/${PHP_SLOT}/bin/php-fpm" "${@}"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 51d40e679d44..548a1f7d042f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 5f32d0edd291..c75ab02808e0 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,7 +1,9 @@
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.15.tar.gz 2259352 BLAKE2B 52a820b55573f034f60dc705e0c513515c0f128f861d2dd9a22be9bfafdd10f116a159b8d9a21a64f7b66225e7191a08b9c5ff873bbe29421c53fec2bee08b71 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
+DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
 EBUILD ibus-1.5.15.ebuild 3552 BLAKE2B 040902ad38258aab1ff4b0d2b3eb495a6f7a3b5148b1cbd06378773b1c421da8e3240395d4412a712243663b1d70754b33356c2316d072dcc847f80a902d04ea SHA512 dec56dc700cc9e8fbe2280cf75e2550cc92d51e7ecbae307b87ef6e5707a2a7e31c5b82e8228818290bc94527f3c2bbdb34e0a4b61a0c8d5f1bafe5ebd00d485
 EBUILD ibus-1.5.16.ebuild 3961 BLAKE2B 6e53813b636479b1d34b238398950bd60f11407c1fe4c082e1936c0a4b71507ad5d205e663caf5818e2ea86d66328ae4304188320a3d22a5bfaaeae791b60061 SHA512 2e5c7cc15171fc83a76a793f4c307ba459cd2083ad52b94c48b6eecef71da1e409cb9982fd6973529a8ec97a6179414f9bf544b8444498d037b665dd1df5b076
+EBUILD ibus-1.5.17.ebuild 3965 BLAKE2B 56b920f04cbcf8de88b0cc4347f8876fd6972670c48d4717f372a5436a88e99f63a9b07bcd52a72dec0d313f06d8893fc3f6fda0e03fd7ebc78f6ed3e1c8ef79 SHA512 514bf67cb6331b0d7e1d583f865e66d5ab8c8f13db40de925e8bf51f976f89171f8b028b377676ca22f8c7465b53ab66bddd0237ff67a0319710d194bffc857b
 MISC metadata.xml 876 BLAKE2B 0594f787b71a972b67f1f52fde4e6e6c4eead1f604a1152ea9af2a15cd678677a29adaaba1a53251efbb95f0d12baa7d3dc63e54676757bbc7d9bf6235cf7e1e SHA512 eff80e5a8db4276c1138de9e661e5735c42abfc32950bc439eda9f342e5d2a68a8d5c848dc0000a2960a315ac38dbeda6b9fc44de8b9d526e7dddd94122f9f32
diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
new file mode 100644
index 000000000000..f04a122889f9
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.17.ebuild
@@ -0,0 +1,182 @@
+# 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} )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	libnotify? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		gtk
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+	if ! use libnotify; then
+		touch ui/gtk3/panel.vala
+	fi
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i \
+		-e "/^py2_compile/,/^$/d" \
+		-e "/^install-data-hook/,/^$/d" \
+		bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable libnotify) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/scim-hangul/Manifest b/app-i18n/scim-hangul/Manifest
index 96353dc753b8..548aa8186b93 100644
--- a/app-i18n/scim-hangul/Manifest
+++ b/app-i18n/scim-hangul/Manifest
@@ -1,8 +1,6 @@
 AUX scim-hangul-0.3.2+gcc-4.3.patch 883 BLAKE2B c891bb3865510bff80e28f4f770ea4f173d414b18c6c81cbd3b92f870774f4118e1f37ca68e94a83f128f5620d16ab77abfd03b237723def6828b353713a6bb0 SHA512 f7b65475af23667110219182ec9ba235da83d27603028c8f7655c39ffe36307762e3791d3630602c1cf0b56e87300f45562426e199f39845e39832d88fa7258a
 AUX scim-hangul-0.3.2+gcc-4.7.patch 318 BLAKE2B 379fd21d1ce405ffac797053f0011c2b81eb4567fe4e027be5678778316ccd5c025733c281c28955fbb6f2985e6c260df2a5f953867b7096c2827c92d02a2c83 SHA512 b07a6dadf8e206fad812e184f506d034628eccf76de00729f3c8b68eb20bfc48a881a26ed78fbfa87e16dbd7164778eebe03fc7d45297462311a5386ea72da38
-AUX scim-hangul-0.4.0+gtk.patch 511 BLAKE2B e8c20179d59012bdd80ebc95a31a89a3da599b29315bc455e76e3c906207a4ea259c573d8eb3f6bb28a149b32d861f8a4029cc07b47420458ce1d4b5ca48313c SHA512 ccdcf1b6f35bc02c29cde55a89c67b1d52a716a7e2cb87f98c15140e52266aab9c2fc4b78869fa3c69472d973988c2ccfc3204965fd3ebe2142a3f9d82d6aad5
-DIST scim-hangul-0.3.2.tar.gz 1176577 BLAKE2B 80c0ad3f988615f29ee25a0143ec325a0bb892d4c18f19783519dfbbfef373515c1e09eebcccc53c12ffbafb6fff479c0ca98569025cc53862af77ab0169154d SHA512 e8905320ff8aeeddf0041987ac5a63a19fb75bea44ffc55b5d28b825e064d6881ee0187b55025d69dad35af85da86818afa3ac39f1f10991021a7fbed3e1462e
+AUX scim-hangul-0.4.0+gtk.patch 438 BLAKE2B 4d76932fbd56d53eac9e0667774fa29fd884cce70a898b1f1f7f7c944766d8707d17ff73ef6f6d57923e532d554a5f66a92e32d46b71ac411f7cf3c6f189e7f1 SHA512 9e3ea01bbb73fab8a66ae52a81c976a67e6c47588f14194dfdee3acda3d493c38106344eea21584d350ebbd5eeb0dedd9ab6d08c16893e8f290d845c8d2281b1
 DIST scim-hangul-0.4.0.tar.gz 456953 BLAKE2B c7c2a320d03c4f15ad048b4e036a6dcd1f34044cb82e9a8fd18be8808e3f1be6f6f198e963982d1c6b742e614da5b3b2b3e2086ea8bbe19b4118f5493ae0188c SHA512 2f0285268deac35763c67487a40b718bf846d63634701a2a68d85109f686421f2c935b1f2998487b1f017c1a5e5bf453c56933ab4984f7464e1613d7e0b3131b
-EBUILD scim-hangul-0.3.2.ebuild 1048 BLAKE2B 818240e07a72b435502d67bf82ea5c965254d3152a9fa965d845f805e8a40364a81226edc24766624e3ce86d17719e75dccd7c1bce7bdb90fa08b3661fbd84fb SHA512 9e6c5ab33248ae92d34fedc05b6f5dbc3ef1811234d092717dffa7b93fc87643ccc0752ca0c9dd9df25786776588055a86c60c1c51b3bf076310e21bdfbce442
-EBUILD scim-hangul-0.4.0.ebuild 1133 BLAKE2B 48972dfe1fc92b1af1812038e2dfe410883e0a51883d1c8c11dbcef203c98f9be55f8158168a692d3dd81d6c5b2f830c9ce9c4c6f275f078faf4a8ccfd69eff8 SHA512 2645f1cbb0c7993bb7121ac7c766f048672bf854497902ac79d3fa31c0405fb0680cf8a10857d8f3ef3a96933424aac20c3a2a8933e55771a49240bf288ffd76
+EBUILD scim-hangul-0.4.0.ebuild 1065 BLAKE2B ca093b848f5bc563c59f6df461222ccdd18c3dedce18213ee9726da8f94b13a13c398123c2bc5b89c8df12a2830865f3eb33e82783ed19b33fe97a235faca074 SHA512 198f1a4f5032d6eec5132fb48b7fe934d01d2628b4c0fb55693ed53d261da22fb714a94f3a599aaa2e9c9c8a296ed0d48f0933b04960fe0485971ce3a3e25699
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
index bc1fd4b673ee..82d9f8ee10b2 100644
--- a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
+++ b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
@@ -1,5 +1,5 @@
---- src/scim_hangul_imengine_setup.cpp.orig	2012-07-08 07:52:07.000000000 -0400
-+++ src/scim_hangul_imengine_setup.cpp	2012-11-02 14:13:14.000000000 -0400
+--- a/src/scim_hangul_imengine_setup.cpp
++++ b/src/scim_hangul_imengine_setup.cpp
 @@ -346,7 +346,7 @@
      for (i = 0; i < n; i++) {
  	const char* name = hangul_ic_get_keyboard_name(i);
diff --git a/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild b/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild
deleted file mode 100644
index e2ca5068562b..000000000000
--- a/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit base
-
-DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
-	>=app-i18n/libhangul-0.0.4
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${P}+gcc-4.3.patch"
-	"${FILESDIR}/${P}+gcc-4.7.patch" )
-
-src_configure() {
-	econf \
-		--disable-skim-support \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog* NEWS README*
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog
-}
diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
index 13eba035c1c6..aa37d7ea868e 100644
--- a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
+++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils
+EAPI=6
 
 DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul"
 HOMEPAGE="http://www.scim-im.org/"
@@ -14,7 +12,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
+RDEPEND="
+	>=app-i18n/scim-0.99.8
 	>=app-i18n/libhangul-0.0.4
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -22,23 +21,23 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.3.2+gcc-4.3.patch"
-	"${FILESDIR}/${PN}-0.3.2+gcc-4.7.patch"
-	"${FILESDIR}/${PN}-0.4.0+gtk.patch" )
-
-DOCS=(AUTHORS NEWS)
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.3.patch
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.7.patch
+	"${FILESDIR}"/${PN}-0.4.0+gtk.patch
+)
 
 src_configure() {
-	local myeconfargs=(
-		--disable-skim-support
+	econf \
+		--disable-skim-support \
 		$(use_enable nls)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-	dodoc ChangeLog* README*
+	default
+	dodoc ChangeLog*
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-i18n/scim-sayura/Manifest b/app-i18n/scim-sayura/Manifest
index 270f23b829f5..f90b0a399a21 100644
--- a/app-i18n/scim-sayura/Manifest
+++ b/app-i18n/scim-sayura/Manifest
@@ -1,4 +1,4 @@
-AUX scim-sayura-0.3.3-gcc45.patch 349 BLAKE2B eb3a0356f0d2b13aad1f6b39621e655d1bad1fc1b5a0dd0f23bbe931c1ca212ed5e101e72e03a1e08bfa6d76076b6d609cecf5461133219fe6d799dc6c497930 SHA512 0227a3a7cd6d602a677559235a2ab3ee4129b70861c12d0ae6c005a46d658a90a0e318d8cbcd638dfb24fa2d3f4d1be8c278e77cff850efcdba6757871085032
+AUX scim-sayura-0.3.3-gcc45.patch 353 BLAKE2B f2576aff8d65beec5ad0751f7f2cb22142a25a890081ee634606725a6eedf811f14e89d85d74bf968c4fed6b3264da45c5dd2832da252db12370eab7a1fcc98b SHA512 2f4c3ce88dc9b21eb59bff14cb16ae36ed60b0b0a75638bb2080e9bfbeab986857a6f7095f5ab4c4f065f168faaa870ba115922c9b8d28222da821d7dcd5d554
 DIST scim-sayura-0.3.3.tar.gz 380147 BLAKE2B 12e1968e0b581c20fe12fe306c0f01cc5ddff15b5d3bc01cf43efb3538747cd29ef223583b2b8a3fb890f2108536f5cae328dca4a4e666a56e5b7d666b9e8bf3 SHA512 bf97b8d82e0e193a94698dfe7d3c9b1256e928a2082dc0ca6be328ed56409a05d38ba04254617b3800116514c1c8fdbfca869f2aa3f2f005505a4e873d2b90bb
-EBUILD scim-sayura-0.3.3.ebuild 660 BLAKE2B 8dfa6bb28c738086ad7cc63bcc3847e27f0ca70d3033ccb53a69e5f6963a9674cbab5396aa6f6ae4e4f6d6fc0f6588a66d327b20076e31f7f2dbf6afe298d779 SHA512 544790f633a251e4a32ad676ea48624f760a1c9909c12f221f85bcd6c18e0fd62f368e02e798bd0807a063a96ac0c79636f99b6d4fbda352cfe27689f4f2cd7a
+EBUILD scim-sayura-0.3.3.ebuild 672 BLAKE2B 7d626a06c6ffac07427fafa803d52c7cdd99d3aa559396ef06ee7a9c25d2d8c793be6fcea18e07778885bbe18ea381ba83d446fef7c4f89500b81cb798b86b2b SHA512 65aae4dc4677101745f67c32e0b30a509806c04e9d787868093a434db6be04eda55b4316a6c283a4ac0f3fb603bed19d061b85e9b22376b1af8742131b4e95f9
 MISC metadata.xml 341 BLAKE2B 6f2f812f898b78c0198bd500116b4f0664ac37ee511e57dfb9c36abd9f5386171594aa7da706c5f93d4f98de2fad9630f94eac2e785c64918c865076360150b7 SHA512 93333f168a51bc5b932b06f436c6254d56da5b7de8cc3127e5641a74488a01aaa650d01a018970da8202a7432d8dab8f73d0786802634bc9b131f90219ee2eef
diff --git a/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
index 64ee87416011..d80f654b6f67 100644
--- a/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
+++ b/app-i18n/scim-sayura/files/scim-sayura-0.3.3-gcc45.patch
@@ -2,8 +2,8 @@ Fixing build with gcc 4.5
 
 http://bugs.gentoo.org/show_bug.cgi?id=320879
 
---- src/scim_sinhala_imengine.cpp
-+++ src/scim_sinhala_imengine.cpp
+--- a/src/scim_sinhala_imengine.cpp
++++ b/src/scim_sinhala_imengine.cpp
 @@ -233,7 +233,7 @@
  
  void SinhalaInstance::backspace()
diff --git a/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
index 77044b6d6326..f04f5993a8e9 100644
--- a/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
+++ b/app-i18n/scim-sayura/scim-sayura-0.3.3.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Sayura Sinhala input method for SCIM"
 HOMEPAGE="http://www.sayura.net/im/"
@@ -18,14 +16,18 @@ RDEPEND=">=app-i18n/scim-0.99.8"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/scim-sayura-0.3.3-gcc45.patch
+PATCHES=( "${FILESDIR}"/scim-sayura-0.3.3-gcc45.patch )
+
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	HTML_DOCS=( doc/{index.html,style.css} )
+	default
 
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml doc/index.html doc/style.css
 	use doc && dodoc doc/sayura.pdf
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/scim-uim/Manifest b/app-i18n/scim-uim/Manifest
index e48c30986d87..e1b93d03341a 100644
--- a/app-i18n/scim-uim/Manifest
+++ b/app-i18n/scim-uim/Manifest
@@ -1,5 +1,5 @@
 AUX scim-uim-0.2.0-gcc43.patch 420 BLAKE2B 491828a4fa94ed7f0343b449b35e911666dd9abe8627264caa79f9d20605bd9a075e7165b367fee4669db0d4178c385fc4d4937491dd5bc5c31af1af2ab5cd6f SHA512 8baec8863a00d1a870f9c557340f089f51e991acec994a3445bc378f95b226aeb46018ba11b8dc605b90ab35f7923bfc029fa40e1e01e17caba1e3ca99e07c09
 AUX scim-uim-0.2.0-uim-1.5.patch 367 BLAKE2B e73cefa76abb64816265ee870c44d39966606624c649d97c09d5e5cf5494af34f49c9770ad103f7af2afa8eedc662098565c68a12fc70b0fc936e384a19035d8 SHA512 2c68a8fa1e5d99e624145ce9a85aeb1a286e4a4afe33d92c32c13ad3e14060afa8f730d58146d9a2b134b9565172a909138742357b640ba000a7129e5e65e485
 DIST scim-uim-0.2.0.tar.gz 344389 BLAKE2B da0cd29036cf3fd4a94ca0f5c9e72566ccb37c4d64019645b9ea04d9859d33d1614d8cf786ca67a0d2c474b79b13d7d100ddf815b982ba414ac950306ae00448 SHA512 18df8de8ebc02289e21bf54c921b5425f67ef3c379b3c3e4392431dc3b1d9d7f12a25bcbcaaddd264913bacf61ba2be9339845700f541c22f73981e99824c6e9
-EBUILD scim-uim-0.2.0-r2.ebuild 932 BLAKE2B 57e07ff7d4efb09a5c516a001cb8baddc1232e8b3f4249e0068dcfe60ae1b777c6aca97cf1034cbc231bfc300284246970face2483128e9a536cb1da68b2281a SHA512 79a5c8e0385f8114e7df01c991a5c3915bdd18912f86bd32e425e3dd8b3c63753be35dee054ecb9de193c62fb65e33ce4ef030ac2beea93ac68919ee70541aae
+EBUILD scim-uim-0.2.0-r2.ebuild 931 BLAKE2B df9a4bb7d1b155f9e1baba29a78e3879616b25e5222afc5d938768f0ac94bd07cfb603bc87695e8c87e4d91a825b6aa94a8da66991001db045d7f7a3c526930e SHA512 533313a1588e72431a6e759f21eddcffde6c7eccc142e8ef4ca651b8124ad2817ca917e78984f96f3057ee2bd401f6c0a70960b08e9cbca57055a3249283e60f
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
index ad0fc7d82d8a..8b9fe22e0718 100644
--- a/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
+++ b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-inherit eutils
+EAPI=6
 
 DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses uim as backend"
 HOMEPAGE="http://www.scim-im.org/"
@@ -13,20 +12,26 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/uim-1.5.0
+RDEPEND="
+	>=app-i18n/uim-1.5.0
 	>=app-i18n/scim-1.4.0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc43.patch" \
-		"${FILESDIR}/${P}-uim-1.5.patch"
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-uim-1.5.patch
+)
+
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 
-	dodoc AUTHORS ChangeLog README THANKS || die
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/app-i18n/scim-wijesekera/Manifest b/app-i18n/scim-wijesekera/Manifest
index 52262611ac1b..b83d79bae010 100644
--- a/app-i18n/scim-wijesekera/Manifest
+++ b/app-i18n/scim-wijesekera/Manifest
@@ -1,4 +1,4 @@
 AUX scim-wijesekera-0.3.3-gcc43.patch 949 BLAKE2B d65f15add07ccceab709a3a47681274a6897aef008926646c40b4b6ed6c5a732870f66129d9fbc067bb7f1235140d43ac50f7e462faf6b05abcda64645a487fe SHA512 0719231165e2647b7fbfec9b39e98b2665bb8e7bdf708937afdb917df8762cc0a1b226bb60177367ea5019e8962fa5bc6fc4cc2d883a0bcc7049a29bf64aa974
 DIST scim-wijesekera-0.3.3.tar.gz 193023 BLAKE2B 6d8b4757e851a9e17b074c0bdda03e01b32a547a29d9755f82eb8828f8accf830a44aac8cc71ba6c6b18c7649a9a6e3009108e2fdc27992e9dc8d84d99a0c201 SHA512 98bfbb7a3cf499c7980c06504083744f46ce352b27e8e80362190359e8bfa88472a5510568f3753503c7d409d1730e7d1ae1162e3d43a5475e466c334b0a91fc
-EBUILD scim-wijesekera-0.3.3-r1.ebuild 632 BLAKE2B f27850d6dabb322303d450aedea0e83c3052f43e0cefce4428d81f0de3004925adc50f8f8eb578acd5ea9c739199a18c7316e4d536748ce123b98f129f6cf927 SHA512 f3a75e566829598a7c5e1d0e275a24c628b532b1f76e95eb0eaaf85dfbf5b810dd17fa55a80ec7c89256b590f50b688c76de9aca035a18d7c709787d0a2d9e90
+EBUILD scim-wijesekera-0.3.3-r1.ebuild 677 BLAKE2B 0eca6f938b54be2bc23308326fcb5b6a5c2f37eb699113dcc8d941f049ac94fdb6d6e284e24aaa001378763b3523a59b11a154abd0437e34a6bedcd5e64f2223 SHA512 df5322f2bceff7ece47c3daa63149e46a39c55d46838bbf0870a38125b9e4cac01eb3c697c008903bb8c1b2e3b28ab0190d423537f72e66b93456e894e02e5dc
 MISC metadata.xml 311 BLAKE2B afb6ee7bcdfdd6a60d60c65ff2796f3ae1be7aed807252c8a38e9ca364fe07a82730c354da96cddd357e046316aa6c9e3e85a848bf3fe0a9a873a45be9ede313 SHA512 f28f06e7380cddb887dc480bfd1c975a5aecf7fe3a9349547f058141cfc66f212e51728627638342958785843cdd668a9d35dc9c3b13963d4ea6c0ff91739a0a
diff --git a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
index 69f362e5b6ec..28914bc279f6 100644
--- a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
+++ b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Wijesekara keyboard for Sinhala input using scim"
 HOMEPAGE="http://sinhala.sourceforge.net/"
@@ -18,13 +18,20 @@ RDEPEND=">=app-i18n/scim-0.99.8[-gtk3]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+	default
 	eautoreconf
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
-	dodoc AUTHORS ChangeLog NEWS README
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7a4afb4e133c..06bf47d06146 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index 9ac62a9e8c82..13a5887d8d3c 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -1,6 +1,9 @@
+AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a3be90b6b896e9655dd7b1aa0b6528bb7f2fc92f40d448823990f60f5d58726e7358f6ce8304875ae2dc8903 SHA512 dd660b77457326949d41e80527fc81738c3a54f957f47d2bff94c9ee84dbbc5d2f31d43db9e85311826398c50927d18711816dfabba3ce9cddde0da66e15fe09
+AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
 DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
 EBUILD dvtm-0.14.ebuild 1500 BLAKE2B 5380d05c9590229e2a1ce89b4c6344f20f87e036bd2a500e083ad65c879924b3cb90f278953ff11985ccceeeab0e31f64c489acd919a6d4d992383b216f05ada SHA512 fb1e68406859da697006b1fd0647557b18b9917b5cdfbd8af723e33cb3ffd9c61c04be2d520e79d216e341691911c46c5ac0cbb90840f20133f1be3ff987ac5a
+EBUILD dvtm-0.15-r1.ebuild 1216 BLAKE2B e84166bd15f8d4c1a5f1bb80d658c6ab8521341e9a53c6b0f05aaa60fe882d5006e916c21d79065231e7a5c8b6b9502376712925d0dc834ecb65cd9967455acc SHA512 c177b2b549c85ee2797a57248ad393b7e256ee5d206fd2ae616342182455ab731d7694e4ae0bd5e67b1f24b12cbc0592fa63375fb395d0be9a8d0533c4639458
 EBUILD dvtm-0.15.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79
-EBUILD dvtm-9999.ebuild 1506 BLAKE2B 3a29dfc11cdb5c73feb8f599b65fe27e36e9e520e4f5064264e4b6c3eeb396fe8761a1f0880da74c46b5e4f32b7e7471e3cbcdd83a4c1ad9e1bdaa4bef50c1d7 SHA512 cb0ff91d7f7893b9f369698f70f54fc3655c378f7149e3ee64ddf2aba8f5359ddce401bc1d46819b5aed0f5deff6325f7c0b4a117e68219191baf996f4c47f79
+EBUILD dvtm-9999.ebuild 1216 BLAKE2B b97b350b9ca2fe9f6774538c9f7c7bcbd8d0b1c66b84a3159a55feb5b913def2e93c8593f55873479e0ec955aeec1e0c26a63d91517e0a45c667f004699d9dae SHA512 361eac65bb1368285cf8bd7f6589a8d66d74c38c5dedc29338146637a70db1b78afc029b54c16c4afe73d365e1e49dc6c4b98320fe60169b50c3b68e7ef36674
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.15-r1.ebuild b/app-misc/dvtm/dvtm-0.15-r1.ebuild
new file mode 100644
index 000000000000..8a4b03dec2eb
--- /dev/null
+++ b/app-misc/dvtm/dvtm-0.15-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Dynamic virtual terminal manager"
+HOMEPAGE="http://www.brain-dump.org/projects/dvtm/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
+else
+	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="sys-libs/ncurses:0=[unicode]"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	restore_config config.h
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	local msg=""
+	use savedconfig && msg=", please check the configfile"
+	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
+
+	insinto /usr/share/${PN}
+	newins config.h ${PF}.config.h
+
+	dodoc README.md
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	elog "This ebuild has support for user defined configs"
+	elog "Please read this ebuild for more details and re-emerge as needed"
+	elog "if you want to add or remove functionality for ${PN}"
+}
diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild
index a579a42918d3..557a8538c0a9 100644
--- a/app-misc/dvtm/dvtm-9999.ebuild
+++ b/app-misc/dvtm/dvtm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit savedconfig toolchain-funcs
 
@@ -18,39 +18,31 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="unicode"
 
-DEPEND="sys-libs/ncurses:0=[unicode?]"
-RDEPEND=${DEPEND}
+RDEPEND="sys-libs/ncurses:0=[unicode]"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-gentoo.patch
+)
 
 src_prepare() {
-	sed -i \
-		-e 's|FLAGS =|FLAGS +=|' \
-		-e 's|-I/usr/local/include||' \
-		-e 's|-L/usr/local/lib||' \
-		-e 's|-Os||' \
-		config.mk || die "sed config.mk failed"
-	use unicode || {
-		sed -i \
-			-e 's|-lncursesw|-lncurses|' \
-			config.mk || die "sed config.mk failed"
-	}
-	sed -i \
-		-e '/strip/d' \
-		-e 's:@tic :@tic -o ${DESTDIR}${PREFIX}/share/terminfo :g' \
-		Makefile || die "sed Makefile failed"
+	default
 
 	restore_config config.h
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
 	local msg=""
 	use savedconfig && msg=", please check the configfile"
 	emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" STRIP=true install
 
 	insinto /usr/share/${PN}
 	newins config.h ${PF}.config.h
diff --git a/app-misc/dvtm/files/dvtm-0.15-gentoo.patch b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
new file mode 100644
index 000000000000..3bb7dec3721f
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-0.15-gentoo.patch
@@ -0,0 +1,36 @@
+--- a/config.mk
++++ b/config.mk
+@@ -10,12 +10,12 @@
+ TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
+ 
+ INCS = -I.
+-LIBS = -lc -lutil -lncursesw
+-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
+ CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
+ LDFLAGS += ${LIBS}
+ 
+-DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
++DEBUG_CFLAGS += ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter
+ 
+ CC ?= cc
+ STRIP ?= strip
+--- a/Makefile
++++ b/Makefile
+@@ -16,13 +16,13 @@
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.h config.mk
+ 
+ dvtm: ${OBJ}
+ 	@echo CC -o $@
+-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
++	${CC} -o $@ ${OBJ} ${LDFLAGS}
+ 
+ debug: clean
+ 	@make CFLAGS='${DEBUG_CFLAGS}'
diff --git a/app-misc/dvtm/files/dvtm-9999-gentoo.patch b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
new file mode 100644
index 000000000000..f29e316c3e5c
--- /dev/null
+++ b/app-misc/dvtm/files/dvtm-9999-gentoo.patch
@@ -0,0 +1,13 @@
+--- a/config.mk
++++ b/config.mk
+@@ -7,8 +7,8 @@
+ TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
+ 
+ INCS = -I.
+-LIBS = -lc -lutil -lncursesw
+-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++LIBS = -lc -lutil $(shell $(PKG_CONFIG) --libs ncursesw)
++CPPFLAGS += -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
+ CFLAGS += -std=c99 ${INCS} -DNDEBUG ${CPPFLAGS}
+ 
+ CC ?= cc
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index ef65e01a9396..21af2e11e584 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -2,11 +2,11 @@ AUX xmind-3.4.0-config.ini 1671 BLAKE2B 1db0351ca78f06ebd2966d32c402334ceca45cc9
 AUX xmind-wrapper 488 BLAKE2B 5880ece73df047121bbda1eb8f6b891685bba3e704ac9d47f79970a81be8f8e20c35febd278278a2825692c12ea34a4d24627ef8b9ba91f1c6ea8f602fe8eddf SHA512 f400d3f527897f087d5e20bce43299a20bd64a458f7c95a47447c78bf0c2b951a8f38d29e4a6ce028a9b421c41880fb5850184cb0b190de79f712ec807dbf9d7
 AUX xmind-wrapper-3.5.3 493 BLAKE2B 82aa49de2c90e2f943550d328253749310032e95e1dbd33e092383240950698ccf61bd85e1b9315275ebacc89cef78c518152e6e70f9f3246af8d41f850d7aad SHA512 555e1103dc5714bb5924421899262f1112c83807233c9969afdaa0eb0cba631b13e4fa984af7c2029fe57fb7e135f51a1d00e3dd3fffb8bcf3bb96eb93dfad80
 AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a013046aa8dd8c0c5463490918182a52d8fbf476332265685a9a80785dfa431dd912ff22145a13a00b99f SHA512 452560c9b1ab68df745616ac032089fb05f1aab61c7e1b247eb241195dd38e11b69459abb5e2b6696db76e2e421291de4dc41030f525f77f0e30522b52540248
-DIST xmind-8-update1-linux.zip 142395100 BLAKE2B 79ccca279f9c8bd6dba47b78b81692613602e2d1dbedd38a4a85ffdc296b4743192496a70884bfe473b76ea6aa8d4b79277ed3bb16c0c83c06407ac95d0fbd34 SHA512 725268287dfa9dc9a5d9fd429277eecd43ef2e09158b3bb8ef51e06355620741b2aa709c227debd0069f4401623b7274082f6b81b3ace153289ef7ffac25fca4
 DIST xmind-8-update2-linux.zip 120800791 BLAKE2B 2128d3d6a2c120b226b02128aede12aad062e72e4e322f910100663a37be9ae9a722270c36318a21897aa6489d9bfad118145e0852463e31b17bc1d377c12725 SHA512 e658714a5944e8de62577302c22763e9c55d1f82ce6cbda187ec39801ac7cbd5c34de6e4d7d9735546bcef26795c21c194ff026cebf39b2c9af2663cec98ce58
+DIST xmind-8-update6-linux.zip 120903858 BLAKE2B 8dd45f06a0a1486fe65b99668dcba7f17d4763caa2ec2542c60040f0e3701b76946810b7fa242726a8a3c6d3c46b4b7d9a0a67666d4c2814509215395170ce80 SHA512 0e4871a385c8449da000ee3bcf1a44fe63075af4f592f43a01635e017ab253a996739c63f9c71f098529adf62b5df4018440c7db1c44040488c0e3186abe6248
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
 EBUILD xmind-3.5.3.201506180105-r2.ebuild 2215 BLAKE2B e7cfad25893f5c2a9433b0600fa5f96fa1012a4a315c53d3b3f008b42b82dc56711d35bc546501117a4146e9f86f0a501c1e653df6e5b4bda140c1c9d424d241 SHA512 af0c431cca019f4b5b1228daf2931e1bed1d8d01711aa1a19aa3b73d75176f08e10d6353c8a0460f33dff0b13dcd9d4f3b7cd8d32fa89611663ead849674d7a0
-EBUILD xmind-3.7.1.ebuild 2186 BLAKE2B 5db246d4a5ca8e94ca27b827681499a860e8ed19c7ae8d2cef85ec17d97b9b53846bb52eb4e1209394e43ddcadbe7d5468515c989cdd25966ff4b346201ab178 SHA512 4d6eddb169f546dd7d119525db843abe4b7a450b56fb972c59011ba1d0b994bd25fae4ecf53208632407abaca7796d906a357cf99f60655b47ebb52ae4d0c214
 EBUILD xmind-3.7.2.ebuild 2186 BLAKE2B a815fab4ea635fa0b2f2fc22ca6878dd55f9316bbfe23b0b87afa197c5096aa627a7816c99e4d6da0acf2e7f75f84b15a96b4b49e516290cd994ec168f1ef621 SHA512 d5960a6dbedff1000859ced4aee8e43f86bd5fe63ea61e046c78a31c1634e1e653523f2f446e9429fb5d228623e81fad90279c18d29e1111a9b667543e2c9f1a
+EBUILD xmind-3.7.6.ebuild 2186 BLAKE2B 8d28428f983b211f5b7624d8825a9df417c59402a7ecbe77e158dc503abc207f0538179c714bfcffac7765619d98fa8c9635284d3c662694d45f8a3de807e43a SHA512 e90cabd43dbf81d828d79475cda33f7d6dae3edf295d2407355fefdb4a39ad59e0fe95e647559d1f141a4480f49186e95e03a0cf9920ffc76a9ea6872a640bdf
 MISC metadata.xml 248 BLAKE2B 756531e249f020913a383436ea184d8617481ef1ddefb311630199224eabe6082d396b3058f1123fa97d7aa6f8026de8a256cf4fb253b16381462d64f45373d6 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3
diff --git a/app-misc/xmind/xmind-3.7.1.ebuild b/app-misc/xmind/xmind-3.7.6.ebuild
index 3e9a42274d25..f1ab65c41091 100644
--- a/app-misc/xmind/xmind-3.7.1.ebuild
+++ b/app-misc/xmind/xmind-3.7.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils multilib gnome2-utils font
 
-MY_PV="8-update1"
+MY_PV="8-update6"
 MY_P="${PN}-${MY_PV}-linux"
 
 DESCRIPTION="A brainstorming and mind mapping software tool"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index a1ad97e73164..462a618a105f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index c08c9ff79691..ac333bfdcf3e 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -80,5 +80,86 @@ DIST Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_tr.tar.gz 12193404 BLAKE2B d
 DIST Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_vi.tar.gz 13436105 BLAKE2B 1872e88a53d951701de40e1a04737eac4e3adc3f738830431f4d26574f59f70cab27b06ec6d7cfb62ff385d5860dac4b36ea025a40323a18f1ed747f69d8615b SHA512 635366d12b31d2742a05404e1c8c735c32ae6e2ffd423720964b3262fe95f8fbdb2950963c7c756aafc8dcf8a0895eccbce59eefae4b7045159d4e6a2858c986
 DIST Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_zh-CN.tar.gz 13871412 BLAKE2B b25b321206e739c87a4764fdec5aae0f37b46b98b9d56f8ca2a9c3a5d934bfdc6fd8137c4e911086d8cfeee3713d37aba056898d3ed4ff40f3e149c972d20db1 SHA512 9bdf38c400ba302994869982148f1af8afdba69ac108e2ba014d0bd6e7211a5dea47b83456193237574a29346d0c59dac1ff5453fe1f7e909300aaadf4fae2ee
 DIST Apache_OpenOffice_4.1.4_Linux_x86_langpack-rpm_zh-TW.tar.gz 14082748 BLAKE2B c56bc54f024f9529994c8e7f85ce31c99f7c75343202e56878df13343e87a34748235456479162c46605f2149e14b5566e42e4d823b4b344bef921c16922d7cb SHA512 87fd4053cb758f5f51f1d0da075d8ed644d3ad18113b4d9286d1ba307b88c4158984d15c8085355ab52479f125108a8346d810558e61f30320b78acad82b84c0
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_install-rpm_en-US.tar.gz 161038096 BLAKE2B 2746a5d6edd0d9e89fa547a9e5074b16ff52f926a30fb494ea54ed967eaf7815bbcc689ee4cb1fbc790ca4c1da6e24568ae8156fcd5cb69966995dc240efc4a2 SHA512 ffe8d626a71d4fc4637419e8c707741208e5396d5fdefae06e7b294097a50db376775f75e8e6537b48f2d951488da910af11e62b403025059df6bb19b7e7a9b0
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ast.tar.gz 18753578 BLAKE2B 610b5ce1fd85921139813e71a0e7624ef5ada6a5ddde4ff89c93d02f1eb72375f8b279afd435045cbc0fe78bad67ecf41fadc97ac280f6e44577e20671b1854c SHA512 a75d5a2611d0cc0e483475449d28d8a6720fe4ffdbba17cb1cb16af7bedad1e4d588a0f61f18e3e2537de75493f54e23cbf59e94179622d294d99d966cb0df6a
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_bg.tar.gz 13608290 BLAKE2B 2fa943b5e1e4a87b53ee8b70e12a816560193273e4bf4c8db2059d3c122bcee99beeb653c3102eceaaa4c81cd918d83dee479a9961b9ab80f2e5b6cb829a3a87 SHA512 bcdf1100c7e731cd73ed1a695faf19d22e3f61a6b5427b290c42ec8b934b1d269e63a41d132051450a44891999710483461fdc1ce1ce99aa70418a7bda80f8aa
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca-XV.tar.gz 20189609 BLAKE2B 267320d393794cf6ca91b2829087e41a5e1910d777928915e512d6357f7cc22430b96e8d6f0044095e119533049916a20d74180542cc4c395f7aa59445aea894 SHA512 1591e4bdb269eb111772cb53960bde8288830c5b876a68259e14201f31b49a3d5abc430ae097ed7a846d21d9da098801bf13b5bccb0da0fe104aa6e252db1426
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca.tar.gz 20184924 BLAKE2B 9eec8fe8c968e8bd6cfcc4217d9c346b695aa49e2005ad21b8621222df8fd956ffe3f51a4742f593f0c44d7430e3806ba3b31b88f4f637ca4724a52ac62e75c2 SHA512 b06853645c2fa0f9cf1a477d3e13815b5f1e20e9ebeecef6e8c273ffa69c4dfd02af3c71e1af3de7c67a4714ef68adcdd1c60eb36cd9e33f81c469c3a654d0bb
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_cs.tar.gz 12651326 BLAKE2B 56e3aaee5d096e3e1da6d082af9b6ff8ce769c8127b0841840131755c74dab0285a81753a5cfbdf1323a5ec0fc19d7c37da3871158000b307817158074c6ebe4 SHA512 913b00c1386f71de29b597281f33a4bf21307b5c5bf3d1f8bee37e10cc0c872c9495ae94259ced222a363c2814cd178e1ac04f7575cc9a0beeff5f321b75e889
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_da.tar.gz 12440270 BLAKE2B 2490a28b08330e497e66106b0250fc4559c98ae1ebee54dd50f34b30b4ccbd8b6ff3d6cba44120b545279fe0958af44269f58443b351da3dbc4de6cecf052576 SHA512 acbf9bdc9ec37aa47b53e7165c41a6dc271ef67e7febb544fae6d1ed61c583cf6dd11bdf1158a7ae250393ea84cce907e58c4281eeca90f2d846683d07dc0efa
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_de.tar.gz 20373577 BLAKE2B 7ec506968261a28b61042bde1edb507bd77d39ea16db7e56032f6ca9972d58ce7ecbacb31a4c90b53d0a99e0dfcaf58e84216a739830376189a50e608ae2c80c SHA512 30f8b5e8ed16be28a23cd2463a342d274bb54224123a729437b399c50c8a6c48426909203225df9af9552c3b305fb1b704857d0f1f7684ff0ddbb1d077b6e00f
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_el.tar.gz 21712367 BLAKE2B fce000e510a2860b553523b8eb871e11eff3b5617bb9eb9b11fb804d93673dd1649993c55b0fbde85a52596230b8388abea8234cffbef97d6b123c1f7c0a6ced SHA512 709524669f5b5b5ff56c42fcae6f93f720cef1688707d87240e21de6789e2e5c52d745643119a8ddfe720831cd006189b2c8b90fb23fa7afd639ecede8bf95e5
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_en-GB.tar.gz 11403307 BLAKE2B 1386adc6a3131c55343072a80f6e3c3c93231a5cb2a71f99e3b9c9561c5d135b53795a102c814f864c4d00efff1989244c6d548bb1669f334d2a295e57a25a70 SHA512 cddaf9369250d484e6062184dc3cbcc9150ddffcb474ef20c561e2e2568a0544a9b2fd48e82caaa813965f8da64b1f43758819e4d37f73dbffb9b87b8e4aedb6
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_es.tar.gz 12839629 BLAKE2B 90dbae67607d796193b94b858c569d5da2ffb1c9546b21299f2734b06489c04540dca50a0b111bebba7c90cb54b1196e278598f862f59e3c245acf6d283b586d SHA512 12dd5cc31b67bc3f809dfb6129fbfcf8a9ba60f18b6ad09402cb38b3e3b06d3696f051c8754bed4fd7e8022f72ea341eeabae1d655f68ff882d3eaffc60b9343
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_eu.tar.gz 12691712 BLAKE2B bf90d1c3e90bc0a8c19264db820d9e3b92555ea70d0224c7f46e1590db75146b00c56772bc3af258223afa04cf4ca527249d626335b397f35818a19587f8f257 SHA512 167c37fcf9bf077e6d5a64a07c3c42d03879abd0c0393a93cdb588bd205de5de8cb1b2a6329d7feeded9a4af8115331b697f48a5938e57cf19bec611f4c62bac
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fi.tar.gz 20453561 BLAKE2B 8ae2b530b59d91b3d8cc12c14bc58bc89b412320130f80c5f44a66b2838ce9fc73c0b97e130a90c2ff82c73758ea10f8200ad50e32c256df2131fb8fb7d182e2 SHA512 7836aaad2b4f2e44471262ee32989d7280ba44f09ef978ed45b0972367b1360912c444bf5ce1f2b0eb5e0090b3c0409c330cfcc51fde415beeb6d44ab269c8da
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fr.tar.gz 13066043 BLAKE2B 1e868a237c9431b2825fe8217c8b985874d82741afa4dc680f0c82103b96b5d0b41553ebd7d56c54d58d4ce2281c6a251cf0f0f9709fb5edfacc481703b40a3f SHA512 e79c8c877a7b3cae104a80fa078407806f4af400c5b990c4e6cec1cfad8aceb88da4a12618df4db8c8c03f9a4efbc03f7756f0352b77b99ced426e110ad5cc9f
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gd.tar.gz 18759898 BLAKE2B dd80bbe13b878111c78d9825a4021ba6ae679abb35493bb124e4e46ae68952f014cbf6dc9d38e4eb86c540b5bdaceb0acc3efbcb2b24ae05aa0653379f597147 SHA512 6f1b8be497b6ff8dc64724a8517ad4c9dc05bcfe644c6681508c422955990d43ca28d5201f4d630450ff74767cce2bdc3eb10315d8dd0383fb5a86ec79c5f009
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gl.tar.gz 19777031 BLAKE2B 1533548c92a200186e92cb06f18434225ba03e0528fba126906db5e9da971a0f113def45c66a9f6a7828eeb32bcb0f84133df64b7ffa9b1ff898dee254a3cfac SHA512 49aa01f49e2c5c44683053116e7130e406fd2e7a141b50e1400d19a6f7be318b5d9ced10f4221dfc5f3fa0a72e46b7bd91c0a194724bcd3b10cfaacbbab65edf
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_he.tar.gz 18778309 BLAKE2B e7dee51dcde8b2ad16f03ca62582f7fa0923de8bf296888496712325ae9ced465ddd2dbc16fa03b902663d33b40273931266a1134d94aa1782c8af811353b015 SHA512 df35c7990476a066a892d7f9e57ea8172a10ae3bcb312b7620138ac358382232f75fd291b835d1d4d91f5c3ac8b1fe47595bb79d98e676e323ddb9f78d2e06d0
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hi.tar.gz 19737398 BLAKE2B b0c1779f921904a787a96000f9f09d9895570d608d651f403c3c36da40aef5675983988d68fef1e66dd1a10866b41b60bfe13dea561e4385ebc1cec343921df3 SHA512 694105b0b2af70e585ae8ad117754d7552e8bf66393ae061ead37eead737d5cdd72d0ec1b70bb87e8bbf482a806ecf807e74ebe8bbff1b50f21049a36d3505ef
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hu.tar.gz 13105974 BLAKE2B d60b8a71623de267de41a4fd1cd4cb3123ff47459b4d4078a6be3276dfe1dcbd8da5952a979ffe2e3897c6b3b6759285c7871908a83f4d156fa34dae63df504e SHA512 67e0eefc7b203511065e14d43504a5cffeb29b7bdd7d6758a5823c595c2e4bc1905dfb02667eb650528337ca9a5eda7f6066a9f92f7afdd09e0a7521c818d766
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_it.tar.gz 12810253 BLAKE2B 84e0fe89c0061bb92cd51973573c9a2c2dccaf388b1bb058b7fcdd90ace259325b9162f2713f9fbe1957802205c19a2b44407930868d75373164a643b9e38495 SHA512 9d8c045bcd799cabd64e96a42103c6a02795400aeed8a488275b995511b521c0b20caab61afec02aacf9a60f50373ee420965e5f95458c361cb25da750bee582
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ja.tar.gz 19054040 BLAKE2B db96074589ef4bee737dbfdf81b65f307395c72dcb0b2c1bff3d2efc97b30f6a0fbd3980a40eaa673f68c3841f13727bada0026f010bd26f36d5b598ab0afd8e SHA512 e59d9a8f8504fdba56d3f29f1dff6b287cdf8215c7c167066cd4e8799c73a37cfe852bea5a92fc7f1d623cf6d205096203f62cbad08133f7397ce3a263a10d45
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_km.tar.gz 15958503 BLAKE2B 4db8bf006f789d0696a2608356d5251097def6e1ac2af8ad6fb1f51e5215e9c2203b8cf9b07a90bbd134eeba92216fa1681ceb6e960c2e44c36e3fcc86a37269 SHA512 479261a6ef04cba5af1260b108962e418837612d99df527f3f65d168e9a6e0001326873a66c47779eb4e25e9816746f938126f1e2e61dfbdd64c285105f547eb
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ko.tar.gz 12557462 BLAKE2B e839efada019ec2782fd658d1e9821804da6c4a6b38264e5a05e7c94b6414788eefab87896cb6c7b92eae2145867cad5a2585c84615465f68607fe8d32455a80 SHA512 95be8e432126f33b06f0a09c9662729c1bb12d74e7957faff09adf24d19c29a905ec61647a6f78c87fc4c4855eae8f503a76b95b62b4b7fc9b9769dcc0bf54bb
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_lt.tar.gz 18656876 BLAKE2B 1cc05f23562f72a1dd7901e3f5b186e24add57ccd2b15aa6ebf5e4ae2d395dc1b0acc63e5e658f11c6a0c2fc0a77a98eb9db71a584192e63a2582a37b0a5216c SHA512 8216ed9c47da1646996f2e9b30bccd862cf08b1a88d0213c822b5c1143f92919706402282c1a7af5617e66068ba52f9f4abc53e9281fc6f1b72640e48c92c03d
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nb.tar.gz 19894546 BLAKE2B a433ef5b84c421b102113c408394ce5c23dd6523fed447946dfd829f6d2c399d119b08a99a74d45ff22df274620028fc82d2c0a5238fc008f8be2c2b35efeaf1 SHA512 4198be06c45a611d19f72244f54e5d3bf1ad235b29577acd7c86773256070a6582cc911f78081cafbc1ae5fd90d5e93821d7f5d59b7ca80f49e0ce4c791fbb08
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nl.tar.gz 12647595 BLAKE2B 907324b2e5fbd19c00bba6847118e550b23285aa2119d939dbd382ba1eee3e16d3e0ab48a7846529d06ad9c7df259099558393aae0ea8409212a0325028729e0 SHA512 e9c40fea81e5eb9b714db17ee996cb374926fb226de411df5dddfd81fb508c7155432e51bdb1bb5f38e946f7df56de8222739b8febf0c1aeb716ef7c89e42f9b
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pl.tar.gz 12989006 BLAKE2B d901589a322062282c93fcd09af8f2e14b14d3c3b0976bb3d2d5581d535d2c84722d3204cb82e2b2467d76f4b59e3c1f7c39d058aaf3d0aa628edba758545b46 SHA512 6230effc4e367581c453c3a157c418c8d272b28696a4c9ebe6ef1ea20a22e25954dba0fd23cc65111b0a33215c8d859751afaa1f7ea291756da085bd560fb2ec
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt-BR.tar.gz 12663140 BLAKE2B d16f4df897f2fef8546523b69fb8e74e4efbfe234efbd8761947d107dd3ec7c47fbcf7e732bb6fb0a8834363b6ebc865892e5717902e305bd6e2ad537cd9929a SHA512 098399a2d8a07c3719f7991c88b09912f94e5d153ef455dd024d9b3c3e0af35f6e2480cdc3b810cba610831737e958c27738b23572a014efdfdbdfbf5f0be9bf
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt.tar.gz 12657211 BLAKE2B b208b62b060e366b53248ed95c85a48b5bd8bdea0ff41fda64e026ba5c0fe80b44a29093f758d760f602e51022b896fd703ecdbe1d8d7f9c9d5afb9f49a831a3 SHA512 f4f4265f700a57802bbd38cc7b93c0a6481793563da652402437e35def06d17b83cb62777b971a5d01042aa6b9903b07ade3c1dbd54ff4be1710e863b35f3ea6
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ru.tar.gz 13745088 BLAKE2B 3d0149d5c6b6dc6002c59280c70cd8695c974415eed03000e9c20fedd7066f65ede81ad738d5ab94837dec570e16656b5e729a1d01aea306ae75bf4bf314aeb2 SHA512 5a5fe8bc44eed3221f9aec1b88ee4452aa94ab4022f2d5cc4ce16657ebefa9ac54ad63249dafc27ace5fbc1680668646ec0d0383455d7d8f1d0c085a2b330899
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sk.tar.gz 11845729 BLAKE2B d5803605a5c17f347d8911c79a88868fd9850f8e40bbabdbf3ab4b5ea4fdb67ff5c711a2c48e42e624e562a63e18c48b87894c6be7f9e004679255b1e396c582 SHA512 7ed6cc44d1eb7fb53e9da900774d82fa04465311509b4cadfbdc7314eff6cfe986f28a5f2798427a98483c184aec5d0405706e733603ad8c52cf19c4bfb70576
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sl.tar.gz 12588498 BLAKE2B 539e09be77547f9f4d01c927e933765bab30cfc43f5b0f7a86ebe5bddea64093dc7f6b3f39a11e09af3b451abfe02e6d04f65793b8827c1004edfbc050ab4c8c SHA512 2829d8ccb3924032e3da52493f392300c9e792958f0d1f0741bd9ffb52b1c08ee03c8bfb59358d26d7a4de33ada99bb07f75b975fe2f60c3ac3894d1ef085f9a
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sr.tar.gz 18739899 BLAKE2B f8577a962e41b0a06a8af2f6cb8618b35261de897fcde0565e477e2ac67871e5f79340a32ff639a8f0552da223092e5aee88a94b7a043242c46589f2f6fa1ecb SHA512 31ef5aa8a6c1a45358c4d4698a37bab284d8cb18382655300c64dcb1279299487aced18088c8a1e4f92e6b74952fe6cec39600f62dabae26c1ba279b7e2e10da
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sv.tar.gz 12480605 BLAKE2B 0ed2fb8c42ae945b6295ce5ba5efe363ca006e22ec10bb4f5cd876f959549dfb37a19d034ae1c8133cd46466ba2c245c6791fa9857e8d1221ea119c3fb0d8962 SHA512 41c1a96a604abff270e5fd8f2778409bc0240b076fd0ea124af6a2a226561cb10bf00a76a138d371f6aee319a157354ca165976d273ac5fe9a5afccb44f9aeb7
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ta.tar.gz 18758959 BLAKE2B c5a81f46388028af87615c3ef4e51e1c9631acfc29893e9ccd0138b7baa51c3d0b5f35c06baa6a1e3e50b52bea8ce9afd72dd3731e5314b20b60806b8a28e335 SHA512 ad4c368556e9d2c86c644fb1aa836b7307f0360db1dd2eb145ff931cca7f2a45d7266c6cb69e13d9d3846a4a66e233e77cc4c4e6ee5e90b39ebad232d0d9c78a
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_th.tar.gz 18709675 BLAKE2B 3bfb00fbdcb4915e8a573b9a9944c9891366b742a0e7a2c248d1a8d3fe9c8454d27dbcc169f74beb12320ac7c603a85b8aaeeebab2868766171d9fce08a1fe5c SHA512 f8ac3c0f8936a53460150983a430a4444e0fc14f746251a55d4a7b23da62d363b133f981334cf9846917d09b9a1aaf2c04e3924d0f59966a3a8b70c75babd18f
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_tr.tar.gz 12183721 BLAKE2B 7efbcd1072fa77998acc1631a205b256e3aaf6f9f4caecc40701ae0813436ee5741ae79a2174c40584f652b47eb0b44fd12a99065f82e98086022be332640f36 SHA512 e8ba453d303e147ef6e2e824ebf4c11f831952db7ec3bf88623fae8a8b77106d16e90d3bfb64075294f59d7424be83382ee8cd0ae32b04d0552e392c565d00ab
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_vi.tar.gz 13428682 BLAKE2B 8e5d8383ca82d5d6cb81fc342cd26a4a6179c18000dbaee355da0a90a64e42c73b7fb4c28f9b949a5393ae8545197d1c06dcf6927bebcb8125d5fe307c6d5799 SHA512 a7dd65da20f3880b7a66b631b01e5c76df546695ce36b0786dd43a138cc04de32a33653407d2b24b23fb09ab4195ef17517a99cfb2370ba65e09e693c667c2c3
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-CN.tar.gz 13866846 BLAKE2B 28fb85f9400111af2860e86e36984c9ca3e60b6211c6af8908a62356f6c95fb8cf922d307cb9d8fbbde7aa8064622a5e8970316b4b73f0d1194c0d7b5309a32e SHA512 817df1b5a71f8aa6dfc9519b25cd95f36586fbec49ef1b756962e0d2e2a1de59842469fe2837a70c3a3d2c825f35b2f4cc938941e9efc2d93a89760e1e67f2a2
+DIST Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-TW.tar.gz 14075055 BLAKE2B e817734424d509af57cb5927d0a035e5605f15c68ba9e84c781332ece5222a70dea1839b6de5d8dbc394b4ed8ec01204cec6121795a4326dcae2705def2d9c53 SHA512 ff42c6a3123a84f737049f7ea9025d40d6e9eabf482882a54fe26f215007260ca8f6526804be660f104f98fa3bdfe4f15c3737ae1f04f18d771c73f5d810fcbb
+DIST Apache_OpenOffice_4.1.5_Linux_x86_install-rpm_en-US.tar.gz 153718557 BLAKE2B 18efbf0cf595bffa30a7dcfc0f03965b3156655b074351bc573c24a7442d3cda14f01ffaef2b35713b9c44489c39a2bd8d69dd49a9b034f04584cbc2b4431787 SHA512 b70d9e37324cc420031fac85ec5583c33117cc73b34c0c04c4596fa46eecefb0f015c90c4887a32db2e79db4250afb05963263f17cfa4cd6f53bd8dac21e90cd
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ast.tar.gz 18760382 BLAKE2B 57ac1f14424360b956df1d40409ccb743296dbbb6b2d3f6e551a8d3b36addcacfa09c921a236a4169b035a20bd88926a9c8c80a85aba1e91c9eeca7b9976c7d3 SHA512 f8e75a381cc38916ada5a3233327dbc9cf6e1464c2cc37d9e669d12250dbd65c44b18815613824fd867bce0cd270eab8be037a4f44f4a6b899f97ad6187f72ee
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_bg.tar.gz 13615011 BLAKE2B ae208ef8891a7470d99963b64bdc1a6e06c63098d686c9af76b4f75c5d0be1d8a040ab9a628dd32108da7e1294110635ab2660bbebcfdc46a17b135feac1cda1 SHA512 e06226046644ee3ec8f0ffa3a1405bf88c588457806186eb849b25fa3ca836fb2adff8e20ab7e870e6a3804e0193bee29499d11a76f8a10eca3527aa00f9c841
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca-XV.tar.gz 20198429 BLAKE2B e81f2afb1c1462c5f10baf0ae81eddb5e8214ce50f0ad4dc8b8a77dd0364fbb8266c447a87b255d4672b715d033144e84b294684ea43d9f673119004d35ba48d SHA512 f877eb97d2f4a07ab3799480224632230a52446a4fc68400097475fb4b87bd8d217f561a85024d7374c96897c6be5daf54867ec9c5378468524043df8d234988
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca.tar.gz 20191353 BLAKE2B 9cd4c312530f3b0bb79eecd6a4325cfb4f1d8ec717af56962e8a71fd95a568fcb00310155408e0b43aeaa60e218a7ebc69f7da27aceacd34d7e6e36211d23adb SHA512 20437978b43b367dae86758e7c93d829a3f025710969311c09b2f2df4568294f3295f03255b21e20eeb2b2eb6d930e39c3a3db531594a8cea5eb8925ad4c9c2e
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_cs.tar.gz 12659295 BLAKE2B 43b0b1f372d17d5ad5ac1cbce0e17ca51078d88313a8f4242264e6bfe0d3c1d8de3bbb3bb67a6e1cf40c95918eb91bacdcbaa02eb5992a54ec56ac2c65ac9efd SHA512 f3e99bfc5d9e87c95ca64e600698dcbab2dc8375ac50913b120f1ccf64ef96e320ee4d090150bba7bfa9d217fee046d7690876fff557bc960367214256ce9f71
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_da.tar.gz 12445545 BLAKE2B 79eecb9bbc1f2de861ffe3d72e07f5aa399395e43576a6b875db718bce9acf3b2f404b9cf5266f84eb38a1e637c9dc42c02d36afba932ccba4656e867b8546f9 SHA512 56867f44a30540702e042e153ef8fc12258666ae0d93b08cf2061c3f46fd77f97b18c68f5ff2d5f503873931adfb325e8b502614b52276d70f564dac9b3a5a98
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_de.tar.gz 20377297 BLAKE2B 9e42585a303a0c9183ea245deeccc50f6db6d9b6254735a914f04cc59e702787879971fa41b191a7f7980f3094c865b3aef83eee7e182640da83da8d40f96e5d SHA512 6b9f948d90d921fbab940dc84c71e75b05cdecf4bc307c883bfc378aa0e3f0ef050faea2e08446795095f078e4082c1bc7f93223868e48dbea14a3ff8c323b9c
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_el.tar.gz 21721268 BLAKE2B e86be3a20df5356ffc80f88972c7ddeb522d73e9ecd9841dcdb76100e573a9bfb1105bc7279894331a3eb10f6566a7dda18623a6fda8ea4a53b4a37a25dea7ce SHA512 098d41179a2d56661cc633f61835e5b78005c678f28d42f8ac61a126e8ca0ecbc734c1932dac9647cf037854b28e001133194e7c53fa731fc56762c1b7bfa276
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_en-GB.tar.gz 11408102 BLAKE2B f3aa4a2233d8f834f7cc843883d48257542a24b51361c8a74caa38cdce28841979d7c4ff9ff5dcaeab7955b40c3e0fbaa0b2f9d030118c08e31eb420ed6c7290 SHA512 499c0bce1c5c1a63c4039720082efca7efc3d5638e1dbff1782cfb625b1ac8d0dd8a919c294f44fa6322493599b75f7c24de47128a193d5391407dbecffc326f
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_es.tar.gz 12846846 BLAKE2B 8a9256c423300b33a7eb6a17958dbe00183862b062e6d0913060395c293370c13885692adab565a25b07271cd921ce22b33f6bd3ba8eac00a04019bf0ab21bde SHA512 5e753a1c83d92db7f63b7fa892a46972ac6c93a7215d7975fee22bfbe6501d90f5114059b965fc7b6d6d5f528ad39cef289e33492d1d36edd4977f5d88c8d538
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_eu.tar.gz 12701503 BLAKE2B dc5483f34980627a5c01af92bdc6a7e067065b9ed41376c1a7d1f4c9e672f587c981d8fa19bc70b8a3ffd344ea6ca7b77d67ff447a79873e217b6e0354674ab9 SHA512 c021b9912debfa61f750d5f0d5a6c0af3d4cc1701f594d9765fa8bb395d1c264c531b46874d68a572cd429afc2c91ef2ca0e57b7122d52793aa1241902d5c121
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fi.tar.gz 20474968 BLAKE2B 74c28e25d66bea27c000880bc3b7cddec1b807d32a0cfc655235575fbae9377500f1f448dd90469a735edee5e8255365ae63a94d625de83cf0ad20fee07ecca7 SHA512 54ced5ab3b96dd41129f8b4cada2c27157d93fb881307978e4650f208f17c1804469c5a4d12ae8caa1efb5602e92894027051e2bfac51d018fea2bdbd260435f
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fr.tar.gz 13073076 BLAKE2B efd7642f365c33f6073f4e4cae07aa5ea352adb9338f6d0a1dc2ca1dc35b1a386d4ce26e7e92268acad5c972d8cedad2b885814b7d8ce11c0a80b66e3f6f7ee0 SHA512 2651471f395796a81d448d5d17559acb40710027745fe3b09ee83fb2a2e1e53cfac2251c7921d717fc4d3003365d6608c71d6e19e5ed3a96bf899f826c08fb79
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gd.tar.gz 18765557 BLAKE2B 4af94b03b7e56a375eb613e7a5dc4d2478bed9ecb8f539b5bd34bf0f7684008cc344fdae7338d4115b96e235da7ef3f5af11e0cca416167681a57ec8d1f1c568 SHA512 1dedfdfb6f50230317782920076b29e77da810942ecd1836e1c7d901d4565f01fbeb87092f530731c7438db0f048c5e055487ed8f8b6386b4ecafdb3cf92db08
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gl.tar.gz 19783346 BLAKE2B 4f2357b308d16bb2f541961da354f61c6132e7c4d1e6bca4f2bcb797539ba1f97932a138b418b1288a1ac92ea905a078ceb0f02c29157322a1d2da3f4dc01cc6 SHA512 5efd4779e9052b42d8397aac1f91e7d09793efde99fd489ea0f2e14869c34584296a2d519557105ec98688648897eea322f3f51c3ad74d242255b8bf6a55cba2
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_he.tar.gz 18786236 BLAKE2B 0f7d89fbac7352009d93fa79e7b6b0d925ec05249c25a145d8456dfc155b4fac7dfeb266325e98c0535326d53c699eb97086dab521b205d3de280a2bdb7d8de5 SHA512 55872655b9828d61c11d0efbc5942db9dcbdfef4c4425beff2706b1b256376584beb84373d72aff32e1c438076e52bd4e026f1cb4b95a8e22e71ececf101f1c9
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hi.tar.gz 19745031 BLAKE2B 72f625cb77bb9930d25c97914050b47c41336089c32e2d88c3a8cb6143a8bfc3c266dedb980da1add569babb57aa7dd5dabbf84d0873cab5d45c67e410a7218c SHA512 690002ea5ec32386b499a755d61e9165cdd6b069256f12562f9c714e887e9db31b22bfb43cff3aee56ef1fc1fcada26b8eeb5d9028739692f9a686c204889e23
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hu.tar.gz 13112913 BLAKE2B f4667de0189888de8384940879e9052bf78dbcc1daffb20497d988b99454ef1c7a92cbf400f112d5ae41557252679a43d59312b630934a199afd5a8c6c73b006 SHA512 0852d0bb2e848852dd89cbd3b49be56d0e4dc721643a98e1e28d4c9ba1f1ef4486aab98227db5e20261de5dc30b1ca17b9df2f2df8207857474ee9a1e31b0bb3
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_it.tar.gz 12816714 BLAKE2B c31784be7f8b0a1fda80d002f1ce8902436a1ce8c836c5b2b4bd8216125b7115c68df65a43d9c2451358d0896fbe6c404379d921a08cffc7e0a5c13c446c2d9e SHA512 67b6405de1d69811fb18983e935dceb1e4cbc869bcac8a8927fe5bf60e3e5808610cdfbdc2c75595f6d6ab02fc5446b22ffe6b398ca4ff17230aebce9686946a
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ja.tar.gz 19064109 BLAKE2B a9c36d0c1ad00cf355d39dc339bb902d8ac793dba967d6907358ff57c5bff870b0c8cc55d1490478085129b4e7cf0f1f719739006dfee735c541527ca2aa293b SHA512 365e1d1cf7566273aab2e62149d1ab98a6e27400ba873c84d8f57ad1979bdaf56f1ef7d26b916825ce7067de2aff9f76f42026c8660a788ac4acd43c464fbe1a
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_km.tar.gz 15972227 BLAKE2B 6680810b1378272b441fce4768915f1601647ec3150c264974e82c6766aceecb4e36b7ded436c5a4a68d9be2aea12f52253882bb2855d37ff9145ea970be3973 SHA512 8dfd7be21b381ab23c62d29fdbf7d8d5f927ffda977630c7dc7f3e94dc9628c294f4b2bb7f875c0954f00eb3e25c9663ea292a86b892297a807cbfa02952c047
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ko.tar.gz 12562372 BLAKE2B 30279eab85129f431a3f6bc6d9a9fde49079be595c7227d1823c722ae5002d23b6978aa6474b86c28e5eeed019656bb23d3e15644338fa466547c5f931bc8b41 SHA512 7a6836e3b8b2781c1e59974e0ab22de661f0be6190b5450037d74c0b3c20142e0d7a648c687894b4a7bf431fbfead4146cdd39fcdf802e4275a67b071af94828
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_lt.tar.gz 18662302 BLAKE2B e4fc8a94007ea7e30e8d5980e3c8af2e021336cc393c9ce3a3db67dbf20ea5497ec3f378cfad04c4882a588544941a3693bdde1b9efda49834a693eeb46f4705 SHA512 688f5899cf6a1751c7dedb3fa5ab46414acb5d05208c1377e57825d24ab678da2852fe8d961e69f1e450671d5a6cf6b869e8b803fb6cc0f938f1aa44c392be10
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nb.tar.gz 19900987 BLAKE2B 48f7f33595101ed7598ff18fcfc317b5e601d2a3326c2cba284176ad2f998422a727d6672cb9a6f7e644819714876fb7effa220177f7a3a55ce7068ecd146594 SHA512 f4c210cdc95d11dda191c615b8f9ffbe3103fc798d8829e448133ed5815ee09b2cf823248887850577f3e96bd75aa8c84f22394f1a9f37386bd5fbc14c019850
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nl.tar.gz 12652367 BLAKE2B 675028d17d5754bca6a3cf6ccafd6e0caad8cd471dce09ae20cc78aaa5cdf87fd640626ae3e3c2d871343cae98a17318c9f5e6d9ca2941d7cd5297e3b8342619 SHA512 51876e6691873f66294a6b9be6124063e893e4dea66184d9c25424fea29ff078941f24c302848d0cb97405cc8069385ef2bec2a3c029248a55173913a0e1c3b0
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pl.tar.gz 12995512 BLAKE2B 1161fa419c719ac2d27e7f97a0859ff3aaa86f46e58f4318d0e2ed2283a0cdf48df179bb9bc3ea8c94d36ffbde455f2eb916abecb1d7faac1cdb3c6f6d01a809 SHA512 9d6e46843230b39d24e916fa92c65dd3a0ad827b6f850dbc91ffb2989877df6ce8ebc9d7aa6e0dd8ce6235b32da1dc870ff9b15be1b3ac35cbe004c6400f1321
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt-BR.tar.gz 12667276 BLAKE2B 8206a92f551bd520f45ad228c750ec4fff100004280c022d554388b404c409f088e99c2bb5f2ad9a371d19f0005f83b28e7087ab6b613fa3f0b7c8ceee2cbc1f SHA512 d9e4ece239c302992a76e544a787ed86168bda710fc81c702bbe68ebc05d22c8d4e5f2a4ee8d3e9e77d7b328b4cad25296e8b4ab1b300189691507a1669d539e
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt.tar.gz 12664966 BLAKE2B 2aa395a3ce21d736dad5c7a0e965732c823531c442e1806cf09beb8b2c06873bf399820098a2efc6118ab1ec5698a59836736c147cfd94170e4bb0163f8236ba SHA512 ab604ca45528a22a63c52fe39105d9fb57c75b4a7d5d408415d8892eea2d0a3bdad40c98128070e27dec465bed0914ff241f9eb56af9de5f89aa0bd8e86eb131
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ru.tar.gz 13750863 BLAKE2B 5911cd5b68eb7b594c30d0b11ebf6073af2bf4efa2ef5f0597542806f6c602e0a0884215e401cece5bc9c269a825e18491331928ab911a785e24c39452c7e90b SHA512 774d61dcc0ae376bbc0dd48f324461ac030c2dbba846046f265e72f3b20703b3d6e9c42030eb1c49cb03fb4949d1c184f6b78b26e0744f975b1bbc975caad695
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sk.tar.gz 11852209 BLAKE2B d02af7efd89e5b1ae5fdc3649c46a61ad72bbe299f3fbe60d3734357bdd6c90b2c277a54c906b53de56e7ffac44a618b1725a0d1c6c45eb2bb4adfb0f362ed23 SHA512 90f144a56a9b803bd51293db674f387e184e71d88589b350c0607e20a9b2ecd949e668275aad069a1e56cdf8247eb701c864d8b6eb0fd85a8daaffe4e222d1f6
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sl.tar.gz 12595612 BLAKE2B 06c93f875bf8e3820934eb2a192b9a212418f0d2430742ddf0150d0193700be3f9b6da84d9a725292544ebcccf4dcfa83dd5cc7daba3c2f8e888e3b2476a328a SHA512 3c3b3f61aa5dccbbf9dc9c24f398f365e88e33b93f7236499a246eda1deec9efa342c685ddfdb40fd57cb55e21a515354d724ab1a17b7de98b844745a3871446
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sr.tar.gz 18745906 BLAKE2B 7d2a5de775279fdbbd7cc9ebabe45c3c634e51382cdb7eb4e9b77a1144b5c4f2ea9e9a8aacc4a212c2009711e6b03fac0032543ce2ca0d8120faac7381444ac5 SHA512 6e9e918bec6d61d8435d2c6795669d45dc182369b9089e9730e82f977527f53709ce6c88d233e1559c2793fa5199b4032da8860efecde815ef216c97566865fa
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sv.tar.gz 12485627 BLAKE2B 7e6f0fff6a49d5f11c1d928f83f3c015260d7cdcb2ab676bca6efb206f9c8348d1ad6b86b128c86e5408fe62834a8067f394949bdb8f18e0ad5bcef130b25d10 SHA512 d31fd4dbbdc76004691ca4eb4f0325f21a559f4da4873e5f4f3c61aac90bc319da4239a8b10e51b25521c76df1f12840c388b918b771599168314ac472054d55
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ta.tar.gz 18764414 BLAKE2B 04defa39e4af5232d51ca0f9737e80190e984b3710fd865c6f17c64b4bb55f223a94b3caa1d810424dc763a08b041128b20b3d91affec92351840ef49c237eb7 SHA512 6aed523b12324c0efea13185ec027cec8788ccbde8b47192ff8f9e1c00bbb48071cadf7be476132cde93eacde82bf8426d668b44cf410611211121d4b6948e97
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_th.tar.gz 18716535 BLAKE2B 8a3925c90fb8f419656fe307c5c82acaa8218cf6f9d23c9e7966278b90547367b6733008809905dc2e1cb57ac4c36a8e5e32f093c241f194c6255bffad11f918 SHA512 bd0686f81f6e16bff6ca00c7f61aa5ff37718687de041c3f3e556b508e62a51ff6f367d0aa5f0a344abf1e618837b142d84b0ebd159898c5882a66e9615683ce
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_tr.tar.gz 12192098 BLAKE2B 8b752f668f732433293e7abf752b7d38b2ec88e3e316e2507c8f1392c9826d29f4bc442cae8eab45355e892106d73577c6e6274c6e99b2d0fd3acd6c38880396 SHA512 cba09f054259ff8d5af47df7fe6d62f2ea6eefa28aa5febcbc146c131d43c31dec8ec2fba2177a722699999a4203ada61a8b95625f8d9c64778577610a72a33a
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_vi.tar.gz 13435858 BLAKE2B ab60a610cd30d3ea0726f0a6111fa47c2409b9c7347d51b2aa10d8a09f4281e053595e017db5a5f98de338f9937237988163c7d31274ec494893dc04447cb919 SHA512 648af13c4c1aa8e68e765afdca078203ec08edd130bfd65cd1e81b45e0ee7c6ebf1c06a114b82cb36a1bbef9148bf9c2dccbd090fa1e8d828c67bd42d0872a36
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-CN.tar.gz 13870834 BLAKE2B 6eebb98351195f3712ac5db2134bfe97df9f3c5df12015f998d3b8dac18394c4b5f079f7274ba1d755350118f5159190c4735161dfaa652b75d8b1d20e6c00b8 SHA512 5a63e88278b18d76a497fc60829f533da8c9ac1c1af11d9b217942e57f14516784022fddbd1943ec4ed49efd64616f4496de11de9626e6787b8b35b6a06f9634
+DIST Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-TW.tar.gz 14082525 BLAKE2B 3799b4c5a5d282dd78e7d93687acacd0a4c0c08f9558c2baa2aa444425c5eeffd0616c0312b65b326619ac8865c505bcad6cf813a5bc338e424862273ede5617 SHA512 f82ec54a570c81180b0b98e026ca0009ec1ae890e25d92fde07a83bb285515db59c70fc7859c470233bedbb823b092ce94e7040589b37a24a6cec7ea042fdcca
 EBUILD openoffice-bin-4.1.4.ebuild 5117 BLAKE2B c02187358b1f646505617b9ea0c18c0d8da603a56e75f9575709c5ceeed066213402624705658f969194a9cbe7133da5d43c0aa62ec5b166d8852be6cbbc2dbc SHA512 844969f1fb2b2a4f8ecd483c55f7e290dd30ba3e228d779a0a5963016e35850e12fa082d28b342f6d1d1998cfddbcc97f4118e4c0ae1a399cd675ddc2b569757
+EBUILD openoffice-bin-4.1.5.ebuild 5119 BLAKE2B f9cd076226127af082a46ce0d042d3bf65447bb05f0625f22537b52f89b9a0e9dab08dd938efa8c6057a5c32fbe6987552b7663847ecef2cfb33f37610f27606 SHA512 56c3944f29135ab27f9a3eb32914fec1a599205e97eda658b24d42649143db0635dbb6ec74f836c3306a14a37fe5d7ff28f3950dfc02ff5c1b602e0433c230ad
 MISC metadata.xml 654 BLAKE2B 2373a48bc130966ace2a26ec4b666e4e5c0e533922ac41be7b13983cf8a905ae8b62c59f06b0d7c0eaa0219e2eefaf0d1f1edb8b57d9ad4a37687f807401e93c SHA512 e797f235f01e6f92a5bf7f10db539429aceca40b1c2fb703b736e83ee356126671977a8145907a43e84eb05e3914923ded9b0db4d4755954d9f4f519040b7162
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
new file mode 100644
index 000000000000..aafe4dbbad2f
--- /dev/null
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils xdg-utils gnome2-utils pax-utils prefix rpm multilib
+
+IUSE="gnome java"
+
+BUILDID="9789"
+BVER="${PV/_rc*/}-${BUILDID}"
+BVER2=4.1.5-${BUILDID}
+BASIS="ooobasis4.1"
+BASIS2="basis4.1"
+NM="openoffice"
+NM1="${NM}-brand"
+NM2="${NM}4"
+NM3="${NM2}.1.5"
+FILEPATH="mirror://sourceforge/openofficeorg.mirror"
+if [ "${ARCH}" = "amd64" ] ; then
+	XARCH="x86_64"
+else
+	XARCH="i586"
+fi
+UP="en-US/RPMS"
+
+DESCRIPTION="Apache OpenOffice productivity suite"
+HOMEPAGE="https://www.openoffice.org/"
+SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz )
+	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
+
+# TODO: supports ca_XR (Valencian RACV) locale too
+LANGS="ast eu bg ca ca_XV zh_CN zh_TW cs da nl en_GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt_BR pt ru sr sk sl es sv ta th tr vi"
+
+for X in ${LANGS} ; do
+	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
+		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz )
+		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )"
+	IUSE="${IUSE} linguas_${X}"
+done
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!app-office/openoffice
+	!prefix? ( sys-libs/glibc )
+	app-arch/unzip
+	app-arch/zip
+	>=dev-lang/perl-5.0
+	dev-lang/python:2.7
+	>=media-libs/freetype-2.1.10-r2
+	sys-libs/ncurses:5/5
+	x11-libs/libXaw
+	x11-libs/libXinerama"
+
+DEPEND="${RDEPEND}
+	sys-apps/findutils"
+
+PDEPEND="java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="strip"
+
+QA_PREBUILT="usr/$(get_libdir)/${NM}/program/*"
+QA_TEXTRELS="usr/$(get_libdir)/${NM}/program/libvclplug_genli.so"
+
+S=${WORKDIR}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+	eprefixify "${T}"/{50-${PN},wrapper.in}
+
+	for i in base calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ogltrans ooofonts ooolinguistic pyuno ure writer xsltfilter ; do
+		rpm_unpack "./${UP}/${NM}-${i}-${BVER}.${XARCH}.rpm"
+	done
+
+	rpm_unpack "./${UP}/${NM}-${BVER}.${XARCH}.rpm"
+
+	for j in base calc draw impress math writer; do
+		rpm_unpack "./${UP}/${NM1}-${j}-${BVER}.${XARCH}.rpm"
+	done
+
+	rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
+
+	use gnome && rpm_unpack "./${UP}/${NM}-gnome-integration-${BVER}.${XARCH}.rpm"
+	use java && rpm_unpack "./${UP}/${NM}-javafilter-${BVER}.${XARCH}.rpm"
+
+	# English support installed by default
+	rpm_unpack "./${UP}/${NM}-en-US-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM1}-en-US-${BVER}.${XARCH}.rpm"
+	for s in base calc draw help impress math res writer ; do
+		rpm_unpack "./${UP}/${NM}-en-US-${s}-${BVER}.${XARCH}.rpm"
+	done
+
+	# Localization
+	strip-linguas ${LANGS}
+	for l in ${LINGUAS}; do
+		m="${l/_/-}"
+		if [[ ${m} != "en" ]] ; then
+			LANGDIR="${m}/RPMS/"
+			rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm"
+			rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm"
+			for n in base calc draw help impress math res writer; do
+				rpm_unpack "./${LANGDIR}/${NM}-${m}-${n}-${BVER}.${XARCH}.rpm"
+			done
+
+		fi
+	done
+
+}
+
+src_install () {
+
+	INSTDIR="/usr/$(get_libdir)/${NM}"
+	dodir ${INSTDIR}
+	# mv "${WORKDIR}"/opt/${NM}/* "${ED}${INSTDIR}" || die
+	mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
+
+	#Menu entries, icons and mime-types
+	cd "${ED}${INSTDIR}/share/xdg/"
+	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
+		if [ "${desk}" = "javafilter" ] ; then
+			use java || { rm javafilter.desktop; continue; }
+		fi
+		mv ${desk}.desktop ${NM}-${desk}.desktop
+		sed -i -e "s/${NM2} /ooffice /g" ${NM}-${desk}.desktop || die
+		domenu ${NM}-${desk}.desktop
+	done
+	insinto /usr/share
+	doins -r "${WORKDIR}"/usr/share/icons
+	doins -r "${WORKDIR}"/usr/share/mime
+
+	# Make sure the permissions are right
+	use prefix || fowners -R root:0 /
+
+	# Install wrapper script
+	newbin "${T}/wrapper.in" ooffice
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/ooffice" || die
+
+	# Component symlinks
+	for app in base calc draw impress math writer; do
+		cp "${ED}/usr/bin/ooffice" "${ED}/usr/bin/oo${app}"
+		sed -i -e s/soffice/s${app}/ "${ED}/usr/bin/oo${app}" || die
+	done
+
+	dosym ${INSTDIR}/program/spadmin /usr/bin/ooffice-printeradmin
+	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
+
+	# Non-java weirdness see bug #99366
+	use !java && rm -f "${ED}${INSTDIR}/program/javaldx"
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+
+	# remove soffice bin to avoid collision with libreoffice
+	rm -rf "${ED}${EPREFIX}/usr/bin/soffice"
+
+}
+
+pkg_preinst() {
+
+	use gnome && gnome2_icon_savelist
+
+}
+
+pkg_postinst() {
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gnome && gnome2_icon_cache_update
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
+
+}
+
+pkg_postrm() {
+
+	xdg_desktop_database_update
+	use gnome && gnome2_icon_cache_update
+
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index df7531264bfd..6c8af4fe4ca6 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 06b6199f7db5..90a8a46eca4b 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,5 +1,5 @@
 AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384
 AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5
 DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
-EBUILD coolreader-3.1.2.71-r2.ebuild 1769 BLAKE2B da957458ea637448ecafb9966b41b123923eca91a11dca91e8119172198e40ecca163471bd645d57499dc90aa4fb44542b92afab2e787d4a615efa11ec9fd66a SHA512 ba1db10c44e2cd8ad697596264d041c3eafad8ea82fda1878ac6077696e928b3e2b3ac335f63878d7849ffbecd66ff5a220f64e3425315c5f1520176c842d0bb
-MISC metadata.xml 528 BLAKE2B ab49d8fb15bc3d716c5f027a3d1615963f68745dfd9d30a072b4211693d1a7bd78ba74a649435c03824ade40ce9db8018a3995e691543cbbe21fb172ac8db33b SHA512 7cca7abbe95fc510c91f0c3b4db45257b00dd5497c1f978e398d4e5a7dcd8238e9056b4980eaa9e4cbd97cda9b5781186f87301df17383b051a876d0974cbf8f
+EBUILD coolreader-3.1.2.71-r3.ebuild 1661 BLAKE2B 00ff6e9c7a6e73f09e1c7a7197c2476545fe3424d7325e4a1d5cec3bdebdc505c146890303738d406c4c82bc16173ab510713ef5e7400c5a43b5b84d92433791 SHA512 72c1a9b718ce1b165e410b40907c45c826d04b2cb5fe87c6c215de46dc6dc5dd8f32740297abccd226477621b31a8d4270616e938d994f8e67248f39566b4365
+MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
index afcc1ac458be..9c7e43e5f3f1 100644
--- a/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild
+++ b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+WX_GTK_VER="3.0"
 
-inherit cmake-utils
+inherit cmake-utils wxwidgets
 
 if [ "${PV}" == 9999 ]
 then
@@ -30,7 +31,7 @@ DEPEND="sys-libs/zlib
 	media-libs/libpng:0
 	virtual/jpeg:0
 	media-libs/freetype
-	wxwidgets? ( || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
 	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
 RDEPEND="${DEPEND}
 	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
@@ -48,10 +49,7 @@ src_configure() {
 	CMAKE_USE_DIR="${S}"
 	CMAKE_BUILD_TYPE="Release"
 	if use wxwidgets; then
-		. "${ROOT}/var/lib/wxwidgets/current"
-		if [[ "${WXCONFIG}" -eq "none" ]]; then
-		   	die "The wxGTK profile should be selected!"
-		fi
+		setup-wxwidgets
 		local mycmakeargs=(-D GUI=WX)
 	else
 		local mycmakeargs=(-D GUI=QT5)
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
index afd1b4bc9da9..0bc14087cc2d 100644
--- a/app-text/coolreader/metadata.xml
+++ b/app-text/coolreader/metadata.xml
@@ -8,6 +8,9 @@
     A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices.
     Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI.
   </longdescription>
+  <use>
+    <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag>
+  </use>
   <upstream>
     <remote-id type="sourceforge">crengine</remote-id>
   </upstream>
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 823302c596f3..017ad5ba351a 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -4,10 +4,12 @@ DIST dvisvgm-2.2.1.tar.gz 2841744 BLAKE2B a9221bd927544249a30262f1916a1323efd3e5
 DIST dvisvgm-2.2.2.tar.gz 2848315 BLAKE2B 157237fcd7e61a9cf7978f3b595d1ac5fa7765dc1615721dc9812a27e26b20f077aa46535fc19f9fee28bc5714467f6176df6ab1ca094be2299d77ae4542a103 SHA512 e15384b4842a9c6963110b96b611f4f4beff301818972ef0aa77590b7aefdb488c3df16f93a5b786c97229df730c112db97770b612786fdff9011b5a2808d917
 DIST dvisvgm-2.2.3.tar.gz 2813537 BLAKE2B 0cc2625c779d22dceef8b26c0e977086601f246beed5610f722e2efe59ca617b29f27bf5de87c7b1aaf2b87ddb3320ede9852b39bd8633ca13594752e62869f0 SHA512 b3d17f13496a371914baa0a498e845b5c52dd74bf3d54cbd86fc91977f786d148f34145fee53272029ddf7507e468c827a41ef48ba2fb02212448858e868ad03
 DIST dvisvgm-2.2.tar.gz 2841354 BLAKE2B 713257347b258338b8ebf408ee6affddef4a53b51621496cb64638e295a27f90ea03f6d752b692f609429f1e5220363f866e4bbff3e82de1f4a03494ded3052e SHA512 310b3272f41d3378ddfb5663d4b6906f7b1cd1dfbbcff0ad249b27c5c37290c5eb496ec84a536f3166a51de4708f6069da9c6811bb7fc9e667d00b1c3aaafd53
+DIST dvisvgm-2.3.tar.gz 2816291 BLAKE2B 3c804b49d9a5447063cd70646d0c6bdb56bf7f457aa84a4ef535341e2b5b9bea2b3dbb3209c3afebb5ebaea04300b5784b25ed244145a1afd6a8a4974326c914 SHA512 b1efc505db2c52471306eca099285c35685cf92d0f084a46daa476423d3706a2a3260584f9fdcc5722630a49b4178c9bd36d6cd8019a5b4c9f3759468e8e8313
 EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
 EBUILD dvisvgm-2.1.3.ebuild 1145 BLAKE2B e82da95f1e0ef36b946ed42c5ce02a2aa3ab6e30bb81d01ea6d59a664d524944dbdabcb4562cfefb5bb4d1c9b4f79dcae6405bf5b708a59a7c603914c882199b SHA512 37c82be8f2bb33c19e0a82f8e6dc927973b727e9d406591a4774f12f1179ebfea4c04dd5c79bdd28869641afbb65c44bab0a8589ecca1ceaf62ca2da3c2f1b0b
 EBUILD dvisvgm-2.2.1.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
 EBUILD dvisvgm-2.2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
 EBUILD dvisvgm-2.2.3.ebuild 1185 BLAKE2B 0ae97decf87076b5faaefa67c17c01ddfc4e6811550d3dbbe3b25af423ab53a66c6035391ed59b3eed6e323ebff89eafaa5679b931077dad57deda3743941144 SHA512 af5c91311b75be4c344d94748c650ebc317db6e7ca961f0d4dd834f817870623ec2302ade85cb1f9e9597d4799eff2e7c40f5dd61b9ecafe95153047f4ac7443
 EBUILD dvisvgm-2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
+EBUILD dvisvgm-2.3.ebuild 1159 BLAKE2B 30ef40ab739050535e3741719be165a3342c9524a3384c9482e9381782fd22bdfd843e5010f2569466e11ed679405b1bb6ab3d2a910d390916cd7d0b648509ac SHA512 0ff07d7e87ef3bc17ff1883ac3fae3292b4232c441e04e0ffbf575ed729574896328a47055485a777209c9a637a0d3469c697bf8e4f7c044539ef6c6b72fce44
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.3.ebuild b/app-text/dvisvgm/dvisvgm-2.3.ebuild
new file mode 100644
index 000000000000..83e11b6eb230
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 69e086e47d2e..c4ba1a8cfc31 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,3 +1,5 @@
 DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
+DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
 EBUILD htmlmin-0.1.11_pre20170909.ebuild 634 BLAKE2B 9a55a43ee6ffaa3e5a363df3f776164e9671ff0c43d121bf575ef43a5e8d6de35368cc187e8af782f14a993966f8f141dc93df7eaf89d72422d757a6f881e0ab SHA512 c39a88b40626f7e8e943d8ef05fc355d523d13b65577c6e535139e8fa958489a83490bbff47a9cef2595f1e3c871512e4083bc3b115864f2d6644662e7a2b608
+EBUILD htmlmin-0.1.12.ebuild 510 BLAKE2B 7fbcff6d9ba90ef0b0fb54cfb2193dd6af3df6a48fb26770fe4a3c7a7fe760052359e06210156c46523f70efcc05ef4934bd96abed2e53cb11010b006d27f648 SHA512 7161bd303a555e2d70dda490d5c5ced5c2b43891c4455767736ae69d8790a90dceb75312c3c0fea7ab59a070b7ab9bc98a55213ebbe51c37e4f369f2e609fb7e
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
new file mode 100644
index 000000000000..3f036caef84b
--- /dev/null
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -0,0 +1,25 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable HTML Minifier with safety features"
+HOMEPAGE="https://github.com/mankyd/htmlmin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed '/prune/d' -i MANIFEST.in
+	default
+}
diff --git a/app-text/pdf2htmlEX/Manifest b/app-text/pdf2htmlEX/Manifest
index fa94b790b324..30bca1ff1f3d 100644
--- a/app-text/pdf2htmlEX/Manifest
+++ b/app-text/pdf2htmlEX/Manifest
@@ -1,3 +1,5 @@
+DIST pdf2htmlEX-0.14.6.2.tgz 9066685 BLAKE2B b139f72c806e432facce5472e55a23567e74204829956d06bd9ead0426cbadad4ce36c581fb1d39c96eeef27fb416b2c6387dff7b0ca08b10479de24b8ffdc9b SHA512 03d04437386b2eb83530551ff15ce9d21b7990127fa659d204a269405f0d49912c622687eb6920cc4e88be8e94ab41024b378663effb61d1eda905eeb98093d3
 DIST pdf2htmlEX-0.14.6.tgz 8955179 BLAKE2B 68a474a0afce7e505af0331c7a05e745d0c18057c0e9dab0f57f8455b36489c399985d2f69cbebc2c3df3264ee1eef43346df49ff9ac3fae7edd3bbff884c6d2 SHA512 0bef898653755da3d731a99f2850d11a686a1db589c615216c84dcac76f3a3c41f561732fe37be262cfec3f65970b2704819c3bd4d94d87cd63d26f062dacf50
+EBUILD pdf2htmlEX-0.14.6.2.ebuild 979 BLAKE2B d91ed9b11885a230ed270e5b6d607f3ee46a622ccb9486fc00bda81b58c5555c4ba34eb8852bde4e5e0953aa301fe6a9f2ccf9e22db5ab276d1134ff52bb5622 SHA512 01a3ce13e12befe178c77253dac2787fac6aee446c93a0dd3bb6b35fb2d53b9e83b35814229d260f2be6ac24012ce2bcb16f88889db06625fe182f1608f94dca
 EBUILD pdf2htmlEX-0.14.6.ebuild 559 BLAKE2B fc566297c6a7fd57a4bb36f74ceccac62dfaa3a0d3b18469420171b92cddfecccd418dd9d8a8e3a5eff35d7504f50b84cb026764c28ed3d9ca38fe0be248dfd0 SHA512 a903ef5c199c68c8eb5243dd1abcedf0bbad5d7b13132ada1affc18a635e27ca1f52b075c2221dd67e5a5a69fbc85d2ab1a1a0fcbf0398e91bb705b3343f0a60
 MISC metadata.xml 355 BLAKE2B da386c9bf8cf6684e23a3bf7638d341b7f8872ecc7d733b946ae697e9e13096df65398f6d4b2d4594b47eba7ec1e482dc8ab14a69395ed1a32c00cdc7d91c2b5 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
new file mode 100644
index 000000000000..384d67d85f05
--- /dev/null
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A precise PDF to HTML converter"
+HOMEPAGE="http://coolwanglu.github.io/pdf2htmlEX/"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tgz
+"
+#	https://github.com/coolwanglu/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+CDEPEND="
+	>=app-text/poppler-0.61.1:=[jpeg,png]
+	app-text/poppler-data
+	~media-gfx/fontforge-20170731
+	media-libs/freetype
+	x11-libs/cairo[svg]
+"
+RDEPEND="${CDEPEND}
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	local ver=6.4.0
+	local msg="${P} needs at least GCC ${ver} set to compile."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! version_is_at_least ${ver} $(gcc-fullversion); then
+			die ${msg}
+		fi
+	fi
+}
+
+src_configure() {
+	append-cflags -no-pie
+	append-cxxflags -no-pie
+	cmake-utils_src_configure
+}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index fc8d20639325..6b0be365379a 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,6 +1,3 @@
-DIST xiphos-4.0.4-20150830.tar.gz 8040173 BLAKE2B d70641d1ead8bde745fe64a758df2f441bf38e1c1b55ea78eecfb60cbb9d7e41c120c87fb4cade81ed17e2f3530b9dcc04ebe7150aca5faea5bf5a47b991a6c9 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
-EBUILD xiphos-4.0.4-r1.ebuild 1997 BLAKE2B 112e9fc41bc71fffa20e028a29cff313a143167e06aaf0e081d7217578ee9d10711c015013030390fce804750e41fb718f0beaef29181f616ee70cbdb4aa7227 SHA512 7f567d2a98ebc2b0804a30672cad38c715bb8eaf455773a41a291bb1ab45d0416bdbd0d2c92fcb34a303c104087cce757f417492d4734c06f014b3f9208a334c
-EBUILD xiphos-4.0.4.ebuild 1974 BLAKE2B 133c2f68c34faf7955225203f58c1dd1cbfc5d01128bfac51ec65cc1884a0ea32d2bc1eabcf65d71349077fef361be693da17e4ec4136cd54683907c5cd399ce SHA512 3d8c9effc1d70ec378c886c29cc8134ef62272f046a2ad4fbd3bddb95a01a6206f86047be32337f37c40fe4ebbce0ec87d2ca8e8ab8b998135af2d4a5fae37b9
 EBUILD xiphos-4.0.6a.ebuild 2045 BLAKE2B 02426203620395f5a64438b0a7f97f41224a454fb8fcab01b61a6bb607bdda89ab0f47a1e4d44372db100abc8b8f28f0aa24dcff6cdb71f8e98412a589747d7d SHA512 e33b0410713e889a93febe02576e6a8213243be185c66b3b947fb0e7dc48c76178a05dc3e031f81bccf89668f9feb64f9db45fd59babaf263576ac58c3d85000
 MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.0.4-r1.ebuild b/app-text/xiphos/xiphos-4.0.4-r1.ebuild
deleted file mode 100644
index a68d218a8e36..000000000000
--- a/app-text/xiphos/xiphos-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20150830"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/intltool
-	net-libs/biblesync
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog README RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
deleted file mode 100644
index 12931a93f012..000000000000
--- a/app-text/xiphos/xiphos-4.0.4.ebuild
+++ /dev/null
@@ -1,88 +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 flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20150830"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="mirror://sourceforge/gnomesword/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:3
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/intltool
-	net-libs/biblesync
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog README RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7ee0248834c9..9cb8d47b2c2f 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/xtrabackup-bin/Manifest b/dev-db/xtrabackup-bin/Manifest
index dc79375bba2c..338f63266428 100644
--- a/dev-db/xtrabackup-bin/Manifest
+++ b/dev-db/xtrabackup-bin/Manifest
@@ -4,7 +4,10 @@ DIST percona-xtrabackup-2.4.6-Linux-i686.tar.gz 80985248 BLAKE2B 5c946c4986713e9
 DIST percona-xtrabackup-2.4.6-Linux-x86_64.tar.gz 82382422 BLAKE2B 5dc098f30f9ed370a7b44ad2561fb9c5b75bdf7810908a350b936497465c536c3366ede7135afde1cacff6d25a79df7c8979c8667fe64d5af56edb00818552e1 SHA512 7299f7e47417e62fdad5fdfb0637d4ba7e94e0804207ad690cd8573fc83e5eea15d0c5504bc084f24cec074765f51fafdb780115bbd336dd7e36ad123fae218e
 DIST percona-xtrabackup-2.4.8-Linux-i686.tar.gz 79705968 BLAKE2B e10625d8082cfc683151bf011df7050f4618038b4babbe660bb36068de99b7e8f5da73972e72801947fd805bc0e764e8a11be027de59cd4300671ee69291e112 SHA512 8c1025e56ec0d6d6e73cf13f22858a81ce5390a691d5bf1989b42162c0b93837f73616ead294c5f14838b461b5124d2d9cbb6650ab9b089f1820a327a7bc4341
 DIST percona-xtrabackup-2.4.8-Linux-x86_64.tar.gz 81550220 BLAKE2B 7314b08deae3213c1e94404ace7c3f1397c948da1656ce623d31aa925c495d0dccff23f5102e111f336436452f18b5a3a64e56074beec396b43aef61373ab693 SHA512 e89d5cacb80022e1e427d0837137f14b9284e92277cde2f2365d1e4ede4d63d98c990dbc4ab65c8062f144d8a1644c2b9c9adebc220d6d251c9f00a2f2f53bfc
+DIST percona-xtrabackup-2.4.9-Linux-i686.tar.gz 79816483 BLAKE2B 0fd97ee14c97f66edf629fa0300bfa2d6b333ac5942f5cee46dd9d0ad04ef2fe12750209971ff8f6a8ca225a85deaa42ca64c484e12e60c85789153689e55c42 SHA512 014921b0ea9fec783adbdd4556301e8df77f801729faae5b2b7245c349df069fc3af33ebef5ec65ef0e020c7b0ec8ebf4aa7a7acc0e9936c6f4a90b721a5de19
+DIST percona-xtrabackup-2.4.9-Linux-x86_64.tar.gz 90282874 BLAKE2B 2c4cdb8c6da443baf01857fbe4b27be002df370b67687f417a9fde6b08a5e72482552b165a9f27fda305787b42089fb138a4fca2f1d683afbd42efa23746b13c SHA512 24138c098d8e674de291dc494c38f2fce52f4d6a5a2552a62b34ea801b867431917449656f990043c7bbbc1e18a8806c4343eadbe1fea17e36ff1b10109e5047
 EBUILD xtrabackup-bin-2.4.4.ebuild 1467 BLAKE2B 25a1c2fbd6559f68cb4c20d3e05c69f4de1e3e0bb6887e9e764fe37ddd2b2d4d3f05c460455fc78dd4ee946c75611ae1022bfc8da3da61c7163ca01f17253d40 SHA512 cb611868afef4ada30674f1061e1b0d64158eb76013a54c055d04b7d2f8e6c667dd612a0db9d612699bdf4e162f16e0f9426b503b879b87ab9133b71a70c24b1
 EBUILD xtrabackup-bin-2.4.6.ebuild 1469 BLAKE2B 9488fe85f0e59cf753153a78c09a1c69721a6d30628f54a0ee1141fadcc5b293b286dea017caa6e109adbe5e43000af12f22120ecd9f8ce199f8651789930ab8 SHA512 015dc6f0f1a09839a3eeb9686ce33fb68abbdcbad45cb8a542376696117dd93bae52e9634788af9a430066bef903dc9ec44ef70497ba83c7df0790f2fb018f39
 EBUILD xtrabackup-bin-2.4.8.ebuild 1469 BLAKE2B 9488fe85f0e59cf753153a78c09a1c69721a6d30628f54a0ee1141fadcc5b293b286dea017caa6e109adbe5e43000af12f22120ecd9f8ce199f8651789930ab8 SHA512 015dc6f0f1a09839a3eeb9686ce33fb68abbdcbad45cb8a542376696117dd93bae52e9634788af9a430066bef903dc9ec44ef70497ba83c7df0790f2fb018f39
+EBUILD xtrabackup-bin-2.4.9.ebuild 1469 BLAKE2B 9488fe85f0e59cf753153a78c09a1c69721a6d30628f54a0ee1141fadcc5b293b286dea017caa6e109adbe5e43000af12f22120ecd9f8ce199f8651789930ab8 SHA512 015dc6f0f1a09839a3eeb9686ce33fb68abbdcbad45cb8a542376696117dd93bae52e9634788af9a430066bef903dc9ec44ef70497ba83c7df0790f2fb018f39
 MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.9.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.9.ebuild
new file mode 100644
index 000000000000..734bbe0fa11e
--- /dev/null
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN="percona-${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases"
+HOMEPAGE="https://www.percona.com/software/percona-xtrabackup"
+SRC_URI="
+	amd64? (
+		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.tar.gz
+	)
+	x86? (
+		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.tar.gz
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup?
+DEPEND=""
+RDEPEND="dev-libs/libaio
+	dev-libs/libgcrypt:11/11
+	dev-libs/libgpg-error
+	dev-perl/DBD-mysql
+	sys-libs/zlib"
+
+src_unpack() {
+	default
+
+	if use amd64; then
+		S="${WORKDIR}/${MY_P}-Linux-x86_64"
+	elif use x86; then
+		S="${WORKDIR}/${MY_P}-Linux-i686"
+	fi
+}
+
+src_install() {
+	# Two new tools with an old libcurl.so.3 dep...
+	# TODO: Wait for a new release using libcurl.so.4
+	# net-misc/curl dev-libs/libev
+	# dobin bin/xbcloud{,_osenv}
+
+	for tool in xbcrypt xbstream xtrabackup; do
+		dobin bin/${tool}
+	done
+
+	for man in innobackupex xbcrypt xbstream xtrabackup; do
+		doman man/man1/${man}.1
+	done
+
+	dosym xtrabackup /usr/bin/innobackupex
+}
+
+pkg_postinst() {
+	ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup"
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9f47509dd97b..562cdebb39a8 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index c14f39506fd0..243a1b8e0ebe 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -23,6 +23,6 @@ DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
-EBUILD gnat-gpl-2016.ebuild 5534 BLAKE2B aceee4fd037ec7915fda0db68f39c85c29fcdccf404b2a786f9d5167544ba53b8519d9c20c43834a9f4f36b0553bb643dad1c959bf5be9cc620e7b0117e17545 SHA512 119c1bc55568214c66199911d6f00abcd957e617d93122af344a638d4892d0966cf579ffdd1ef1e51a1599e54ea93ef6c3afed02ece01d08460174b09ce5bac6
+EBUILD gnat-gpl-2016.ebuild 5533 BLAKE2B 19e81c9796fcd7a11900075a9efa1fc2e6e141e94728d05ba2c42388ed149a7cec662a1c0e9c1342cdc4ad436ce0ba61c16178671f5ba7b6700f1ece04ccc758 SHA512 417cf2c2db26c04fbd03d4c27b2cdac9ea6775f2285d27e3c946d29e1c6c9b7604bc17e3e49f0e4e56eaa1643120bb8c57c9c86c6674ebeca4ca7f532c2093ab
 EBUILD gnat-gpl-2017.ebuild 4780 BLAKE2B 294c5feb6017864e3f064d240b120cd6b9efeb49657d97a1d1f907ce8f9cd1d8ad0295cc1a73410ff084d5c4972c4cbf86b998870294971a40b3dbb162b2d05c SHA512 4f5783cad29f9bcf342c2a435f6a953a6f05ce37ad2b970ba0439638052625763b933f893607adcd609bc9b7e352b1359be4d1028cb56b26010325869fd94d09
 MISC metadata.xml 1960 BLAKE2B e66552f4c0655619e736b6af14822d84e6c49aa6c019cb8c8b0e215629f9c8ab68aa55758639e35107120a39c578d82e1036bc0be82ff67728104f44c875d107 SHA512 04f14bcdd96ae4f6e285abfd07de89828eb989ce779aa59decf689920a179d859ffe809d7960e9c3599c2f6fff6ab2aafbb54458da07fa91841c61e0dfca47ab
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
index 8a347c7803b4..cbbcdeca4f8e 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 
 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bootstrap"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fd57513a4c6c..78c358e3ac80 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 6de42be4a8d2..4819b63cda84 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,6 +2,6 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b33
 DIST elfutils-0.169.tar.bz2 8067758 BLAKE2B cf4c11619442fe19a5df95b79546af879771890b069de44743440ca5f6b44ac471125cce21fb4b1533d5265760e9fdf2ea3371c36bca39713c3e587987b69cd9 SHA512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 EBUILD elfutils-0.169-r1.ebuild 1807 BLAKE2B 3740f463d0df20cc0cc706f0ebdcc5785b6a1e3eef60722cbf322e073c21130fce50db293df352549a9eb1f1a26104b1c79e8b8e1d56f0cafada1887bdde2f66 SHA512 5ae2adb8d3263555993d269e015985e40a1d979bd65ee3731168455babc0c16169a3c32cbc1ef237db92edca74cb45d50b327721fd11cb5c1ad0a028cc5d1538
-EBUILD elfutils-0.170-r1.ebuild 1808 BLAKE2B 8905d8c0c5e73aa4c3532fbf9b74b811ee45579124d6652b978c8d4bc91a49465c424b21f5f0284ecf1254f922d27cc39c952325b2ad52f4b2280b10307d6aab SHA512 7c76ef622a096df1b05cee2f8d863d8915a8dd762947392e8c028e2e1ba41b6b69eff35185d0f4f8f3e51eed1f37f72c5f9740ee21fa484975bacf3fa99aa172
+EBUILD elfutils-0.170-r1.ebuild 1807 BLAKE2B 5674dc6de2bca1cd5bde706893c6092e03bdf111b5b8ae95262e73175ddffe0154e593476a90fa7f5643a22e2c9f9111f5c670f5cf0cfa05c4e7e7d9950af8dd SHA512 133ae942d2d7f0a81284545db5b9c30448c79b4d99d3ef07475b446927caf48d8b04b68f53c5bb78befcf0864f38d5995843b2c733e0ff13ae32092d02584ca1
 EBUILD elfutils-0.170.ebuild 1811 BLAKE2B 460aafa4c30eecc5cebae1409280fd9a334f8c9dc3ebcbc96903eebe69805ab62668d1b467427e9feea035ce564aff0bbf1be195f78d63c7e49b0f8359cbccb1 SHA512 c86b7cf333da96fb7704aacf2bb836a42dabfb30d3aec60fcfa524b96ce549607b4ad25aee69f1fde9753cf7b8b82bb4590ed15a2980fc0329be7629476a37d8
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.170-r1.ebuild b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
index b3d09b13a9b6..b01d0ec89fdf 100644
--- a/dev-libs/elfutils/elfutils-0.170-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest
index 89a769d80a7b..1a28f40f0f26 100644
--- a/dev-libs/iksemel/Manifest
+++ b/dev-libs/iksemel/Manifest
@@ -1,9 +1,6 @@
 AUX iksemel-1.3-gnutls-2.8.patch 488 BLAKE2B 7834ca7b056b44534cc1c3301c9b58b66035c7d20e0f1e2c1f23ec6ec2d227ab4914c4c16c555e33fe9a5d39d6171864229071048d0ca9a93273b84e6c25c65e SHA512 6b2d4f71f5da6da8dcdd9f6a8921129d2f2bc71e6eb0c331d74784ced1bc3a0fb974ff1e0342f93d8ba3b4217b72ade15b1bc4015d2f2486aa86ca75549a1a42
 AUX iksemel-1.4-gnutls-3.4.patch 1656 BLAKE2B 83d8e5f2e5aa7fca4721e35be46ee08cbaf8f6ab66be86e1d01766c567fbf8762ed7e7d13d729afc2b44b460e0fddcc9474e61af3c81fd2696fbe1ed71f57c1f SHA512 305990e760218b1ce59e55aefb31126174f6a8066b9ef20ed3073332ad4e925871709e4c5b52d1e3fcde7b2fc9776dfd3f74a763e897cba4eb45657d3946d518
 AUX iksemel-1.4-ikstack.patch 955 BLAKE2B 62223a269c7079fe40a0b835c1a6d2a34d0dd9b3424ae45e0f14712d388547321e66cbce2763bb73065ed53df626a572e6a72d4550e85801e3390a5a61dde7ca SHA512 d97dc724c9b41983e91889e742d604ad9cf752536b012c13a5667c59baa1f5467dc02e7e390e4eba02475e5c994484428c26079351f8e9450b7de14e08eb0cbd
-DIST iksemel-1.3.tar.gz 485208 BLAKE2B 868ae403cdd0fea6bb765620bb9e2823a88220d1781a2ee1bdbb826a0b3305a2e2bd5ead3924aeb3106174bc8bae9365e4c713f3f71d2036c79cc9acfdf0c7b7 SHA512 57a0f8d5c3e675419b8d4d04580c144ed20466d1b41ea23006bbb588eead595f189088b3fe559b62d527a2773cc4f92b6c09d19ed7a2b8f446d9ba13546a9d03
 DIST iksemel-1.4.tar.gz 515581 BLAKE2B a0e9b8dc6f9dadc04d17d2952034b56c4665c7a9c0549bfb52e3adfbc7fb6af17d1b0de978835081e0d39c8200e41d5528f6b3e1dbf51a4fae160f59d5c474fe SHA512 902e326647b63a5e58b1c396a401bdd136ad01ecabca81b543c0ed76ebd8d2110377015fec1be09551b92651ee093e480fa37aa2186f7791147f29e0933852cc
-EBUILD iksemel-1.3.ebuild 821 BLAKE2B 5bc8f3bc36564cdaa175df9c69f0f90abc75887c56334449255bc4c26d73a3bb5fbc0d90d2fdb7742cb5358a5f3c13cfd6143ea256f9ba6107da2136d98dd18c SHA512 031f30ea70c8300882eea2c91aebcdb0bc46e1a584e70ec6ac6dd33a81fd56dc791e08b427287b7a7162e5b658887fe2cf6910a69ea90ff2bbba35fa30b1d09f
-EBUILD iksemel-1.4-r1.ebuild 836 BLAKE2B 1715b449776fb2cf9457105fad61aff226f04e0198f2e119566dc9b1ef39fce583c9f0360aebbd81e2317c77278121ee1d9e55b47a6a04678a2731c487576163 SHA512 0ef2940c397bb5570fdf906c7c90831441b76f931e968af17b5c5758e8f37750428231e70acc8fda13d5b9c3d2a46e328c0a22dc8248fd54c000d13db58a4667
-EBUILD iksemel-1.4.ebuild 861 BLAKE2B e96f7039339a17f84eb2afa8ca05e36d5a4cecad22548b548db3ab54068cc4b67d5737d18bbde1619a6b824e47a2006fb933642fd3114aa0427d7fca0cf2afe7 SHA512 6704e457ee5422bf64a042dc6d4ff6a4e59e695c076269b75c86ecae9f04dfdf981ed0a83d711e925d89fc71a6222bdce0615f7539889b8876f685d73a08ec6c
+EBUILD iksemel-1.4-r1.ebuild 893 BLAKE2B 13a4ca3121c7337093c9694009b0491072626c281194f571dac61bd44d2d29f9372a44df5933941f3131649d50682e0612554749f6caba08925d33a2f6c863fb SHA512 1eee495e88774df647b8604e52801b6a229de535fae9599d686d93f6512fec381c4f7766f9235476e16f346ac6d22c62d970372bbe7a5e0160e738cdea7e8a0c
 MISC metadata.xml 301 BLAKE2B e3de81d61c491692f64943d6478ab64332cccceac5947b522a6d6b62127217792205e16c2ea9d04de150772b3337a38793a79e950500b43e837f309651cbcd6f SHA512 91ac21f435ad0c2943e17058fec736cb0371690f38427302eb360a284b48017841b807cf5f6f13c6c837af9d1c330dc9a7980ff77a5699e2efe399b01ca840c0
diff --git a/dev-libs/iksemel/iksemel-1.3.ebuild b/dev-libs/iksemel/iksemel-1.3.ebuild
deleted file mode 100644
index 1dc6fa062b8b..000000000000
--- a/dev-libs/iksemel/iksemel-1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
-HOMEPAGE="https://github.com/meduketto/iksemel"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnutls"
-
-RDEPEND="gnutls? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-		gnutls? ( virtual/pkgconfig )"
-
-# https://code.google.com/p/iksemel/issues/detail?id=4
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gnutls-2.8.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with gnutls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-}
diff --git a/dev-libs/iksemel/iksemel-1.4-r1.ebuild b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
index 502052fabde1..9865b314e4a5 100644
--- a/dev-libs/iksemel/iksemel-1.4-r1.ebuild
+++ b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
 HOMEPAGE="https://github.com/meduketto/iksemel"
@@ -11,16 +11,18 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="ssl"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="ssl static-libs"
 
-RDEPEND="ssl? ( net-libs/gnutls )"
+RDEPEND="ssl? ( net-libs/gnutls:= )"
 DEPEND="${RDEPEND}
-		ssl? ( virtual/pkgconfig )"
+	ssl? ( virtual/pkgconfig )"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3-gnutls-2.8.patch"
-	  "${FILESDIR}/${PN}-1.4-gnutls-3.4.patch"
-	  "${FILESDIR}/${PN}-1.4-ikstack.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-gnutls-2.8.patch
+	"${FILESDIR}"/${PN}-1.4-gnutls-3.4.patch
+	"${FILESDIR}"/${PN}-1.4-ikstack.patch
+)
 
 src_prepare() {
 	default
@@ -28,10 +30,15 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with ssl gnutls)
+	econf \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
+	default
+	dodoc HACKING
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/iksemel/iksemel-1.4.ebuild b/dev-libs/iksemel/iksemel-1.4.ebuild
deleted file mode 100644
index fb97bd0b62ba..000000000000
--- a/dev-libs/iksemel/iksemel-1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
-HOMEPAGE="https://github.com/meduketto/iksemel"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="ssl"
-
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-		ssl? ( virtual/pkgconfig )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3-gnutls-2.8.patch"
-	epatch "${FILESDIR}/${PN}-1.4-gnutls-3.4.patch"
-	epatch "${FILESDIR}/${PN}-1.4-ikstack.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ssl gnutls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-}
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index ed7b4d27cfb2..fbbd3ea9c984 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -1,10 +1,8 @@
-AUX 1.0-asneeded.patch 4256 BLAKE2B e73a7100bb87af13af4ceeceda2c7fe0dbc3bd88577600e585ab7f763fa43120c4d8f0cb2a66f79070bac2d545e2ce2d0ead85138ff9e7b90002f37dcb88d45d SHA512 fde4d6ee84f3865f84ebb61d42c6c8689e81211cf09987a2167638e46ab490cf87271e592f7a430d6228f5164eb8922e6f882b97689342669a4b364e621116ea
-AUX 1.0-doc_install_path.patch 1150 BLAKE2B 40af6eca8f584d2fb334e069e3833211f5b7ffcc44a6a21b6624e4dc4f8561ba45e09e01db4bd93ba482e81ccbe280d5ddb86b916caa790d123a5292e8e9daca SHA512 d65b1313830536a78ba5cf0ea45e95650c1e58ccc79cbe8e060dc50dfab0a1d1590c75e972407441f4ddfa51fd58731207e548442f81089efd4404581641e2cd
+AUX 1.0-asneeded.patch 4260 BLAKE2B 1ca62ef0541f632474d8be23cf23caacc8fe153c70dd58c51af173a8e4b8c0a7a743b425ade6bcab422974e0f41f11308569d94316d44587328079f0fef15299 SHA512 36031e48cdbc6a94b18a399fab3257b433ef5ea873b3fbe57e373f87f491945aba5c99cce901fa4203cba04aa5f420872a957dc066f53afe5315a41c233b450d
+AUX 1.0-doc_install_path.patch 1010 BLAKE2B 1f8f1b488e2ee87ad29738d175e2a2cb205c174553bdd5f7f6d6095fb371e8a255e2fefe023ada1fbcbdd8fd60953c5d944bf74566975fa0b0a1cc6fff1a2d1c SHA512 1f72992eaef44bfb214132736590514b57bb4321d3fc28412b19e5f9f6a7a67fc63a00e91af9cd85f6b921de36b835ce238b40590850f1a7f19011dab595b73d
 AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949c78732d887e0749818da1d94ae7f9e85d53ec2631e73b3baff2c2cab98ef926d38e0fa6bb0b2c083d SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262
-AUX log4cpp-1.1-automake-1.13.patch 288 BLAKE2B 3cf6c23fad3827e6762af9689a9978aa4b41261750456db561466909637a02806f59e91f77b89268cfd57ce4b0d526cb5ed090d7e7af19cd636e47b85a1f960c SHA512 344c1cb481139debc8c2f79185ad1ba2abead0b1c39ee42bede44078273951f2b207a6e906227fe0acab2b83067311ded6daf4ac9d701fe7c18413d84362ccbf
-AUX log4cpp-1.1-cmath-fix.patch 286 BLAKE2B 5f8eac41610972c061fdbc0844d9151cf32733d6392351611d981021f3475ceb6f7a7e2b1744f8e9583d419dc55489d77ba9249e3a61cb5ebb9767ccd71c7b5a SHA512 e1af4f7e6f33b5d28eb4c9058730689c9570ab156aa4848fd9c7ec8c1395052d75dec2a6cef556050cb5919d1205c918002458183192441f3f44ca67d5ae8d24
-DIST log4cpp-1.0.tar.gz 495726 BLAKE2B 9b639eab2b1f9c56202901a19595f220fda5355630835d28012f45e9d570be7149b477a8e6512f6998de48aebe7374d6e12126982fa0b4fbbee7eae91cfdc3a9 SHA512 461ce64aa6343c90a909b4f877dd5cfae8aad12a94965c41ad619da137e76fdf48f045a2575273971115aa56ee9649f59453f7c3c265678bafca93289bd9a012
+AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5
+AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb
-EBUILD log4cpp-1.0.ebuild 797 BLAKE2B 046cb6292041178752f33dc47d8cba3e89f321846af7cb0b882fce0677e1ad85f9a870d44758097461e979bf97c7dd2d710ba886492ef8e4cf834d5796268a26 SHA512 5930cb65a8a6654fa89a36be70f580bcb628d919aa0ca258a2de2bdb143409a9147889ad57b522f903358a7665388fa3381369ce91ddc9cc9ee8cefb6b3f88ea
-EBUILD log4cpp-1.1.ebuild 1145 BLAKE2B 5b8718e75b90726921e38dc9932d5314f2c257a04bb73deea3362095b73c7353e0ebe08fd7f418005b3692ada6c4d8c8ce2ceb766451cb5d997e6db56043836f SHA512 a32421f79c6ae075c7c6db2db169e0c3611dc0e9fccd5b090626e67ee9c632bd05ee881eaec33c560dbfa5719af84ae9a27f709c477c6ebac38c5c7495ebce96
+EBUILD log4cpp-1.1.ebuild 1180 BLAKE2B d2479b287b38fc15721b40067055239de919631624c61f969ae4b7cf42ae493d95e3480ec850eae0f1add7bae2aa421c00faefe4486dc2f16ec29915e7b50e5e SHA512 759252ba0fe75e6654980f45ec40474dcc5105b302545bf299f4918b39570d19e2fe6b57c0f125c7a1a18d1fcee9ffbb8c1bb0fa8e69418b002bd57e17136382
 MISC metadata.xml 326 BLAKE2B 5a3581c83f878d7a0f3c9426a9b66b711087cf6d4234e7e9337108c148ae808100cfb54864d7c7db6ea951109bd8c178dd42f676e14c804e5620e1797e2213ad SHA512 007af73e5317d5cb942a532e2535e1b6a55d3a39300706eff6ac9d9215e017a3334dde7c2608289ccbbfc020bb7cea1ba75c4670d5770d4d63128cae902c81cf
diff --git a/dev-libs/log4cpp/files/1.0-asneeded.patch b/dev-libs/log4cpp/files/1.0-asneeded.patch
index e9fb05f4ae99..7e88c545a374 100644
--- a/dev-libs/log4cpp/files/1.0-asneeded.patch
+++ b/dev-libs/log4cpp/files/1.0-asneeded.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/247067
 
---- m4/ACX_PTHREAD.m4
-+++ m4/ACX_PTHREAD.m4
+--- a/m4/ACX_PTHREAD.m4
++++ b/m4/ACX_PTHREAD.m4
 @@ -266,6 +266,117 @@
          else
            PTHREAD_CC=$CC
diff --git a/dev-libs/log4cpp/files/1.0-doc_install_path.patch b/dev-libs/log4cpp/files/1.0-doc_install_path.patch
index 8f9ef5137619..abe88dfd123b 100644
--- a/dev-libs/log4cpp/files/1.0-doc_install_path.patch
+++ b/dev-libs/log4cpp/files/1.0-doc_install_path.patch
@@ -1,11 +1,10 @@
---- doc/Makefile.am.orig	2007-10-13 09:39:44.000000000 +0200
-+++ doc/Makefile.am	2007-10-13 09:40:03.000000000 +0200
-@@ -1,7 +1,7 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,6 @@
  SUBDIRS = html
  
  man3dir = $(mandir)/man3
 -docdir  = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-+docdir  = $(prefix)/share/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
  
  EXTRA_DIST = \
  	mainPage.txt
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch
index ffac4a1dbfc7..3e7cb560a509 100644
--- a/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch
@@ -1,11 +1,12 @@
---- configure.ac.orig	2015-01-14 09:37:13.616446476 +0300
-+++ configure.ac	2015-01-14 09:37:26.119445770 +0300
-@@ -17,7 +17,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -17,7 +17,8 @@
  
  #AC_CONFIG_SRCDIR(configure.in)
  AC_CONFIG_AUX_DIR(config)
 -AM_CONFIG_HEADER(include/config.h)
 +AC_CONFIG_HEADERS([include/config.h])
++AC_CONFIG_MACRO_DIR([m4])
  
  AM_INIT_AUTOMAKE
  
diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch
index fe3c810814bd..0180580717ab 100644
--- a/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch
@@ -1,5 +1,5 @@
---- src/PatternLayout.cpp.orig      2015-01-14 09:24:32.332489499 +0300
-+++ src/PatternLayout.cpp   2015-01-14 09:23:18.162493691 +0300
+--- a/src/PatternLayout.cpp
++++ b/src/PatternLayout.cpp
 @@ -24,6 +24,7 @@
  #include <iomanip>
  #include <ctime>
diff --git a/dev-libs/log4cpp/log4cpp-1.0.ebuild b/dev-libs/log4cpp/log4cpp-1.0.ebuild
deleted file mode 100644
index b5571d38673a..000000000000
--- a/dev-libs/log4cpp/log4cpp-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
-HOMEPAGE="http://log4cpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc s390 x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-doc_install_path.patch \
-		"${FILESDIR}"/${PV}-gcc43.patch \
-		"${FILESDIR}"/${PV}-asneeded.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-idsa \
-		$(use_enable doc doxygen)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild
index bea580222cae..c2371180dd30 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AT_M4DIR="m4"
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
 HOMEPAGE="http://log4cpp.sourceforge.net/"
@@ -13,20 +11,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~x86"
+KEYWORDS="amd64 ~arm ppc s390 x86"
 IUSE="doc static-libs test"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
 PATCHES=(
-	"${FILESDIR}/1.0-doc_install_path.patch"
-	"${FILESDIR}/1.0-gcc43.patch"
-	"${FILESDIR}/1.0-asneeded.patch"
-	"${FILESDIR}/${P}-cmath-fix.patch"
-	"${FILESDIR}/${P}-automake-1.13.patch"
+	"${FILESDIR}"/1.0-doc_install_path.patch
+	"${FILESDIR}"/1.0-gcc43.patch
+	"${FILESDIR}"/1.0-asneeded.patch
+	"${FILESDIR}"/${P}-cmath-fix.patch
+	"${FILESDIR}"/${P}-automake-1.13.patch
 )
 
 S="${WORKDIR}/${PN}"
@@ -36,6 +32,8 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 src_prepare() {
+	default
+
 	mv configure.{in,ac} || die
 
 	# Build tests conditionally
@@ -43,13 +41,19 @@ src_prepare() {
 		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
 	fi
 
-	autotools-multilib_src_prepare
+	eautoreconf
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--without-idsa
-		$(use_enable doc doxygen)
-	)
-	autotools-utils_src_configure
+	ECONF_SOURCE=${S} econf \
+		--without-idsa \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/mdsplib/Manifest b/dev-libs/mdsplib/Manifest
index 425128906a2e..d81736e49b5e 100644
--- a/dev-libs/mdsplib/Manifest
+++ b/dev-libs/mdsplib/Manifest
@@ -1,4 +1,4 @@
 AUX mdsplib-0.11-gentoo.patch 1696 BLAKE2B ffcac6d7bd2b7500b93aed0566ae198515dbe7d1cc8544ba8ee04b861be53ca938f328ffb68bc58891e16079c53b1247855a77416b43d59c5243c4fb4d6c6fc6 SHA512 fe38e841473c82eababd0e40a7cf226f5545b1da0c957e50c737aaa8303a4aff6b5baf52b10dda5711c4313ce4712e9eee60e0b8d2a298fcf8c45be87f83ec46
 DIST mdsplib-0.11.tar.gz 70435 BLAKE2B 8a2de901d8f386a989eedb95f85171e93d51e9c87c45b0fb6bfcb76bb3d6394a0a2453cdbbb6cd2b87e64a16eb18201107f7b61fb0747a1c9e53df77f0479c04 SHA512 5baf7c23884ab21d2111a05c97a988ff82b003f0b3243ce5fabe5a9757c149a007e7ec6e0baf80de4fa75630c640b2411598a0b06848c7b96fd6ef070e76a687
-EBUILD mdsplib-0.11.ebuild 697 BLAKE2B 63e05259083a7a6c13cf8781272b6cde2d7f9f6baf0575d9d969b806f522c202667be082ad9bacdb7e478aff53b6a73babb4bc9a952c188579a5f019d5159efe SHA512 8fd2e846db16bbd94402a5e44b30d4d2341a0677950cc89b9047585b2079ad06585f7ca95829e7adc0742a1e6767e8a329f321133e4bcbe3e4cdd7002eec53c6
+EBUILD mdsplib-0.11.ebuild 557 BLAKE2B d59bf5fba6582c20ed1161c35030b4727e4a6e0519b2acbc66f68177ce0c473c58646d6560cc9dcc5c7faeb71d71ac6c4260a3e19571019fcd6640fc048b11ff SHA512 dbf14ed89a15d4f93042e9370c3ecdc12d40087a74f7444127bbb2cb7e1592639394108fdb12b271d78aab5519e3783122e24b1721d629c05897c9c4f5af51f8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mdsplib/mdsplib-0.11.ebuild b/dev-libs/mdsplib/mdsplib-0.11.ebuild
index 6247e54974ef..47af62190af3 100644
--- a/dev-libs/mdsplib/mdsplib-0.11.ebuild
+++ b/dev-libs/mdsplib/mdsplib-0.11.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="METAR Decoder Software Package Library"
 HOMEPAGE="http://limulus.net/mdsplib/"
@@ -13,20 +14,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	tc-export AR CC RANLIB
 }
 
 src_compile() {
-	tc-export AR CC RANLIB
-	emake all || die "emake all failed"
+	emake all
 }
 
 src_install() {
-	insinto /usr/include
-	insopts -m0644
-	doins metar.h || die "doins failed"
-	dolib.a libmetar.a || die "dolib.a failed"
-	dodoc README README.MDSP
-	dobin dmetar || die "dobin failed"
+	dobin dmetar
+	doheader metar.h
+	dolib.a libmetar.a
+	einstalldocs
 }
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index 8c7720d7d1f2..ba2682060a75 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,4 +1,4 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
 EBUILD mm-1.4.2-r1.ebuild 829 BLAKE2B 31dfd5f23e9f9516d531428fe89482bbe56db4a222e38941d69420f66705135d1dd98ad4c45dd680e0a72c828fd09803b217b2c1524272e3220a66367a8fc7d0 SHA512 2d8134d6cbcbf8c7fbef54dfdf6c9651c56243f325c073b9310692e5eeac3ef4f9a88612d5f2f73de8e5b6939103528ccb7cd9c7cb216b600917483f4e2271dd
-EBUILD mm-1.4.2-r2.ebuild 797 BLAKE2B 343f85d0fdbcae1cebcf3f2024b1d44a3b2acd09bbcf5b35a8ad7cc929d2451fa38fef154841eee5e068f3e0fe2bcf4eddb9cd7524e7217cb69c9d1621ed0222 SHA512 f14a0fec4efc37bb8fb3d588d152266d4ea81baed792b44fae66da80eb51eaf00cb179589ecac32424b8342de2a62d6516dbcba294e5f066fe62674bb39ca5a3
+EBUILD mm-1.4.2-r2.ebuild 713 BLAKE2B 9e682e847fca4b0edf7ba67237a5cc0f2e5df76477bce479291a5a39bfa35b08f397fe19f1e389fbcd4a7971bd8de7b305ba10124de73dc710bf5207af17ecb4 SHA512 56c41a233d8c96a9babcd2125adb1eba5eb2d47dd88a63de076ed436d97c3a7e8c9ca2766fd754fe8fe36d97738813d447a26f5cef472c6cb51cf569d7abee7b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 405cb0a82e8d..23b44f79179c 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -13,10 +13,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 src_prepare() {
+	default
 	sed -i Makefile.in \
 		-e '/--mode=link/s| -o | $(LDFLAGS)&|g' \
 		|| die "sed Makefile.in"
-	default
+}
+
+src_configure() {
+	econf --disable-static
 }
 
 src_test() {
@@ -24,11 +28,9 @@ src_test() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
-	dodoc README ChangeLog INSTALL PORTING THANKS
-}
+	default
+	dodoc PORTING
 
-pkg_postinst() {
-	ewarn 'if you upgraded from mm-1.3 or earlier please run:'
-	ewarn "revdep-rebuild --library \"/usr/$(get_libdir)/libmm.so.13\""
+	# no static archive installed
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 2e713567872b..b7560bcf2f78 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -4,23 +4,10 @@ AUX openssl-0.9.8e-bsd-sparc64.patch 1484 BLAKE2B 6cfba6ee4fa849e6d7799fbe749abf
 AUX openssl-0.9.8h-ldflags.patch 1151 BLAKE2B b215e46c380e571f153445f902803cf5d03d44f6f8b95a677c08bdf542e6d199c58f1f4699eb7dbd9de8bdc02b697a7971a9a06157d96c3dbd4295090a778723 SHA512 7f98c5ad310710aeceefd6fac440682bf2baaf41ce17de535add54af88c45fa0689e6e6c26bafb4fe2290fd3b6d80c51d85ffda1e276a73a3d66a319585aab11
 AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2a8e4a8b647bbec009a829ae4af8afdc7e7edac7a1eec8f13af1ad69b7036ca6af28bfd9509e6bba58f2b3906d6bdd5 SHA512 5e8a20111bd4809e7375c7323dab2c2edd6a131d1ec2377ee99c5e06ceb7b4b000e9606ba6d0e68cd67d8e001cc8194e11e301eace0feb066d5f3c5b331b5f04
 AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
-AUX openssl-1.0.0a-ldflags.patch 1095 BLAKE2B 505148de509219e062c519365e48fb05bdd8592201be0577357010b2029e6a8152d3971eb1b19826bd3dea2b3940e3385eac7f4cd6f83396ac8bdf095445c991 SHA512 80c3677313a6268fdc2eb7b556dc081f1047694cf932a8669820923952bf0e3002da4cd92d6a335b44f8a6ece7d88319c15e9c0171118bfc03ff7a9b718726d8
-AUX openssl-1.0.1p-default-source.patch 861 BLAKE2B fbe909dbe7b202f36541b541033f6883c12d78dc43e496ac61785ae11497f34665db57069c95fce0b8cad6d10f34affabcc8ec6dbbeeea421b7e45aa6e1020da SHA512 cbd47ae5553ec0e683a92171cb1c2e68d7eb0cf2b1787e3fe332ca2df0aefa31a1a74d60345d5e42d00bdda439019d089560cf2f5464dfe19ff7a3d6a310d06b
-AUX openssl-1.0.2-ipv6.patch 18811 BLAKE2B 56036b62751ddc9ce9e73546a56fc68ed2f97ffad94ed6a983e044f16828e8bb7bac9795852694bbc2f0990449292d2e7de7d8a43e506a493a8d39476980c917 SHA512 58e293f8f19a3fad08729b842dd977b73fedb0c49208d87a056bfea857c0e2b79a310d7d098c04429b65564fce64defeda6d1dcc3068ad5a80ef276db6421e54
-AUX openssl-1.0.2a-parallel-install-dirs.patch 2013 BLAKE2B 208d06d19f9e753e418619dae73b36c11eb86b090d61fd1fc35f0f819c52c09b6b0c194b1caeee269960a8774d6357ec86530227c405b110d0a28e9af6948917 SHA512 c3b97fa318b9627bcaf4f39d1615c46322c1081cded135af5b5115beb2be74ead46084119fce5643b12c54b6851c33bfb624694ccf6f3d32060b6d56239d3674
-AUX openssl-1.0.2a-parallel-obj-headers.patch 1359 BLAKE2B a9655a872a7dd75adcf5cdc7e3e344adc369243e30f23c9f3fad1f20a22d0a4a195590c1d9bc6335721ffd6d5c8823ca6d6d79118ebed94fafeb6665c6f42022 SHA512 ac8224bc088099d72e7e6761303b8653766372bd027536951c458bd22fd0526163de22bf27675e0292a12ae7257a5c1edf26a92747e00cc139e13e1b624b4072
-AUX openssl-1.0.2a-parallel-symlinking.patch 2041 BLAKE2B adf1701b1e02786032ae546d77fb4967aa1a67adef17cf5ec284df2593776128564ea81b77dcd499598f3a6ca3f3c525a0a06fec2fd79b131adb3e2fb02c6ebc SHA512 b87ab581784c285ef394b31baa1196a831a86c3b2d578704c9d8b80d68c70a8b19cfa88bd29b84578ed024135ae2d2ac4d622c91e1040074016b8fd104d6c05a
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
-AUX openssl-1.0.2i-parallel-build.patch 10065 BLAKE2B 3221de2e479e6c77d70637300bd8eac254164947de8f22f8dbaf7c6928d25975871c87e40fed4b95a3a008fb9d3b95324551f105b1b15d2d99353d04b8e9dd27 SHA512 2a95103d22263ca68582caccfb6860d45da20b92741824a794697eaa4e199199abc95ac8a62b821fc42aeab96098aeb89731ee535726e0a9e779dcd9bf39d12d
 AUX openssl-1.1.0g-CVE-2017-3738.patch 2317 BLAKE2B 93ec481b15075ecb94c175659314d6e5a90c1a513d8e82948823bce8c51214e7e27f72a56f9043f0771d5458159f1844e4ac8f6d12d0ed78cbc75a1b9630094b SHA512 4b033443d49d385d6ef9e89975af0e1d8108b97d28492239a427ac15ecc4e9c995b6a0df324361baefbe3ae04ecb97508ad7c80eb22b5b4a157a1a1b5c875b61
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.0.tar.xz 11572 BLAKE2B bdb9d2b8388f1aadf3a9274133aa8f86b0029fae1ce86d005baa39a7347657f8d4d84395b54e8ccd67944356ee197dfb527f843b4f146e305533e2ad5450721d SHA512 15234ade359a0acf001cf10c7a7fc05f54603a44c67831529c2a6eda03342f9ba1cf40664ac782b5b73c50b23ec5649fb48ccff2aea8f0df2ef634959c47e3e9
-DIST openssl-1.0.2k.tar.gz 5309236 BLAKE2B 97069b9c7aaab2381ae5be989caff6907cd44ab1831d84685c3421ad985889a2bbc3a462decdff9c4c158ace96975de2b9e49e4f1b9f306990c3dc0f03767dad SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016
-DIST openssl-1.0.2l.tar.gz 5365054 BLAKE2B 0a459a93a0013269dea79bd6df96a434b9dad95b6d98b24a48bc1b1438415c0a8de01b67166ac13a73ae65fb64131568924c3e6f945d862b7e960f05332cf097 SHA512 047d964508ad6025c79caabd8965efd2416dc026a56183d0ef4de7a0a6769ce8e0b4608a3f8393d326f6d03b26a2b067e6e0c750f35b20be190e595e8290c0e3
-DIST openssl-1.0.2l_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
-DIST openssl-1.0.2l_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
-DIST openssl-1.0.2l_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
-DIST openssl-1.0.2m.tar.gz 5373776 BLAKE2B f40cbea061f84087a079d541f7ba841894c86c00827865f0f508ee297df45e8825d7d74bbbe16bf1f81d46f9af503a6191c9e65df674c4a5ae28172b5b03986f SHA512 7619aa223ee50d0f5e270ac9090e95b2b1ba5dfc656c98f625a9a277dda472fb960a4e89a7ba300044cb401b2072b2ca6a6fcce8206d927bf373d1c981806a93
 DIST openssl-1.0.2n.tar.gz 5375802 BLAKE2B 2e04f8c3d5e2296859b8474d7e100e270f53f18a26c6d37a4cf5e01cd14f44d24d334b4e705da05d77c33b5dc91cffea0feea9f7c83c77ba16c9b6d5f5085894 SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687
 DIST openssl-1.1.0-build.patch 3028 BLAKE2B f8cf981ed3717af234ce02fa50f27cdbcbf2b766968a5957fc6f0a4ea997549505fa77398444d7f3b9a75f66048447fe62542b9cb1d5f0268add87c44915a6fd SHA512 b19a912900970052f80c67f28975e793ae9e70ebfc62efae0544e09931079e98c4cd29ce1cc8d937ceca97aff9a12fdc1ff9ce6c2b47fea68c79e7065464a0f0
 DIST openssl-1.1.0-ec-curves.patch 2967 BLAKE2B 1c639514445ea85cf731732aa7901b5a03ddb5f637b0483ab2ec6825433ad978723c5a07316db684bdaca4a12fc673b4e049a49c0cd4dbe5f25a5e2bd3b75cf5 SHA512 8fb9c6759ae2077ad3697ba77e85ab3970fd8b3f64b21eb260b4f6333b7ebf2f5a53c7eee311229edfbd96a2b904ec5e5e00dfa5b62cf1105fece13069077bd2
@@ -30,10 +17,6 @@ DIST openssl-1.1.0g_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36
 DIST openssl-1.1.0g_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 EBUILD openssl-0.9.8z_p8-r1.ebuild 5076 BLAKE2B 7e57a4541dacfc7a43720248334e8c46748e533b4fa455f70a9304fd5c4807a0202c796eeffdd5a3b096fb37549e4ca8780b8ab8e5d51872eb057aa5bae3cf7c SHA512 0df6324f095514b94b2d15bf44d269624d631cd03d5d7eaf45645fbb1d3c07880d6c927c91f6a2b3d8c5cc7a406aeb435b58e6aeb3f3311a979a3501d3f7a7de
 EBUILD openssl-0.9.8z_p8.ebuild 4997 BLAKE2B a65c31fb7e443ae990b8b434edcae82794eef0150eb5a352536af9fb7ddc39eabdef24b8a52f5a307b91e9704ce94f9ed55cf9c388076a9a8526891656295596 SHA512 15767d6ed531a7b27a37e9276f3ae02b1d3a57103db2bc256dad4ac9af8d1797f078731ac6a7325a36ca7b9cec34840dac2e3723343dca69050a524c300e7059
-EBUILD openssl-1.0.2k.ebuild 8334 BLAKE2B c79e9dc5d3f456cce76d99b388d7920083c7cbeed265ec7ec3949a8235f4648ae2da2583cef4c6a5a67910ed0353817ff7a6c98a1de24d458bab4ce15b7687bb SHA512 69041d575f7542984cdbc9ef32aa04af49610e1e5752ce77e2566b63d0c60d0cfde6aab808d9c32390ca986911de3b67de057d09c1e036204bf119136e386efb
-EBUILD openssl-1.0.2l-r1.ebuild 9930 BLAKE2B 724272b844780bc005bc0f202519adf01e2f2e39412fe4e8c10b4e07e897bae486e7420abd89abfd03dae7c303d238ca9d4ca1ea36be43792fa5711ff06c34b2 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23
-EBUILD openssl-1.0.2l.ebuild 8338 BLAKE2B 86556289e8c1189d2c552623a96f8b14c4f5f0b5687951d64f04ba58463645c3395ffbbec158d378fd1589af2337fa4552368d34543280244a10dcea01b50492 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d
-EBUILD openssl-1.0.2m.ebuild 8339 BLAKE2B 5f38ad7c7fbf5ed897deea4594b2131bcad8853cd7692274f8758236aedfc9da3d271a6003762d6673b2afa3e0a73d6a14783abd6bb140ff2e914549b5485532 SHA512 b7541775edb2be3294669f3fcb42f266ae781081f22b07ea9bed465f6f3a654e0d4bddcf5ad17d075f0e2281b0a1a18e1e8dbb834b5039f9b219e5c650d123bf
-EBUILD openssl-1.0.2n.ebuild 8037 BLAKE2B d1f608d0bc6a27dd80a56238562eb87c146fa1e6deb186aa29a909a0affe343508f99cd87802a2631c48eea31a13bdf6df5724c20faa4df5427f18eb576f1cb9 SHA512 dcc181406923ed773eb05116422d71b1ba6d8ba08746046b3e85351e210924a1eee5dd325ed8465466bb2319c05428587eb6c9b5f3a32439f77b932b5f74daf0
+EBUILD openssl-1.0.2n.ebuild 8036 BLAKE2B 15a1ba6ce7cc2c45dcb3a9eb776f212a00238db5384ff7ea74e3ec90089131273ec89c1d3a485b2efb496e66075a4cc825226ecc17b224f80183ba36ec8d8cf7 SHA512 f89fdfcdc4a7f86f8eca280fde92b3c6698c1993bbef5722e920535328b2330f5d0ab55b56b7a66be0192be87222a470cbe1a2ee2e571bff1cce6e6be773b6cc
 EBUILD openssl-1.1.0g-r2.ebuild 9045 BLAKE2B 7693bbe13e6bc635920e260895380ba5ddb163351860ae7f69ae3cb20076f1b0faf61b1fbc04f439281609f35a21603156ee646898b2b006e0ed668d08ac7232 SHA512 c32902a4f49648e1fc118586abfe38defddff8418f338d3d8334cd45b9a0d605fe2450af5fe4b5dbac648776c41e79dfa589f666ee2daa9dd2474a30b7290c9b
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
deleted file mode 100644
index c99ef4abb852..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/181438
-http://bugs.gentoo.org/327421
-https://rt.openssl.org/Ticket/Display.html?id=3331&user=guest&pass=guest
-
-make sure we respect LDFLAGS
-
-also make sure we don't add useless -rpath flags to the system libdir
-
---- Makefile.org
-+++ Makefile.org
-@@ -189,6 +189,7 @@
- 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
- 		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
- 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
-+		LDFLAGS='${LDFLAGS}'				\
- 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
- 		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\
- 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
---- Makefile.shared
-+++ Makefile.shared
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/dev-libs/openssl/files/openssl-1.0.1p-default-source.patch b/dev-libs/openssl/files/openssl-1.0.1p-default-source.patch
deleted file mode 100644
index 73029985ae09..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.1p-default-source.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/554338
-https://rt.openssl.org/Ticket/Display.html?id=3934&user=guest&pass=guest
-
-From 7c2e97f8bbae517496fdc11f475b4ae54b2534f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 10 Jul 2015 01:50:52 -0400
-Subject: [PATCH] test: use _DEFAULT_SOURCE with newer glibc versions
-
-The _BSD_SOURCE macro is replaced by the _DEFAULT_SOURCE macro.  Using
-just the former with newer versions leads to a build time warning, so
-make sure to use the new macro too.
----
- ssl/ssltest.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ssl/ssltest.c b/ssl/ssltest.c
-index 26cf96c..b36f667 100644
---- a/ssl/ssltest.c
-+++ b/ssl/ssltest.c
-@@ -141,6 +141,7 @@
-  */
- 
- /* Or gethostname won't be declared properly on Linux and GNU platforms. */
-+#define _DEFAULT_SOURCE 1
- #define _BSD_SOURCE 1
- 
- #include <assert.h>
--- 
-2.4.4
-
diff --git a/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch b/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch
deleted file mode 100644
index 27574ea616de..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch
+++ /dev/null
@@ -1,611 +0,0 @@
-http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest
-
---- openssl-1.0.2/apps/s_apps.h
-+++ openssl-1.0.2/apps/s_apps.h
-@@ -154,7 +154,7 @@
- int do_server(int port, int type, int *ret,
-               int (*cb) (char *hostname, int s, int stype,
-                          unsigned char *context), unsigned char *context,
--              int naccept);
-+              int naccept, int use_ipv4, int use_ipv6);
- #ifdef HEADER_X509_H
- int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
- #endif
-@@ -167,7 +167,8 @@
- int ssl_print_curves(BIO *out, SSL *s, int noshared);
- #endif
- int ssl_print_tmp_key(BIO *out, SSL *s);
--int init_client(int *sock, char *server, int port, int type);
-+int init_client(int *sock, char *server, int port, int type,
-+		int use_ipv4, int use_ipv6);
- int should_retry(int i);
- int extract_port(char *str, short *port_ptr);
- int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
---- openssl-1.0.2/apps/s_client.c
-+++ openssl-1.0.2/apps/s_client.c
-@@ -302,6 +302,10 @@
- {
-     BIO_printf(bio_err, "usage: s_client args\n");
-     BIO_printf(bio_err, "\n");
-+    BIO_printf(bio_err, " -4             - use IPv4 only\n");
-+#if OPENSSL_USE_IPV6
-+    BIO_printf(bio_err, " -6             - use IPv6 only\n");
-+#endif
-     BIO_printf(bio_err, " -host host     - use -connect instead\n");
-     BIO_printf(bio_err, " -port port     - use -connect instead\n");
-     BIO_printf(bio_err,
-@@ -658,6 +662,7 @@
-     int sbuf_len, sbuf_off;
-     fd_set readfds, writefds;
-     short port = PORT;
-+    int use_ipv4, use_ipv6;
-     int full_log = 1;
-     char *host = SSL_HOST_NAME;
-     char *cert_file = NULL, *key_file = NULL, *chain_file = NULL;
-@@ -709,7 +714,11 @@
- #endif
-     char *sess_in = NULL;
-     char *sess_out = NULL;
--    struct sockaddr peer;
-+#if OPENSSL_USE_IPV6
-+    struct sockaddr_storage peer;
-+#else
-+    struct sockaddr_in peer;
-+#endif
-     int peerlen = sizeof(peer);
-     int fallback_scsv = 0;
-     int enable_timeouts = 0;
-@@ -737,6 +746,12 @@
- 
-     meth = SSLv23_client_method();
- 
-+    use_ipv4 = 1;
-+#if OPENSSL_USE_IPV6
-+    use_ipv6 = 1;
-+#else
-+    use_ipv6 = 0;
-+#endif
-     apps_startup();
-     c_Pause = 0;
-     c_quiet = 0;
-@@ -1096,6 +1111,16 @@
-             jpake_secret = *++argv;
-         }
- #endif
-+	else if (strcmp(*argv,"-4") == 0) {
-+	    use_ipv4 = 1;
-+	    use_ipv6 = 0;
-+	}
-+#if OPENSSL_USE_IPV6
-+	else if (strcmp(*argv,"-6") == 0) {
-+	    use_ipv4 = 0;
-+	    use_ipv6 = 1;
-+	}
-+#endif
- #ifndef OPENSSL_NO_SRTP
-         else if (strcmp(*argv, "-use_srtp") == 0) {
-             if (--argc < 1)
-@@ -1421,7 +1446,7 @@
- 
-  re_start:
- 
--    if (init_client(&s, host, port, socket_type) == 0) {
-+    if (init_client(&s, host, port, socket_type, use_ipv4, use_ipv6) == 0) {
-         BIO_printf(bio_err, "connect:errno=%d\n", get_last_socket_error());
-         SHUTDOWN(s);
-         goto end;
-@@ -1444,7 +1469,7 @@
-     if (socket_type == SOCK_DGRAM) {
- 
-         sbio = BIO_new_dgram(s, BIO_NOCLOSE);
--        if (getsockname(s, &peer, (void *)&peerlen) < 0) {
-+        if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0) {
-             BIO_printf(bio_err, "getsockname:errno=%d\n",
-                        get_last_socket_error());
-             SHUTDOWN(s);
---- openssl-1.0.2/apps/s_server.c
-+++ openssl-1.0.2/apps/s_server.c
-@@ -643,6 +643,10 @@
-     BIO_printf(bio_err,
-                " -alpn arg  - set the advertised protocols for the ALPN extension (comma-separated list)\n");
- #endif
-+    BIO_printf(bio_err, " -4            - use IPv4 only\n");
-+#if OPENSSL_USE_IPV6
-+    BIO_printf(bio_err, " -6            - use IPv6 only\n");
-+#endif
-     BIO_printf(bio_err,
-                " -keymatexport label   - Export keying material using label\n");
-     BIO_printf(bio_err,
-@@ -1070,6 +1074,7 @@
-     int state = 0;
-     const SSL_METHOD *meth = NULL;
-     int socket_type = SOCK_STREAM;
-+    int use_ipv4, use_ipv6;
-     ENGINE *e = NULL;
-     char *inrand = NULL;
-     int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
-@@ -1111,6 +1116,12 @@
- 
-     meth = SSLv23_server_method();
- 
-+    use_ipv4 = 1;
-+#if OPENSSL_USE_IPV6
-+    use_ipv6 = 1;
-+#else
-+    use_ipv6 = 0;
-+#endif
-     local_argc = argc;
-     local_argv = argv;
- 
-@@ -1503,6 +1514,16 @@
-             jpake_secret = *(++argv);
-         }
- #endif
-+	else if (strcmp(*argv,"-4") == 0) {
-+	    use_ipv4 = 1;
-+	    use_ipv6 = 0;
-+	}
-+#if OPENSSL_USE_IPV6
-+	else if (strcmp(*argv,"-6") == 0) {
-+	    use_ipv4 = 0;
-+	    use_ipv6 = 1;
-+	}
-+#endif
- #ifndef OPENSSL_NO_SRTP
-         else if (strcmp(*argv, "-use_srtp") == 0) {
-             if (--argc < 1)
-@@ -2023,13 +2044,13 @@
-     (void)BIO_flush(bio_s_out);
-     if (rev)
-         do_server(port, socket_type, &accept_socket, rev_body, context,
--                  naccept);
-+                  naccept, use_ipv4, use_ipv6);
-     else if (www)
-         do_server(port, socket_type, &accept_socket, www_body, context,
--                  naccept);
-+                  naccept, use_ipv4, use_ipv6);
-     else
-         do_server(port, socket_type, &accept_socket, sv_body, context,
--                  naccept);
-+                  naccept, use_ipv4, use_ipv6);
-     print_stats(bio_s_out, ctx);
-     ret = 0;
-  end:
---- openssl-1.0.2/apps/s_socket.c
-+++ openssl-1.0.2/apps/s_socket.c
-@@ -101,16 +101,16 @@
- #  include "netdb.h"
- # endif
- 
--static struct hostent *GetHostByName(char *name);
-+static struct hostent *GetHostByName(char *name, int domain);
- # if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
- static void ssl_sock_cleanup(void);
- # endif
- static int ssl_sock_init(void);
--static int init_client_ip(int *sock, unsigned char ip[4], int port, int type);
--static int init_server(int *sock, int port, int type);
--static int init_server_long(int *sock, int port, char *ip, int type);
-+static int init_client_ip(int *sock, unsigned char *ip, int port, int type, int domain);
-+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
-+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6);
- static int do_accept(int acc_sock, int *sock, char **host);
--static int host_ip(char *str, unsigned char ip[4]);
-+static int host_ip(char *str, unsigned char *ip, int domain);
- 
- # ifdef OPENSSL_SYS_WIN16
- #  define SOCKET_PROTOCOL 0     /* more microsoft stupidity */
-@@ -231,38 +231,68 @@
-     return (1);
- }
- 
--int init_client(int *sock, char *host, int port, int type)
-+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
- {
-+# if OPENSSL_USE_IPV6
-+    unsigned char ip[16];
-+# else
-     unsigned char ip[4];
-+# endif
- 
--    memset(ip, '\0', sizeof ip);
--    if (!host_ip(host, &(ip[0])))
--        return 0;
--    return init_client_ip(sock, ip, port, type);
--}
--
--static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
--{
--    unsigned long addr;
-+    if (use_ipv4)
-+	if (host_ip(host, ip, AF_INET))
-+	    return(init_client_ip(sock, ip, port, type, AF_INET));
-+# if OPENSSL_USE_IPV6
-+    if (use_ipv6)
-+	if (host_ip(host, ip, AF_INET6))
-+	    return(init_client_ip(sock, ip, port, type, AF_INET6));
-+# endif
-+    return 0;
-+}
-+
-+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
-+{
-+# if OPENSSL_USE_IPV6
-+    struct sockaddr_storage them;
-+    struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
-+    struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
-+# else
-     struct sockaddr_in them;
-+    struct sockaddr_in *them_in = &them;
-+# endif
-+    socklen_t addr_len;
-     int s, i;
- 
-     if (!ssl_sock_init())
-         return (0);
- 
-     memset((char *)&them, 0, sizeof(them));
--    them.sin_family = AF_INET;
--    them.sin_port = htons((unsigned short)port);
--    addr = (unsigned long)
--        ((unsigned long)ip[0] << 24L) |
--        ((unsigned long)ip[1] << 16L) |
--        ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]);
--    them.sin_addr.s_addr = htonl(addr);
-+    if (domain == AF_INET) {
-+	addr_len = (socklen_t)sizeof(struct sockaddr_in);
-+	them_in->sin_family=AF_INET;
-+	them_in->sin_port=htons((unsigned short)port);
-+# ifndef BIT_FIELD_LIMITS
-+	memcpy(&them_in->sin_addr.s_addr, ip, 4);
-+# else
-+	memcpy(&them_in->sin_addr, ip, 4);
-+# endif
-+    }
-+    else
-+# if OPENSSL_USE_IPV6
-+    {
-+	addr_len = (socklen_t)sizeof(struct sockaddr_in6);
-+	them_in6->sin6_family=AF_INET6;
-+	them_in6->sin6_port=htons((unsigned short)port);
-+	memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
-+    }
-+# else
-+	return(0);
-+# endif
- 
-     if (type == SOCK_STREAM)
--        s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
-+        s = socket(domain, SOCK_STREAM, SOCKET_PROTOCOL);
-     else                        /* ( type == SOCK_DGRAM) */
--        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-+        s = socket(domain, SOCK_DGRAM, IPPROTO_UDP);
- 
-     if (s == INVALID_SOCKET) {
-         perror("socket");
-@@ -280,7 +310,7 @@
-     }
- # endif
- 
--    if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) {
-+    if (connect(s, (struct sockaddr *)&them, addr_len) == -1) {
-         closesocket(s);
-         perror("connect");
-         return (0);
-@@ -292,14 +322,14 @@
- int do_server(int port, int type, int *ret,
-               int (*cb) (char *hostname, int s, int stype,
-                          unsigned char *context), unsigned char *context,
--              int naccept)
-+              int naccept, int use_ipv4, int use_ipv6)
- {
-     int sock;
-     char *name = NULL;
-     int accept_socket = 0;
-     int i;
- 
--    if (!init_server(&accept_socket, port, type))
-+    if (!init_server(&accept_socket, port, type, use_ipv4, use_ipv6))
-         return (0);
- 
-     if (ret != NULL) {
-@@ -328,32 +358,41 @@
-     }
- }
- 
--static int init_server_long(int *sock, int port, char *ip, int type)
-+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
- {
-     int ret = 0;
-+    int domain;
-+# if OPENSSL_USE_IPV6
-+    struct sockaddr_storage server;
-+    struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
-+    struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
-+# else
-     struct sockaddr_in server;
-+    struct sockaddr_in *server_in = &server;
-+# endif
-+    socklen_t addr_len;
-     int s = -1;
- 
-+    if (!use_ipv4 && !use_ipv6)
-+	goto err;
-+# if OPENSSL_USE_IPV6
-+    /* we are fine here */
-+# else
-+    if (use_ipv6)
-+	goto err;
-+# endif
-     if (!ssl_sock_init())
-         return (0);
- 
--    memset((char *)&server, 0, sizeof(server));
--    server.sin_family = AF_INET;
--    server.sin_port = htons((unsigned short)port);
--    if (ip == NULL)
--        server.sin_addr.s_addr = INADDR_ANY;
--    else
--/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
--# ifndef BIT_FIELD_LIMITS
--        memcpy(&server.sin_addr.s_addr, ip, 4);
-+#if OPENSSL_USE_IPV6
-+    domain = use_ipv6 ? AF_INET6 : AF_INET;
- # else
--        memcpy(&server.sin_addr, ip, 4);
-+    domain = AF_INET;
- # endif
--
-     if (type == SOCK_STREAM)
--        s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
--    else                        /* type == SOCK_DGRAM */
--        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-+	s=socket(domain, SOCK_STREAM, SOCKET_PROTOCOL);
-+    else /* type == SOCK_DGRAM */
-+	s=socket(domain, SOCK_DGRAM, IPPROTO_UDP);
- 
-     if (s == INVALID_SOCKET)
-         goto err;
-@@ -363,7 +402,42 @@
-         setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j);
-     }
- # endif
--    if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
-+# if OPENSSL_USE_IPV6
-+    if ((use_ipv4 == 0) && (use_ipv6 == 1)) {
-+	const int on = 1;
-+
-+	setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
-+		    (const void *) &on, sizeof(int));
-+    }
-+# endif
-+    if (domain == AF_INET) {
-+	addr_len = (socklen_t)sizeof(struct sockaddr_in);
-+	memset(server_in, 0, sizeof(struct sockaddr_in));
-+	server_in->sin_family=AF_INET;
-+	server_in->sin_port = htons((unsigned short)port);
-+	if (ip == NULL)
-+	    server_in->sin_addr.s_addr = htonl(INADDR_ANY);
-+	else
-+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
-+# ifndef BIT_FIELD_LIMITS
-+	    memcpy(&server_in->sin_addr.s_addr, ip, 4);
-+# else
-+	    memcpy(&server_in->sin_addr, ip, 4);
-+# endif
-+    }
-+# if OPENSSL_USE_IPV6
-+    else {
-+	addr_len = (socklen_t)sizeof(struct sockaddr_in6);
-+	memset(server_in6, 0, sizeof(struct sockaddr_in6));
-+	server_in6->sin6_family = AF_INET6;
-+	server_in6->sin6_port = htons((unsigned short)port);
-+	if (ip == NULL)
-+	    server_in6->sin6_addr = in6addr_any;
-+	else
-+	    memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
-+    }
-+# endif
-+    if (bind(s, (struct sockaddr *)&server, addr_len) == -1) {
- # ifndef OPENSSL_SYS_WINDOWS
-         perror("bind");
- # endif
-@@ -381,16 +455,23 @@
-     return (ret);
- }
- 
--static int init_server(int *sock, int port, int type)
-+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
- {
--    return (init_server_long(sock, port, NULL, type));
-+    return (init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
- }
- 
- static int do_accept(int acc_sock, int *sock, char **host)
- {
-     int ret;
-     struct hostent *h1, *h2;
--    static struct sockaddr_in from;
-+#if OPENSSL_USE_IPV6
-+    struct sockaddr_storage from;
-+    struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
-+    struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
-+#else
-+    struct sockaddr_in from;
-+    struct sockaddr_in *from_in = &from;
-+#endif
-     int len;
- /*      struct linger ling; */
- 
-@@ -440,14 +521,25 @@
- 
-     if (host == NULL)
-         goto end;
-+# if OPENSSL_USE_IPV6
-+    if (from.ss_family == AF_INET)
-+# else
-+    if (from.sin_family == AF_INET)
-+# endif
- # ifndef BIT_FIELD_LIMITS
--    /* I should use WSAAsyncGetHostByName() under windows */
--    h1 = gethostbyaddr((char *)&from.sin_addr.s_addr,
--                       sizeof(from.sin_addr.s_addr), AF_INET);
-+	/* I should use WSAAsyncGetHostByName() under windows */
-+	h1 = gethostbyaddr((char *)&from_in->sin_addr.s_addr,
-+                	    sizeof(from_in->sin_addr.s_addr), AF_INET);
- # else
--    h1 = gethostbyaddr((char *)&from.sin_addr,
--                       sizeof(struct in_addr), AF_INET);
-+	h1 = gethostbyaddr((char *)&from_in->sin_addr,
-+            		    sizeof(struct in_addr), AF_INET);
-+# endif
-+# if OPENSSL_USE_IPV6
-+    else
-+	h1 = gethostbyaddr((char *)&from_in6->sin6_addr,
-+			    sizeof(struct in6_addr), AF_INET6);
- # endif
-+	    
-     if (h1 == NULL) {
-         BIO_printf(bio_err, "bad gethostbyaddr\n");
-         *host = NULL;
-@@ -460,14 +552,22 @@
-         }
-         BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1);
- 
--        h2 = GetHostByName(*host);
-+# if OPENSSL_USE_IPV6
-+	h2=GetHostByName(*host, from.ss_family);
-+# else
-+	h2=GetHostByName(*host, from.sin_family);
-+# endif
-         if (h2 == NULL) {
-             BIO_printf(bio_err, "gethostbyname failure\n");
-             closesocket(ret);
-             return (0);
-         }
--        if (h2->h_addrtype != AF_INET) {
--            BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
-+# if OPENSSL_USE_IPV6
-+	if (h2->h_addrtype != from.ss_family) {
-+# else
-+	if (h2->h_addrtype != from.sin_family) {
-+# endif
-+            BIO_printf(bio_err, "gethostbyname addr is not correct\n");
-             closesocket(ret);
-             return (0);
-         }
-@@ -483,14 +583,14 @@
-     char *h, *p;
- 
-     h = str;
--    p = strchr(str, ':');
-+    p = strrchr(str, ':');
-     if (p == NULL) {
-         BIO_printf(bio_err, "no port defined\n");
-         return (0);
-     }
-     *(p++) = '\0';
- 
--    if ((ip != NULL) && !host_ip(str, ip))
-+    if ((ip != NULL) && !host_ip(str, ip, AF_INET))
-         goto err;
-     if (host_ptr != NULL)
-         *host_ptr = h;
-@@ -502,44 +602,51 @@
-     return (0);
- }
- 
--static int host_ip(char *str, unsigned char ip[4])
-+static int host_ip(char *str, unsigned char *ip, int domain)
- {
-     unsigned int in[4];
-+    unsigned long l;
-     int i;
- 
--    if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) ==
--        4) {
-+    if ((domain == AF_INET) && (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == 4)) {
-         for (i = 0; i < 4; i++)
-             if (in[i] > 255) {
-                 BIO_printf(bio_err, "invalid IP address\n");
-                 goto err;
-             }
--        ip[0] = in[0];
--        ip[1] = in[1];
--        ip[2] = in[2];
--        ip[3] = in[3];
--    } else {                    /* do a gethostbyname */
-+	l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
-+	memcpy(ip, &l, 4);
-+	return 1;
-+    }
-+# if OPENSSL_USE_IPV6
-+    else if ((domain == AF_INET6) && (inet_pton(AF_INET6, str, ip) == 1))
-+	return 1;
-+# endif
-+    else {                    /* do a gethostbyname */
-         struct hostent *he;
- 
-         if (!ssl_sock_init())
-             return (0);
- 
--        he = GetHostByName(str);
-+        he = GetHostByName(str, domain);
-         if (he == NULL) {
-             BIO_printf(bio_err, "gethostbyname failure\n");
-             goto err;
-         }
-         /* cast to short because of win16 winsock definition */
--        if ((short)he->h_addrtype != AF_INET) {
--            BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
-+        if ((short)he->h_addrtype != domain) {
-+            BIO_printf(bio_err, "gethostbyname addr is not correct\n");
-             return (0);
-         }
--        ip[0] = he->h_addr_list[0][0];
--        ip[1] = he->h_addr_list[0][1];
--        ip[2] = he->h_addr_list[0][2];
--        ip[3] = he->h_addr_list[0][3];
-+	if (domain == AF_INET)
-+	    memset(ip, 0, 4);
-+# if OPENSSL_USE_IPV6
-+	else
-+	    memset(ip, 0, 16);
-+# endif
-+	memcpy(ip, he->h_addr_list[0], he->h_length);
-+	return 1;
-     }
--    return (1);
-  err:
-     return (0);
- }
-@@ -573,7 +680,7 @@
- static unsigned long ghbn_hits = 0L;
- static unsigned long ghbn_miss = 0L;
- 
--static struct hostent *GetHostByName(char *name)
-+static struct hostent *GetHostByName(char *name, int domain)
- {
-     struct hostent *ret;
-     int i, lowi = 0;
-@@ -585,13 +692,18 @@
-             lowi = i;
-         }
-         if (ghbn_cache[i].order > 0) {
--            if (strncmp(name, ghbn_cache[i].name, 128) == 0)
-+            if ((strncmp(name, ghbn_cache[i].name, 128) == 0) && (ghbn_cache[i].ent.h_addrtype == domain))
-                 break;
-         }
-     }
-     if (i == GHBN_NUM) {        /* no hit */
-         ghbn_miss++;
--        ret = gethostbyname(name);
-+        if (domain == AF_INET)
-+    	    ret = gethostbyname(name);
-+# if OPENSSL_USE_IPV6
-+	else
-+	    ret = gethostbyname2(name, AF_INET6);
-+# endif
-         if (ret == NULL)
-             return (NULL);
-         /* else add to cache */
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch
deleted file mode 100644
index 0198818c5fa3..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3736&user=guest&pass=guest
-
-From aba899f2eca21e11e5e9797bf8258e7265dea9f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 8 Mar 2015 01:32:01 -0500
-Subject: [PATCH] fix parallel install with dir creation
-
-The mkdir-p.pl does not handle parallel creation of directories.
-This comes up when the install_sw and install_docs rules run and
-both call mkdir-p.pl on sibling directory trees.
-
-Instead, lets create a single install_dirs rule that makes all of
-the dirs we need, and have these two install steps depend on that.
----
- Makefile.org | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.org b/Makefile.org
-index a6d9471..78e6143 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -536,9 +536,9 @@
- dist_pem_h:
- 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
- 
--install: all install_docs install_sw
-+install: install_docs install_sw
- 
--install_sw:
-+install_dirs:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -547,6 +547,13 @@
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
-+	@$(PERL) $(TOP)/util/mkdir-p.pl \
-+		$(INSTALL_PREFIX)$(MANDIR)/man1 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man3 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man5 \
-+		$(INSTALL_PREFIX)$(MANDIR)/man7
-+
-+install_sw: install_dirs
- 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
- 	do \
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-@@ -636,12 +643,7 @@
- 		done; \
- 	done
- 
--install_docs:
--	@$(PERL) $(TOP)/util/mkdir-p.pl \
--		$(INSTALL_PREFIX)$(MANDIR)/man1 \
--		$(INSTALL_PREFIX)$(MANDIR)/man3 \
--		$(INSTALL_PREFIX)$(MANDIR)/man5 \
--		$(INSTALL_PREFIX)$(MANDIR)/man7
-+install_docs: install_dirs
- 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
- 	here="`pwd`"; \
- 	filecase=; \
--- 
-2.3.4
-
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch
deleted file mode 100644
index a7d6f4effea7..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3737&user=guest&pass=guest
-
-From ce279d4361e07e9af9ceca8a6e326e661758ad53 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 8 Mar 2015 01:34:48 -0500
-Subject: [PATCH] fix parallel generation of obj headers
-
-The current code has dummy sleep/touch commands to try and work
-around the parallel issue, but that is obviously racy.  Instead
-lets force one of the files to depend on the other so we know
-they'll never run in parallel.
----
- crypto/objects/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
-index ad2db1e..7d32504 100644
---- a/crypto/objects/Makefile
-+++ b/crypto/objects/Makefile
-@@ -44,11 +44,11 @@
- # objects.pl both reads and writes obj_mac.num
- obj_mac.h: objects.pl objects.txt obj_mac.num
- 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
--	@sleep 1; touch obj_mac.h; sleep 1
- 
--obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
-+# This doesn't really need obj_mac.h, but since that rule reads & writes
-+# obj_mac.num, we can't run in parallel with it.
-+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
- 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
--	@sleep 1; touch obj_xref.h; sleep 1
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
--- 
-2.3.4
-
diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch
deleted file mode 100644
index f2be696b1068..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3780&user=guest&pass=guest
-
-From cc81af135bda47eaa6956a0329cbbc55bf993ac1 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 3 Apr 2015 01:16:23 -0400
-Subject: [PATCH] fix race when symlink shareds libs
-
-When the crypto/ssl targets attempt to build their shared libs, they run:
-	cd ..; make libcrypto.so.1.0.0
-The top level Makefile in turn runs the build-shared target for that lib.
-
-The build-shared target depends on both do_$(SHLIB_TARGET) & link-shared.
-When building in parallel, make is allowed to run both of these.  They
-both run Makefile.shared for their respective targets:
-do_$(SHLIB_TARGET) ->
-	link_a.linux-shared ->
-	link_a.gnu ->
-	...; $(LINK_SO_A) ->
-	$(LINK_SO) ->
-	$(SYMLINK_SO)
-link-shared ->
-	symlink.linux-shared ->
-	symlink.gnu ->
-	...; $(SYMLINK_SO)
-
-The shell code for SYMLINK_SO attempts to do a [ -e lib ] check, but fails
-basic TOCTOU semantics.  Depending on the load, that means two processes
-will run the sequence:
-	rm -f libcrypto.so
-	ln -s libcrypto.so.1.0.0 libcrypto.so
-
-Which obviously fails:
-	ln: failed to create symbolic link 'libcrypto.so': File exists
-
-Since we know do_$(SHLIB_TARGET) will create the symlink for us, don't
-bother depending on link-shared at all in the top level Makefile when
-building things.
-
-Reported-by: Martin von Gagern <Martin.vGagern@gmx.net>
-URL: https://bugs.gentoo.org/545028
----
- Makefile.org | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.org b/Makefile.org
-index 890bfe4..576c60e 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -350,7 +350,10 @@ link-shared:
- 		libs="$$libs -l$$i"; \
- 	done
- 
--build-shared: do_$(SHLIB_TARGET) link-shared
-+# The link target in Makefile.shared will create the symlink for us, so no need
-+# to call link-shared directly.  Doing so will cause races with two processes
-+# trying to symlink the lib.
-+build-shared: do_$(SHLIB_TARGET)
- 
- do_$(SHLIB_TARGET):
- 	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
--- 
-2.3.4
-
diff --git a/dev-libs/openssl/files/openssl-1.0.2i-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.2i-parallel-build.patch
deleted file mode 100644
index 387a077da27d..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2i-parallel-build.patch
+++ /dev/null
@@ -1,326 +0,0 @@
---- openssl-1.0.2i/crypto/Makefile
-+++ openssl-1.0.2i/crypto/Makefile
-@@ -85,11 +85,11 @@
- 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
- 
- subdirs:
--	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
--	@target=files; $(RECURSIVE_MAKE)
-+	+@target=files; $(RECURSIVE_MAKE)
- 
- links:
- 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
- # lib: $(LIB): are splitted to avoid end-less loop
- lib:	$(LIB)
- 	@touch lib
--$(LIB):	$(LIBOBJ)
-+$(LIB):	$(LIBOBJ) | subdirs
- 	$(AR) $(LIB) $(LIBOBJ)
- 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
- 	$(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@
- 	fi
- 
- libs:
--	@target=lib; $(RECURSIVE_MAKE)
-+	+@target=lib; $(RECURSIVE_MAKE)
- 
- install:
- 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
--	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- lint:
- 	@target=lint; $(RECURSIVE_MAKE)
---- openssl-1.0.2i/engines/Makefile
-+++ openssl-1.0.2i/engines/Makefile
-@@ -72,7 +72,7 @@
- 
- all:	lib subdirs
- 
--lib:	$(LIBOBJ)
-+lib:	$(LIBOBJ) | subdirs
- 	@if [ -n "$(SHARED_LIBS)" ]; then \
- 		set -e; \
- 		for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
- 
- subdirs:
- 	echo $(EDIRS)
--	@target=all; $(RECURSIVE_MAKE)
-+	+@target=all; $(RECURSIVE_MAKE)
- 
- files:
- 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
- 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
- 		done; \
- 	fi
--	@target=install; $(RECURSIVE_MAKE)
-+	+@target=install; $(RECURSIVE_MAKE)
- 
- tags:
- 	ctags $(SRC)
---- openssl-1.0.2i/Makefile.org
-+++ openssl-1.0.2i/Makefile.org
-@@ -281,17 +281,17 @@
- build_libssl: build_ssl libssl.pc
- 
- build_crypto:
--	@dir=crypto; target=all; $(BUILD_ONE_CMD)
-+	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
- build_ssl: build_crypto
--	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-+	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
- build_engines: build_crypto
--	@dir=engines; target=all; $(BUILD_ONE_CMD)
-+	+@dir=engines; target=all; $(BUILD_ONE_CMD)
- build_apps: build_libs
--	@dir=apps; target=all; $(BUILD_ONE_CMD)
-+	+@dir=apps; target=all; $(BUILD_ONE_CMD)
- build_tests: build_libs
--	@dir=test; target=all; $(BUILD_ONE_CMD)
-+	+@dir=test; target=all; $(BUILD_ONE_CMD)
- build_tools: build_libs
--	@dir=tools; target=all; $(BUILD_ONE_CMD)
-+	+@dir=tools; target=all; $(BUILD_ONE_CMD)
- 
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -547,7 +547,7 @@
- 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- 	done;
--	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
- 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
- 	do \
- 		if [ -f "$$i" ]; then \
---- openssl-1.0.2i/Makefile.shared
-+++ openssl-1.0.2i/Makefile.shared
-@@ -105,6 +105,7 @@
-     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-     $${SHAREDCMD} $${SHAREDFLAGS} \
- 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@
- 			done; \
- 		fi; \
- 		if [ -n "$$SHLIB_SOVER" ]; then \
-+			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
- 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
- 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
- 		fi; \
---- openssl-1.0.2i/test/Makefile
-+++ openssl-1.0.2i/test/Makefile
-@@ -144,7 +144,7 @@
- tags:
- 	ctags $(SRC)
- 
--tests:	exe apps $(TESTS)
-+tests:	exe $(TESTS)
- 
- apps:
- 	@(cd ..; $(MAKE) DIRS=apps all)
-@@ -435,136 +435,136 @@
- 		link_app.$${shlib_target}
- 
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
--	@target=$(RSATEST); $(BUILD_CMD)
-+	+@target=$(RSATEST); $(BUILD_CMD)
- 
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
--	@target=$(BNTEST); $(BUILD_CMD)
-+	+@target=$(BNTEST); $(BUILD_CMD)
- 
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
--	@target=$(ECTEST); $(BUILD_CMD)
-+	+@target=$(ECTEST); $(BUILD_CMD)
- 
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
--	@target=$(EXPTEST); $(BUILD_CMD)
-+	+@target=$(EXPTEST); $(BUILD_CMD)
- 
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
--	@target=$(IDEATEST); $(BUILD_CMD)
-+	+@target=$(IDEATEST); $(BUILD_CMD)
- 
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
--	@target=$(MD2TEST); $(BUILD_CMD)
-+	+@target=$(MD2TEST); $(BUILD_CMD)
- 
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
--	@target=$(SHATEST); $(BUILD_CMD)
-+	+@target=$(SHATEST); $(BUILD_CMD)
- 
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
--	@target=$(SHA1TEST); $(BUILD_CMD)
-+	+@target=$(SHA1TEST); $(BUILD_CMD)
- 
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
--	@target=$(SHA256TEST); $(BUILD_CMD)
-+	+@target=$(SHA256TEST); $(BUILD_CMD)
- 
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
--	@target=$(SHA512TEST); $(BUILD_CMD)
-+	+@target=$(SHA512TEST); $(BUILD_CMD)
- 
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
--	@target=$(RMDTEST); $(BUILD_CMD)
-+	+@target=$(RMDTEST); $(BUILD_CMD)
- 
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
--	@target=$(MDC2TEST); $(BUILD_CMD)
-+	+@target=$(MDC2TEST); $(BUILD_CMD)
- 
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
--	@target=$(MD4TEST); $(BUILD_CMD)
-+	+@target=$(MD4TEST); $(BUILD_CMD)
- 
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
--	@target=$(MD5TEST); $(BUILD_CMD)
-+	+@target=$(MD5TEST); $(BUILD_CMD)
- 
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
--	@target=$(HMACTEST); $(BUILD_CMD)
-+	+@target=$(HMACTEST); $(BUILD_CMD)
- 
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
--	@target=$(WPTEST); $(BUILD_CMD)
-+	+@target=$(WPTEST); $(BUILD_CMD)
- 
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
--	@target=$(RC2TEST); $(BUILD_CMD)
-+	+@target=$(RC2TEST); $(BUILD_CMD)
- 
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
--	@target=$(BFTEST); $(BUILD_CMD)
-+	+@target=$(BFTEST); $(BUILD_CMD)
- 
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
--	@target=$(CASTTEST); $(BUILD_CMD)
-+	+@target=$(CASTTEST); $(BUILD_CMD)
- 
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
--	@target=$(RC4TEST); $(BUILD_CMD)
-+	+@target=$(RC4TEST); $(BUILD_CMD)
- 
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
--	@target=$(RC5TEST); $(BUILD_CMD)
-+	+@target=$(RC5TEST); $(BUILD_CMD)
- 
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
--	@target=$(DESTEST); $(BUILD_CMD)
-+	+@target=$(DESTEST); $(BUILD_CMD)
- 
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
--	@target=$(RANDTEST); $(BUILD_CMD)
-+	+@target=$(RANDTEST); $(BUILD_CMD)
- 
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
--	@target=$(DHTEST); $(BUILD_CMD)
-+	+@target=$(DHTEST); $(BUILD_CMD)
- 
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
--	@target=$(DSATEST); $(BUILD_CMD)
-+	+@target=$(DSATEST); $(BUILD_CMD)
- 
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
--	@target=$(METHTEST); $(BUILD_CMD)
-+	+@target=$(METHTEST); $(BUILD_CMD)
- 
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
--	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
-+	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
- 
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
--	@target=$(ENGINETEST); $(BUILD_CMD)
-+	+@target=$(ENGINETEST); $(BUILD_CMD)
- 
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
--	@target=$(EVPTEST); $(BUILD_CMD)
-+	+@target=$(EVPTEST); $(BUILD_CMD)
- 
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
--	@target=$(EVPEXTRATEST); $(BUILD_CMD)
-+	+@target=$(EVPEXTRATEST); $(BUILD_CMD)
- 
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
--	@target=$(ECDSATEST); $(BUILD_CMD)
-+	+@target=$(ECDSATEST); $(BUILD_CMD)
- 
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
--	@target=$(ECDHTEST); $(BUILD_CMD)
-+	+@target=$(ECDHTEST); $(BUILD_CMD)
- 
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
--	@target=$(IGETEST); $(BUILD_CMD)
-+	+@target=$(IGETEST); $(BUILD_CMD)
- 
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
--	@target=$(JPAKETEST); $(BUILD_CMD)
-+	+@target=$(JPAKETEST); $(BUILD_CMD)
- 
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
--	@target=$(ASN1TEST); $(BUILD_CMD)
-+	+@target=$(ASN1TEST); $(BUILD_CMD)
- 
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
--	@target=$(SRPTEST); $(BUILD_CMD)
-+	+@target=$(SRPTEST); $(BUILD_CMD)
- 
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
--	@target=$(V3NAMETEST); $(BUILD_CMD)
-+	+@target=$(V3NAMETEST); $(BUILD_CMD)
- 
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
--	@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
-+	+@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
- 
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
--	@target=$(CONSTTIMETEST) $(BUILD_CMD)
-+	+@target=$(CONSTTIMETEST) $(BUILD_CMD)
- 
- $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
--	@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
-+	+@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
- 
- $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
--	@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
-+	+@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
- 
- $(BADDTLSTEST)$(EXE_EXT): $(BADDTLSTEST).o
--	@target=$(BADDTLSTEST) $(BUILD_CMD)
-+	+@target=$(BADDTLSTEST) $(BUILD_CMD)
- 
- $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
--	@target=$(SSLV2CONFTEST) $(BUILD_CMD)
-+	+@target=$(SSLV2CONFTEST) $(BUILD_CMD)
- 
- $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
--	@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
-+	+@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
- 
- #$(AESTEST).o: $(AESTEST).c
- #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -577,7 +577,7 @@
- #	fi
- 
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
--	@target=dummytest; $(BUILD_CMD)
-+	+@target=dummytest; $(BUILD_CMD)
- 
- # DO NOT DELETE THIS LINE -- make depend depends on it.
- 
diff --git a/dev-libs/openssl/openssl-1.0.2k.ebuild b/dev-libs/openssl/openssl-1.0.2k.ebuild
deleted file mode 100644
index 9ba2eeef6ad4..000000000000
--- a/dev-libs/openssl/openssl-1.0.2k.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
-		epatch "${FILESDIR}"/${PN}-1.0.2i-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
-
-		epatch_user #332661
-	fi
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml -r doc/*
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2l-r1.ebuild b/dev-libs/openssl/openssl-1.0.2l-r1.ebuild
deleted file mode 100644
index 4c78a177bf6b..000000000000
--- a/dev-libs/openssl/openssl-1.0.2l-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			epatch "${DISTDIR}"/"${i}"
-		done
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-
-	fi
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
-		epatch "${FILESDIR}"/${PN}-1.0.2i-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
-
-		epatch_user #332661
-	fi
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml -r doc/*
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2l.ebuild b/dev-libs/openssl/openssl-1.0.2l.ebuild
deleted file mode 100644
index 324313704504..000000000000
--- a/dev-libs/openssl/openssl-1.0.2l.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
-		epatch "${FILESDIR}"/${PN}-1.0.2i-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
-
-		epatch_user #332661
-	fi
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml -r doc/*
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2m.ebuild b/dev-libs/openssl/openssl-1.0.2m.ebuild
deleted file mode 100644
index c356e4ff2bd5..000000000000
--- a/dev-libs/openssl/openssl-1.0.2m.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
-		epatch "${FILESDIR}"/${PN}-1.0.2i-parallel-build.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
-		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
-		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
-
-		epatch_user #332661
-	fi
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml -r doc/*
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild
index a88355e47eff..4ace32192cec 100644
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2n.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index ff02d1684da9..137e6b4e0d60 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -1,7 +1,8 @@
+AUX pslib-0.4.5-fix-build-system.patch 530 BLAKE2B 69693c754bd4e348e8f4af2876ee0ae19b9278bc192194e9d61bd007701868bd1d676d1c19133aa390301aef7eeee9a5abb7cc8750a05f1ef1d93676dd1df917 SHA512 d9baf7bddff0ebe673d7396e4e4873ba71156d149b4544a537d31734771f4b91b8bfa809b92fcc44f3f9a9f28bd758bcf805ec26cef3e8731281581ccf933044
 AUX pslib-getline.patch 1249 BLAKE2B 02dfbb72459468618f472f6c09c229b22d241a8c4425a49f11deb06678fb25934aa8ec8b90c93a064d8feedb5d6136bb051f8004dfaed34186a638ca8b9c889f SHA512 11e492dd77a74629da3700ab4c21a80fbd05465adc7a9bbb5c9044883bb2e9027b0e25b9280d8c3346d759a2a4e0e78726c2a434e35ce1574a737be889bb9312
 AUX pslib-lm.patch 317 BLAKE2B 4ee5ef10537a6535f8fd4b9a3c2dc65feead6d8ba4f41516d6e171d7638314fbeb6c1a63a5e834d8638b8609d9f453267451bb9c904195a1dbd85f7f460fcebc SHA512 e3cb1e8a48d29a9215d681c051f0a6b66155037d0ddd4b1eea68e5aec446b30ad26f71a1129bd887e291e8118dd3334761909d33bfa7afd4f4267e70ea566bf4
 DIST pslib-0.4.1.tar.gz 531797 BLAKE2B 28224be5411739d20118e3457050b7fc388ad0c5f1f14403080732588b16b2bfc89bad5ce8383db5d5da85fceca466fe81588550c949d18c5c4965889c26f9bc SHA512 012c0b2de1cb151fc41498ca4e6f62ec15138b35afddd0199c6366b818c7b544877eea9575df0e1aee49a67cd52dcac47eae405854e7390abeb64fda221327cf
 DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
 EBUILD pslib-0.4.1-r2.ebuild 1094 BLAKE2B f1723233d1e6a94818b926a4b3552658cdf3be9d2aa22518d65475419977cd2ea835e9520665fcbea9d022425cf3eb79386d1350a3e2083c8918f3ff28c9bd2c SHA512 6258000303c0729c472875a4d4569fa13d2b3b7585a9769d3698049dd12436c904574fed7532815f037489881b2a555b6cc1c8781910f09139d3eedd1556b324
-EBUILD pslib-0.4.5.ebuild 1098 BLAKE2B 31d69eb995dcb26af67f8d79942835329909ec8847ff4345550227df766140b06a3ec42ef90212716f89b5c3fbdbc5cf1bb27dc8565c9861b8b974e49c50a562 SHA512 c6ca1f1bfb43f7c5bfad6cbae87174416ea2f0596dd213d045697a2c6256cc72e03d0d848d97064bf634015acda09c5f5469323dea5b754a73864dcf258ea3b2
+EBUILD pslib-0.4.5.ebuild 1060 BLAKE2B e5fd165c8ae4c77adcd146bc7494bfd4f9ce03f0d71489a3d88eae39ff315eeeaa1b171093e3136fcf4519caf48c274e89b06665538a58dd576449121a3e8372 SHA512 c94021a8bdad8f9c4628cf9ee63c619261bf1d8e2c947bcdae6380e73702b6467a2306b1f00e9816272241f89fbb6c3e9fc3e4a1c32f485edff63b1fed2af4b4
 MISC metadata.xml 444 BLAKE2B 62c386b9fc2facb334d02520386624241580034bfb227c243f5b589eafef655084b84cb5e5f6dac3cfe73afbd0dfbf41c161261ede4e780bd84bec56a2302a14 SHA512 e50857e3a1c443849c5eafbeb72d41558c1bd8c6a58f22a4ab6b1590647db278e598bfb123eac6a8b50754d8bbd524dc574c3181c1e08bc24fdcce3f13a148bb
diff --git a/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch
new file mode 100644
index 000000000000..242a819d0da9
--- /dev/null
+++ b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -4,7 +4,7 @@
+ AC_CONFIG_SRCDIR(src/pslib.c)
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+ 
+ AC_PROG_INTLTOOL
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -36,7 +36,7 @@
+ 	ps_fontenc.c \
+ 	ps_strbuf.c
+ 
+-libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS)
++libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) -lm
+ 
+ BUILD_LIBS = -lm
+ 
diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5.ebuild
index f3a704c4f436..b81fc2baa5c4 100644
--- a/dev-libs/pslib/pslib-0.4.5.ebuild
+++ b/dev-libs/pslib/pslib-0.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="pslib is a C-library to create PostScript files on the fly"
 HOMEPAGE="http://pslib.sourceforge.net/"
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug jpeg png static-libs tiff"
 
 RDEPEND="
-	png? ( >=media-libs/libpng-1.2.43-r2:0 )
-	jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff )"
+	png? ( media-libs/libpng:0= )
+	jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0= )"
 #gif? requires libungif, not in portage
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -25,10 +25,11 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-perl/XML-Parser"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch )
+
 src_prepare() {
-	# hackpatchfix underlinking
-	sed -i -e 's/$(TIFF_LIBS)/$(TIFF_LIBS) -lm/' src/Makefile.am || die
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -45,5 +46,6 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files --all
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/rlog/Manifest b/dev-libs/rlog/Manifest
index c1696ebbabdc..3b73edb20c02 100644
--- a/dev-libs/rlog/Manifest
+++ b/dev-libs/rlog/Manifest
@@ -1,4 +1,5 @@
-AUX rlog-1.3.7-gcc-4.3.patch 199 BLAKE2B da3f30d44d024c4b32ce22f7e4e5b13280f5c365939725d97e57d149bcb1f02e16d16f3ca0d0c8df8860677c12686428d5e807402a2739eeba06f453baad7a39 SHA512 6f1df1b960e7ecbf4ffc24f71f6f9c6293a501cb181e453771480a38c84e7a47ec37766e7d98d24225f52d95312a5af600bbb9e19c0424f8b5f8e9f236c95f51
+AUX rlog-1.3.7-gcc-4.3.patch 203 BLAKE2B 805bae9fa8ab6f9d069056cd8c0c2df96f5b50994a7f14cc4f4e1efbd69ff1be433edcd200dadc986462ed9d8cc0caacfd515dd1480638d48a9156a3aeebd4a1 SHA512 e3d07bcd0aad871c5cbda75335cd20f598bbe25401ee5a6fb735f0d0f5a37946c78c9eb8190fa8ae31351704c2e0806b89d06db56d225d7e6f477a2a9b78ae1d
+AUX rlog-1.4-fix-build-system.patch 1283 BLAKE2B 2e7d38de9be902224dd82ade699ed9aedb56cdbf9ea272373e74d541c126c4edf2a5814cd078e4309887c8f732c3731ed035bf3018ebfbee55adc3f74328198d SHA512 e956ae108f61d8e71379d0b2722e670d52d9954713725629309f91176f419b9a188578e4e3381992ad4bbf577fb2b747d8680ad01b5e92864f4c6be721095b4f
 DIST rlog-1.4.tar.gz 640641 BLAKE2B ff17c9cefb20045a95d69954dd6d1756a342a5a97b640e8a286db98e5e55d1cb05da48a5df7ba1ad4b5f23678cfefd677cbf6f9f45ab647373858a2ddf25881e SHA512 a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e
-EBUILD rlog-1.4.ebuild 521 BLAKE2B f536b2e7a1f51aca7f09fbb75a4bfab9d21841c275b7eeda2469631d05acbd89bab2014148330795f9523b2710743e776e9bf59fd4e4e18275b5691f5cbefbad SHA512 09907de502f2b3865a8e7ef082afb5bb83597d3633a4a6265778a447a8a5a522cd49d3013f5e46fc400f4f8c9efd3a2c68de95f1a9de1ec8c71352f10a64bbdd
+EBUILD rlog-1.4.ebuild 580 BLAKE2B e428c653b3fdf30a7d0d49932981fb0352ea77aba0739bb111e20a01972eb6e0711c3e1b25c0874e32a33a80267256c90f1b7fb0831eb0d0b66d89da371f282f SHA512 cfed6a79af238dbdace3fdf28a0042ba711cdad6070aa2e3ff3ba7e28e481e7ce6223bc3b82f276e96c0b6f8602dcc59cd74c8660617d57ed6d7b38fc127e24f
 MISC metadata.xml 323 BLAKE2B 24c50af72b0366021e5909c8c82cd536a8cff3ff1ec24e5120810782bec14088b0a2c60f46ecc819a08e009a98b38c58f89c4c1b2886604e8583f3c3eb23a943 SHA512 5a15daf1a6599a6b93b64475aa4dec483281d4d1622fb24bfab2a27c4806846027a16bffb910d0881621879a6209d8d00c816b37a0397983d1d1e951fa32a006
diff --git a/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch b/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch
index 5e4bb91bf1e3..07770791cd77 100644
--- a/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch
+++ b/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch
@@ -1,5 +1,5 @@
---- rlog/RLogChannel.cpp
-+++ rlog/RLogChannel.cpp
+--- a/rlog/RLogChannel.cpp
++++ b/rlog/RLogChannel.cpp
 @@ -20,6 +20,7 @@
  #include "RLogChannel.h"
  #include "rlog.h"
diff --git a/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch b/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch
new file mode 100644
index 000000000000..b7959a79cd02
--- /dev/null
+++ b/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch
@@ -0,0 +1,59 @@
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -1,15 +1,13 @@
+ 
+ SOURCES = index.dox channel.dox component.dox
+ 
+-docdir = $(datadir)/doc
+-pkgdocdir = $(docdir)/$(PACKAGE)
+ #pkghtmldir = $(pkgdocdir)/html
+ 
+ 
+ # have both html and html/index.html to force build of index.html if necessary
+ EXTRA_DIST = latex/refman.pdf html html/index.html $(SOURCES)
+ 
+-pkgdoc_DATA = \
++pdf_DATA = \
+     latex/refman.pdf
+ 
+ #pkghtml_DATA = \
+@@ -17,22 +15,21 @@
+ 
+ if BUILD_DOCS
+ latex/refman.pdf: html/index.html
+-	-cd latex && make
++	$(MAKE) -C latex
+ 
+ html/index.html: ../Doxyfile $(SOURCES)
+-	-rm -rf html
+-	-cd .. && @DOXYGEN@ Doxyfile
++	rm -rf html && $(DOXYGEN) Doxyfile
+ 
+ clean-local:
+-	-rm -rf html
+-	-rm -rf latex
++	rm -rf html
++	rm -rf latex
+ endif
+ 
+ all-local: html/index.html
+ 
+-install-data-local: all-local
+-	-echo installing to ${DESTDIR}${pkgdocdir}/html
+-	/bin/sh ../mkinstalldirs ${DESTDIR}${pkgdocdir}/html
+-	install html/* ${DESTDIR}${pkgdocdir}/html
++install-data-hook: all-local
++	-echo installing to $(DESTDIR)$(htmldir)
++	/bin/sh ../mkinstalldirs $(DESTDIR)$(htmldir)
++	install html/* $(DESTDIR)$(htmldir)
+ 
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,6 +10,3 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = librlog.pc
+ 
+-documentation:
+-	cd docs && make
+-
diff --git a/dev-libs/rlog/rlog-1.4.ebuild b/dev-libs/rlog/rlog-1.4.ebuild
index c24fabb7a48c..0a937d761f36 100644
--- a/dev-libs/rlog/rlog-1.4.ebuild
+++ b/dev-libs/rlog/rlog-1.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="A C++ logging library"
 HOMEPAGE="http://www.arg0.net/rlog"
@@ -13,11 +14,19 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc sparc x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch
+	"${FILESDIR}"/${PN}-1.4-fix-build-system.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch
+	default
+	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die
-	dodoc AUTHORS ChangeLog README
+	default
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/xmlrpc-epi/Manifest b/dev-libs/xmlrpc-epi/Manifest
index 72f6b9533643..792dc88aca9d 100644
--- a/dev-libs/xmlrpc-epi/Manifest
+++ b/dev-libs/xmlrpc-epi/Manifest
@@ -1,3 +1,4 @@
+AUX xmlrpc-epi-0.54.2-fix-build-system.patch 370 BLAKE2B eedf67329806af7ab1674cb81c20feff2d2e155a2294838a9183ae33ff37ba71a5f95daf783e2d07621f31a4a015548fa56838b6a610fdd4369b3f1697d6a093 SHA512 993ff2f38d7a1b8f1acf45212607e0499c0b7072152c9c2e30b9cb86fa67108644bf62f69aa954c245d86577c6a2fae0a77a1e6e473e21abbb4b396c67ab22f9
 DIST xmlrpc-epi-0.54.2.tar.bz2 348478 BLAKE2B 43f460445d129def3ca238747598ffd43c51e6d28ac3065bf8e0bc7b888dca77d71960346bd79b9d200d81d17df4f37be39f049f67f356f746b58d5b965c9ddb SHA512 2a8e818bd0eff4d1b0ad0c1cb26f93bc65d941096cf9f4555d1969c69601c452ab26edccee511b06efc9927c5deb7bd2a93fe44da23e5e4f78f6c77ca8e1e9c5
-EBUILD xmlrpc-epi-0.54.2.ebuild 1226 BLAKE2B 2e39c3ad98ea24b3ae8e734b9e2a95c40fa141138d05f51689ec7bb86af434eeac923429586202a369cedf62cd9aaf93963bc2d72c738f1fa30745b7d5858260 SHA512 c7f3cc72cadc1c163959b86a009902ccf50070ca7062004746e11dad79b3323b8f3111651c056343c12a6803a08aa33777d603cf7bde9920a2245968b948acf7
+EBUILD xmlrpc-epi-0.54.2.ebuild 961 BLAKE2B ba6d88bbd4876a6d265fdb7c65befaae2351923d619d07cc126f585338c411e03c08819518e5acff0f9be64b909971b0adbebad55670e338446d7758da554149 SHA512 1f9d6f2a0c8f0f593d40b9b52b2485f7a257e56e10ef15f869b60d0c7ae7f6ff26695dcf95e75b8ae586155c330f085251faba7be15b744279412118e0d3150c
 MISC metadata.xml 247 BLAKE2B 2c8eebb25dce4086826f2899e097abfd82be265330efaccf1b0a70dc6ddd7db762b9c7705869f43b6778474ac42c3fe2ea538d9ef75d16ad4bf54086378f2b1f SHA512 9d95e81a0ea01ed0693e8aaff3c55cffc38aa7d6dedad6212e7d0914791702da5b7434f13deee6fd8b05744002b3d8e60ede232ed1b7b6addd54cd09d50a6824
diff --git a/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch b/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch
new file mode 100644
index 000000000000..0772836e6bae
--- /dev/null
+++ b/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -218,8 +218,8 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src sample
+-DIST_SUBDIRS = src sample
++SUBDIRS = src
++DIST_SUBDIRS = src
+ ACLOCAL_AMFLAGS = -I m4
+ CHANGE_LOG_GEN_BIN = scripts/cvs2cl.pl
+ CHANGE_LOG_GEN_FLAGS = -t -r -b --accum -I ChangeLog --gmt --prune
diff --git a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild
index c3a93596ff91..45df6e8ea284 100644
--- a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild
+++ b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit multilib
+EAPI=6
 
 DESCRIPTION="Epinions implementation of XML-RPC protocol in C"
 HOMEPAGE="http://xmlrpc-epi.sourceforge.net/"
@@ -12,40 +10,32 @@ SRC_URI="mirror://sourceforge/xmlrpc-epi/${P}.tar.bz2"
 LICENSE="Epinions"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
-IUSE="examples static-libs"
+IUSE="static-libs"
 
-DEPEND="dev-libs/expat"
+DEPEND="dev-libs/expat:="
 RDEPEND="${DEPEND}"
 
-# NOTES:
-# to prevent conflict with xmlrpc-c, headers are installed in
-# 	/usr/include/${PN} instead of /usr/include (bug 274291)
-
-src_prepare() {
-	# do not build examples
-	sed -i -e "s:sample::" Makefile.in || die "sed failed"
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.54.2-fix-build-system.patch )
 
 src_configure() {
+	# NOTES:
+	# to prevent conflict with xmlrpc-c, headers are installed in
+	# 	/usr/include/${PN} instead of /usr/include (bug 274291)
 	econf \
-		--includedir=/usr/include/${PN} \
-		--disable-dependency-tracking \
+		--includedir="${EPREFIX}"/usr/include/${PN} \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	if ! use static-libs; then
-		# remove useless la files
-		rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "rm failed"
+		# remove useless .la files
+		find "${D}" -name '*.la' -delete || die
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins sample/*.c sample/*.php || die "doins failed"
-		doins -r sample/tests || die "doins failed"
-	fi
+	docinto examples
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc sample/*.c sample/*.php
+	dodoc -r sample/tests
 }
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index b3b538bd12df..bc59a1349f33 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 75f037aeed52..456b58652336 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -56,8 +56,11 @@ DIST sbcl-1.4.0-source.tar.bz2 5907661 BLAKE2B bde404d1268cce44b27aae0796e0335e7
 DIST sbcl-1.4.0-x86-64-linux-binary.tar.bz2 10573661 BLAKE2B a4ee5e3eba04c7b3ab931ed8f1fbe6f94f1a615fd36028aa05ff2130e67d0d00f903d1e71cc4ce15964f53697d0530c38265b710110d2ac4a363fbd5e21ba329 SHA512 7cd8ea2a411b55a85df5113c0bcb63078d67c9c31edf12f3ee87075569436711725c325027b6bbdd6d5a2c79511da12a034278d734c7cc75c96f0a44941ee437
 DIST sbcl-1.4.1-source.tar.bz2 5935675 BLAKE2B 603816ade75d02b4f207615163ccb7a6cd24fc36ba1618909a806bb41fd8a753f6eca6bcb0a64ccf74ed84c03a49f83fbcbfe34177a2e4708e0050c8dfbacd02 SHA512 d9f77194c096724bb1f212e1f5c2086d781ca4c7180c0ce524f892d259ac4a0adabccce468eb5eca511d3b1e9054fbcac9716e757352d71ddacf7710e681616c
 DIST sbcl-1.4.1-x86-64-linux-binary.tar.bz2 10566390 BLAKE2B 2df755f2b505fd48807379927fae4bec040be131b6c2207b90c10da500bd3141292e9f543cf85fa12a0d1deef9c6577652aca668b015880fe280e8da1ee1f00d SHA512 bbf7f5d5d7d729e54f8c3eb85c270aeae690fe3ccde088825f71c3b8b317d0126b4f52a06db73992f200e7ee9fa14328ee0cb399f79adb8b24217d4b7cea9c06
+DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
 DIST sbcl-1.4.2-source.tar.bz2 5946122 BLAKE2B 9cf0737a3e1dce32701a4cf2935e8170cc0a2b82bbcfc079547cbda904ef7788df39416638ad780fb4119722cf46871d4e79e6a543b6fe495532e9ae672073af SHA512 f1ed1cc2ce777e4c5d54aa5d4fbee13e217393f682a5f8cabcad760a6e3f09caeeac1d8200fdeb8987e4ac42c14d1ce717a1e5607cc2c9c0ece32a82f6a353dd
 DIST sbcl-1.4.2-x86-64-linux-binary.tar.bz2 10624427 BLAKE2B ebf1589011c049f0dcd04439330237abf4dc231703e6ba5fd899e528a52e24c1565637119211b4b51b28d4bfd036941cb11e8599c0c3f5e5ff2f6d014485566d SHA512 b3f7c9dd225b78b59eec5646255fac78ea432b4f057f933961e65693e13f70b371f2964fbc98bbbc38d163db1fef4a41d45af16147f11571c31a832838b67894
+DIST sbcl-1.4.3-source.tar.bz2 5953041 BLAKE2B d8fe63ed0f6c0cfc6d4746bb434efa6ccb9ac45d5c71885f9411395cbca4b179716c89d154d65c0da9b564a29d60bd2713564c030bb7dd90e7dc6b28f707175d SHA512 e730f4f095e2c3b52836df0beae08219a2e3883b4e20ba7303f24d8e51aec7c6d278ad6f9d57fac36b5aebec3fefb118d07bfd4ca48a44a3324345f2993fca62
+DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 EBUILD sbcl-1.3.11.ebuild 8382 BLAKE2B 7df1cb22c53debbc4f972fd230bd4cef1132f234946a06309d6bedb3bc9a8c51b582ccd2e671895bc270985e3ce82b4aa56ef21a4a31ca1b91e98318e560f2b4 SHA512 d6b00cc75cc3bc55be589d4e7690469e1ae8d8c00174ec67d83eff42f977e0840a97c22550be732ce0335b38d38b0429f0a47d9cf4de25402d91ea7814c3c351
 EBUILD sbcl-1.3.12.ebuild 8386 BLAKE2B eb7ba276c5e2f00f3de9d333715965a5e42907b021eaa2bde1959cff174797bf9c12c955f5125f207cfe579b8bac68e3c130620b855f4c4109d17ad34b758da9 SHA512 1b373b2bdb4ef86b582ecd5d1126df113d3db29ff91a995cfd2caecf9a154983f7ef614216050b31d673a7ecf959afc92b05fdf3e19d7cb7bf5179143a5710fb
 EBUILD sbcl-1.3.13.ebuild 8395 BLAKE2B 2e4c8e968af825f4d70303cacf98f6fd89f0371ba56bd38c274a234044d8e3e902daea22395e229ad7da290c99b6ec92f6bd47b7780fd061505356b0659c8053 SHA512 df6b1f58258899381243fc718b2964e074c509bbaaa553db906f29ca2faf42f90bc2df7acf10b928a16a466a7053ad27d91ec31ab21475f44ca0930bd55da703
@@ -72,4 +75,5 @@ EBUILD sbcl-1.3.21.ebuild 8320 BLAKE2B 3ac0d069fd1cb790b93fa575f11c449ff2f4fba9a
 EBUILD sbcl-1.4.0.ebuild 8670 BLAKE2B ef413a0689f219b013895337a86aecf1c0b1b09fce3c15dfc138d05057862837ab82b24e24b12115b9edc88a06079fdd291db85435d5a4592ca4bb02392f196f SHA512 789f5102bc7f4e00ef4ba2baf5602ee08aaa1cfc9748d1b91d932c8a59aefe74f50599c22c1ee888d320a01a1168027786037b087d193b0b9994591e3dae48de
 EBUILD sbcl-1.4.1.ebuild 8670 BLAKE2B 93cb255ef0ab54e5fd2e8a790fa49be4a5f61cea64e4423e835abdd5196c9593a25cea96fe62de73f2feac505c08086d29fb741389c29d1e20474868afe2f675 SHA512 8e67f281bb6a044bb42c913ff0e714c2edc14ee95e03913c3247885986f56df577f7e12b04d26dc39b4a4ede23fc5b14aa16c9945a4e899d730cd47f6411a220
 EBUILD sbcl-1.4.2.ebuild 8670 BLAKE2B 61983b1b5ad16a31cdcc6e832bc987bb39486b7a80dea3ad66a37da713a592061677f5f5ae8f73b550c83f39bbdf60200a5568b98befea8b04647f02bd038604 SHA512 5618326b36bea1ef1d761810ea41a901f29333a32663a449d15defdf9c9b12950ff40abe4b4f1fde3762c0938e6e6ccb45d4cbcd1c13772c4b42243de97be213
+EBUILD sbcl-1.4.3.ebuild 8669 BLAKE2B d6e25c23cb30cb16cf73d0b59f23a45634d14abd243232b833a7d8a141816938ca01f3c579b860549bf1dc2c6831c1abfc44b7e4da84bcb7efe4069a379803e8 SHA512 fcfae9cfde3b20f4b0fed98818f1ed6fa600b3c13b3d05b54a25c2fa068ff2f997b67e11f4c2edcca3dfbe39dccdadc4de9ea9428547f6963d2802f8d49d384f
 MISC metadata.xml 1759 BLAKE2B 4607665287ed893ce942ba83ff6d095f74c03d05ec170b07c57015f94141727a877e7797a73732fe48850ea55df4982717a83fbbc8430988c0da83b95a2961e4 SHA512 c3d326944d9ecc60a49b205f5894321530c61c5efdfb983ccdb134636748a3d0162532ac8b1fbf83392308ad5013b18eb8b8bfff593bf506b012e22be409bc84
diff --git a/dev-lisp/sbcl/sbcl-1.4.3.ebuild b/dev-lisp/sbcl/sbcl-1.4.3.ebuild
new file mode 100644
index 000000000000..4ee058b8fa18
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.4.3.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=1.4.2
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.4.2
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.600.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.600.0.ebuild
new file mode 100644
index 000000000000..104f45dfee2a
--- /dev/null
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.600.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PHRED
+DIST_VERSION=1.60
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Compress-Raw-Zlib-2.17.0
+	virtual/perl-File-Path
+	>=virtual/perl-File-Spec-0.800.0
+	virtual/perl-File-Temp
+	virtual/perl-IO
+	virtual/perl-Time-Local
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-MockModule
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index 1caa813853f1..715854a30565 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -1,3 +1,5 @@
 DIST Archive-Zip-1.59.tar.gz 192151 BLAKE2B 1899ec51343250e496bc3121abea3e08cd49cd33289184ba9ef1486e9b6a3f643fb264d78f0c21d47d6889d1d50e905e9c5c6f79d385d5de2a47d41bd0102dc6 SHA512 ca9df48d770bf34945daa1721b9372ed90816b8a2a3d61523fc91c583ef545df169528093d6cd15fbc7e962ce0aab17f0fe8899fd35a6f0245c97b7cb379dd5f
+DIST Archive-Zip-1.60.tar.gz 191318 BLAKE2B 97b66b360c55ba864e9e78e74ab5bbeec145859cd551efe5a248a4ad9af7ddbdbd32ad61dd8f30bbfb7e9bb583d0463b657bbe6d67464105fd536adc6a0bd660 SHA512 5af85e1717e7026b5ebe9533b0dd57290b35099d166ee400ca648cb558a37529a3ec290fb9a44679c16cf955a2de9b75328c2fa88d3e87e51c10cac80247852f
 EBUILD Archive-Zip-1.590.0.ebuild 789 BLAKE2B a9117fdb6e2d8fcca8d10d5797800de40d3b0154f0c35890203da02d8bd53af49eea0537fb80e08301ffbe89ae649c440190d8af993dfc36ce8b47891128a6fa SHA512 3276c42e2d0ffc633d2c37e65932fa681606c576dc1355cf6562f5ad65802ebaaf9ddb27f31eee8e2ce2e96e718a43ff9d5201d5e6d3ed9ce5b06f5b298aed99
+EBUILD Archive-Zip-1.600.0.ebuild 798 BLAKE2B 7eb09e9286215b5623548024c0fdfd0d8d02c1f002aed6b18fede49777a55d9f42101e32da1f7fa0221ec1b0a18f8b15c2e017f05e95ac860abd0c4b744a86eb SHA512 63544234f4bb6b5aea52745a89266d325ec60339a8056d12b12da2fe04aba8ddf4a7a302deeb5830f4edfdb39cb36aa753e65d69c895d4581ace53396dad5840
 MISC metadata.xml 1187 BLAKE2B 93311e721bebc19566b1108db3e9ec72034db4aaacbbb3abba77d35c5c53ad87a8c57ab7a3778a9062ac452983a0bbefdf7fd11b49c23df07e043974f8922acc SHA512 cab4eed19897f888eb2ff9cc094ba567053eeb115610b0dd4093db37cb8a24488454bfda9b75668f57d37d46e64e3cec5fa300b4227fe40b437c167fb38b690f
diff --git a/dev-perl/Audio-Scan/Audio-Scan-0.990.0.ebuild b/dev-perl/Audio-Scan/Audio-Scan-0.990.0.ebuild
new file mode 100644
index 000000000000..7b015f48e6c3
--- /dev/null
+++ b/dev-perl/Audio-Scan/Audio-Scan-0.990.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=AGRUNDMA
+DIST_VERSION=0.99
+inherit perl-module
+
+DESCRIPTION="Fast C metadata and tag reader for all common audio file formats"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Warn
+	)
+"
+src_test() {
+	perl_rm_files t/{02pod,03podcoverage,04critic}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Audio-Scan/Manifest b/dev-perl/Audio-Scan/Manifest
index 9470b71f2b67..4138e948cd83 100644
--- a/dev-perl/Audio-Scan/Manifest
+++ b/dev-perl/Audio-Scan/Manifest
@@ -1,5 +1,7 @@
 DIST Audio-Scan-0.93.tar.gz 3347237 BLAKE2B 8952e2f3a1570f553bc78df71f3b726598041f05fc0bb048ae39e6f0075c37e16e92e02dfec930941a0a2bc3ecb4e22f77a86bc0268ff6d057f88e1270e3dc2b SHA512 1e82f8ff35744a14626777450c87e15d7f0e5ada7f6643c5f9b38a599068cacef50ae83b525292440085de4593ad625abf5ee61282b59f64b1349d5d8f29e99a
 DIST Audio-Scan-0.98.tar.gz 3388257 BLAKE2B 5d95e3baebfdde6771231662ac0d34a7c441bdc6f7ca5d112b9fb03b1a966375b734dda486ab965a561a4c915d5f82e28c6e0dbb863bfa4c7b61a50c01b19ecb SHA512 58b30c0a4c0ec2a8612d846e9fe2680444ce745d60c3670f22686c0283245904f0506e3e362767493ad5f4aa28cebd685d12e87db3a7644edc31e2633d7342f2
+DIST Audio-Scan-0.99.tar.gz 3399719 BLAKE2B e40dfc1df1dd388efed931c48398c57d04365ffe03f82054d14db3d1f557db6a511ea977e8c11a465da41aaf9d7ed43209885590c5551924bfd3d1e4ac311a61 SHA512 abbf51c9eb15336527500ac9ce6dd8e05baee6dabdf2a4bc95a62b1787fe24c4ad0abb07d5632647e4add3123a3cfe6374c6fbfd236c5b01c3350b6ee9d74b10
 EBUILD Audio-Scan-0.930.0-r1.ebuild 499 BLAKE2B da2b58b66e4c892fb7bb306ba143cb7a60e97af1ff2f64031ffca251ca52cb3472ad4cba62949cdfb1e19a025356b57df8b35e08e454f83aaa1bae4578de28a2 SHA512 88a6ad70c6d66bad86b0d0ae9578e39f2bc578051b4a4adf367ba206f1b9deabf989efc9cc32244bca86babe895b0225ffe743007ecf1d808334ce7bf87cdd52
 EBUILD Audio-Scan-0.980.0.ebuild 516 BLAKE2B 45b0fc1bdb836158e32fd7fe32cc379a46fa1e036c76d581be86d33d201e89d61f57263391a838c199fff5f9324d39a755cd68b741a683be9569e89b53cb41e0 SHA512 20dbb6b3c91f64b84392e6f2942aca3a4dce5ad64a0b837c18fcea1ba582f2698cda8a78d656cfdffb58df4e56b0730fde02ec87bcfa691b21ad25feaba2111a
+EBUILD Audio-Scan-0.990.0.ebuild 516 BLAKE2B 4460d133043aa1f6bd73b3534666d8ad66c1a3f8c2afd658bceff2b78c944f64487e4c85529229dcb1b0c908d5a0ab4f1bc9b2306b845332b8f445dea18efb06 SHA512 00bd85a12c2d336f6bc28092ced4580cb1b97f2cc67cb9b7eebe81a83119be0e9b741eb60083cf008f73e4579b93acb1ccdb12b692912a411039406017824b79
 MISC metadata.xml 392 BLAKE2B 370adde1e14b3fc6f5deeb9a7fc8e3cc791d5f2ee200aab7f91fb7e137f8d3de3a94fefe9e1a2ce0bd69c3570429794e52aa4c497d5321d771f7a2bc6906032e SHA512 37a4f887a932366be3441e294952a0cc663262af64cab248285187a09ab5e9af1df33f8812c67cd2d6133f23c2454944e42dab52c49014af17132e635e242a2c
diff --git a/dev-perl/RadiusPerl/RadiusPerl-0.220.0-r1.ebuild b/dev-perl/Authen-Radius/Authen-Radius-0.220.0-r1.ebuild
index a40722cc607f..157df28ca9cd 100644
--- a/dev-perl/RadiusPerl/RadiusPerl-0.220.0-r1.ebuild
+++ b/dev-perl/Authen-Radius/Authen-Radius-0.220.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
+MY_PN=RadiusPerl
 MODULE_AUTHOR=MANOWAR
 MODULE_VERSION=0.22
 inherit perl-module
diff --git a/dev-perl/Authen-Radius/Authen-Radius-0.260.0.ebuild b/dev-perl/Authen-Radius/Authen-Radius-0.260.0.ebuild
new file mode 100644
index 000000000000..93ca6b83ed0f
--- /dev/null
+++ b/dev-perl/Authen-Radius/Authen-Radius-0.260.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PORTAONE
+DIST_VERSION=0.26
+inherit perl-module
+
+DESCRIPTION="Communicate with a Radius server from Perl"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Data-Dumper-1.0.0
+	>=dev-perl/Data-HexDump-0.20.0
+	>=virtual/perl-Digest-MD5-2.200.0
+	>=virtual/perl-IO-1.120.0
+	>=dev-perl/Net-IP-1.260.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	test? (
+		dev-perl/Test-NoWarnings
+		virtual/perl-Test-Simple
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.26-cisco-dictionary.patch
+	"${FILESDIR}"/${PN}-0.26-no-install-db.patch
+)
+
+src_configure() {
+	export OPTIMIZE="$CFLAGS"
+	perl-module_src_configure
+}
+
+src_install() {
+	perl-module_src_install
+
+	# Really want to install these radius dictionaries?
+	insinto /etc/raddb
+	doins raddb/dictionary*
+}
diff --git a/dev-perl/Authen-Radius/Manifest b/dev-perl/Authen-Radius/Manifest
new file mode 100644
index 000000000000..702bf30cf0ac
--- /dev/null
+++ b/dev-perl/Authen-Radius/Manifest
@@ -0,0 +1,8 @@
+AUX Authen-Radius-0.26-cisco-dictionary.patch 1176 BLAKE2B a090393a57ee39c06345d0969f5c54de30158265fd548fbe88d7dfd40335523c9ef3c9c5d5ae6432796d992c4f19e793544013bbdb7f9c5cc7854a66ae5a15c6 SHA512 f040137ade128614a0f35fe016a58989e3d5bf8fdc2ed20358223fd5ac4792d72edc135e0c1a4335be3f66d38e0120d8d42950266def30b273484ed6bda66b4c
+AUX Authen-Radius-0.26-no-install-db.patch 1234 BLAKE2B 004c2fefaf43efedfcf92bacff4139795a66c06394984f2c5cda14951214d0fdb97a84f4fbe9617b991a052091281037fcfb2592df0a620c4b8090c9365c5eca SHA512 ee947157e5bb02ccb171554d5b83e44482f0fc44b5d2c1e3d3488943baa175a87950999930ea79dd087c731b145ee15bcf394d784cbcabcd73a2f4ef8362b485
+AUX dictionary.cisco.ssg.patch 789 BLAKE2B 4938aeb59610915926a1aae3b334e5373e5fe34373ed40f3bcdef51777a838fcc95bdb93f5878393c1403e4490f74d4ca68926ea1482f6cc85d14846536bd658 SHA512 78497de611aaf280c8d4291776219489b678f9cd479fe3f2ae4c61d8e512f448435da5e77eff14d5a40a0d73e626d70c55e1fa6f932d13daa2c330235e6fe4cf
+DIST Authen-Radius-0.26.tar.gz 49432 BLAKE2B 05ce64cf463faa1ad1004a659859961d6df24d0651a180603a5a5fc3d672a91f8df521f7d19bbc7b62aa0d63e1ae5b54dec3d46718973ee160f3e7bae5f15d02 SHA512 6779712cd4fdc45115c6e68766ef58c8b1dc9bf3037f3e0e243bc23318d13b09104df5f825b40ce26f7eebe52e6c4887efc8525334f2ab00da23fe76322f0b56
+DIST RadiusPerl-0.22.tar.gz 40980 BLAKE2B 5c8a1870d7a95c89f9f2b8546c0285b5cf62873b3960ee67d45db3c9edfa0117fc40f3238d42a1306a15c4740e739381ae7bb88234bfceff2a79d73a84e384f1 SHA512 d5c7327fa3d4b6f74405e905f01be23479be542073d035c3babc34b63577069f6069e44dda9709b69b5dc25552170a764eb02ab6d2b6c2f7b366da566ae8e967
+EBUILD Authen-Radius-0.220.0-r1.ebuild 884 BLAKE2B 3a97c8502806a2800c04ac312fb54001262434e3aaa707859b1135f95f0a1787fe0e74b95fd0605188f46fe357b1f4df2951b987c1a2f456839ec4f18d2da518 SHA512 f6368a005029dccaee9e82fef1da4569a0fe836bfba3bf114b22387c818764f1f0407cc746bdf5517c881d3a2c523119912f499e84784a5a86489407ecb13bfb
+EBUILD Authen-Radius-0.260.0.ebuild 936 BLAKE2B 86a74eb4f5357b6a9639e27ae244a6905abb259a8602230ad9718f542d4ac8920791c7da1e842d9b0cfe26d803ad98bdeb7e6bf69fd02e445e3c77c4d6b69958 SHA512 0751ec8b173458084a79f20e2c022d8b5e7c8cd192de08527b7af6593894bb02dc5954ac9b7555fba90c8606c469277a2dac410dd9d8a428a96ed305b456c202
+MISC metadata.xml 398 BLAKE2B e4d3554055d85f7488c0b8e71da8792d7e86560ffe3cfd3037caf69e708f777ffc6e9044d76228463b71c82ad1ca85230e1aec637140fdc2ffe3f9042344acbd SHA512 780392f67556558208d30f88e4bb2ea9c58acbeb250bb01df4de7b9d1cc90e6d17634c4447cb7f779fd1748be3c363b280cac716b250a66c7d1cc1dd349a4ece
diff --git a/dev-perl/Authen-Radius/files/Authen-Radius-0.26-cisco-dictionary.patch b/dev-perl/Authen-Radius/files/Authen-Radius-0.26-cisco-dictionary.patch
new file mode 100644
index 000000000000..19d6b0ed9ca1
--- /dev/null
+++ b/dev-perl/Authen-Radius/files/Authen-Radius-0.26-cisco-dictionary.patch
@@ -0,0 +1,28 @@
+From c3955cd5e9232cf891500cdddf96c0f4e336029b Mon Sep 17 00:00:00 2001
+From: Patrick Lauer <patrick@gentoo.org>
+Date: Mon, 29 Oct 2012 21:02:39 +1300
+Subject: Add ISG support to raddb cisco dictionary
+
+---
+ raddb/dictionary.cisco | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/raddb/dictionary.cisco b/raddb/dictionary.cisco
+index 4dadaa3..8d57a03 100644
+--- a/raddb/dictionary.cisco
++++ b/raddb/dictionary.cisco
+@@ -118,3 +118,11 @@ VALUE           Cisco-Disconnect-Cause        Session-Failed-Security 101
+ VALUE           Cisco-Disconnect-Cause        Session-End-Callback    102
+ VALUE           Cisco-Disconnect-Cause        Invalid-Protocol        120
+ 
++#ISG Support http://www.cisco.com/en/US/docs/ios/12_2sb/isg/coa/guide/isgcaapa.html
++ATTRIBUTE       Cisco-Policy-Up         	37      string  Cisco
++ATTRIBUTE       Cisco-Policy-Down       	38      string  Cisco
++ATTRIBUTE	Cisco-SSG-Subscriber-Password	249	string	Cisco
++ATTRIBUTE	Cisco-SSG-Account-Info		250	string	Cisco
++ATTRIBUTE	Cisco-SSG-Service-Info		251	string	Cisco
++ATTRIBUTE       Cisco-SSG-Command-Code  	252     string  Cisco
++ATTRIBUTE	Cisco-SSG-Control-Info		253	string	Cisco
+-- 
+2.15.1
+
diff --git a/dev-perl/Authen-Radius/files/Authen-Radius-0.26-no-install-db.patch b/dev-perl/Authen-Radius/files/Authen-Radius-0.26-no-install-db.patch
new file mode 100644
index 000000000000..746ba993defc
--- /dev/null
+++ b/dev-perl/Authen-Radius/files/Authen-Radius-0.26-no-install-db.patch
@@ -0,0 +1,43 @@
+From 57b9f1a710c2eee1c8f54eb87d164584aa9532ce Mon Sep 17 00:00:00 2001
+From: Torsten Veller <tove@gentoo.org>
+Date: Mon, 5 Nov 2012 01:02:48 +1300
+Subject: Remove automatic radis-db installer code
+
+---
+ MANIFEST                                          | 1 -
+ Makefile.PL                                       | 1 -
+ install-radius-db.PL => install-radius-db.PL.orig | 0
+ 3 files changed, 2 deletions(-)
+ rename install-radius-db.PL => install-radius-db.PL.orig (100%)
+
+diff --git a/MANIFEST b/MANIFEST
+index a8e2801..09913da 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -4,7 +4,6 @@ README
+ LICENSE
+ MANIFEST
+ Radius.pm
+-install-radius-db.PL
+ t/decode.t
+ t/dictionary.t
+ t/digest.t
+diff --git a/Makefile.PL b/Makefile.PL
+index 45653ab..7f1b202 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -4,7 +4,6 @@ use ExtUtils::MakeMaker;
+ WriteMakefile(
+     NAME => 'Authen::Radius',
+     VERSION_FROM => 'Radius.pm', # finds $VERSION
+-    PPM_INSTALL_SCRIPT => 'install-radius-db.PL',
+     MIN_PERL_VERSION => "v5.10",
+     BUILD_REQUIRES => {
+         # Support for TEST_REQUIRES
+diff --git a/install-radius-db.PL b/install-radius-db.PL.orig
+similarity index 100%
+rename from install-radius-db.PL
+rename to install-radius-db.PL.orig
+-- 
+2.15.1
+
diff --git a/dev-perl/RadiusPerl/files/dictionary.cisco.ssg.patch b/dev-perl/Authen-Radius/files/dictionary.cisco.ssg.patch
index bbec7052ff67..bbec7052ff67 100644
--- a/dev-perl/RadiusPerl/files/dictionary.cisco.ssg.patch
+++ b/dev-perl/Authen-Radius/files/dictionary.cisco.ssg.patch
diff --git a/dev-perl/RadiusPerl/metadata.xml b/dev-perl/Authen-Radius/metadata.xml
index ce2c24ac6113..d5df1a58b810 100644
--- a/dev-perl/RadiusPerl/metadata.xml
+++ b/dev-perl/Authen-Radius/metadata.xml
@@ -6,7 +6,7 @@
     <name>Gentoo Perl Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="cpan">RadiusPerl</remote-id>
+    <remote-id type="cpan">Authen-Radius</remote-id>
     <remote-id type="cpan-module">Authen::Radius</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0.ebuild b/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0.ebuild
index 67322008b51b..c1ddaf184d1e 100644
--- a/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0.ebuild
+++ b/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-MODULE_AUTHOR=CJFIELDS
-MODULE_VERSION=2.40
+DIST_AUTHOR=CJFIELDS
+DIST_VERSION=2.40
 inherit perl-module
 
 DESCRIPTION="Generate images from Bio::Seq objects for visualization purposes"
@@ -15,6 +15,8 @@ IUSE=""
 
 RDEPEND="
 	>=dev-perl/GD-2.300.0
+	dev-perl/CGI
+	|| ( >=dev-perl/Bio-Coordinate-1.7.1 <=sci-biology/bioperl-1.6.924 )
 	>=dev-perl/Statistics-Descriptive-2.600.0
 	>=sci-biology/bioperl-1.5.9.1
 	dev-perl/CGI
@@ -22,4 +24,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.420.0
 "
-SRC_TEST=do
diff --git a/dev-perl/Bio-Graphics/Manifest b/dev-perl/Bio-Graphics/Manifest
index be3cdf53483c..831e6fab03db 100644
--- a/dev-perl/Bio-Graphics/Manifest
+++ b/dev-perl/Bio-Graphics/Manifest
@@ -1,4 +1,5 @@
 DIST Bio-Graphics-2.39.tar.gz 1139511 BLAKE2B 239164b45f0cb458df60e9c82c0900dedc86fd0ae8d0fd00b2f3bd6ae43dd801b27615153d8f5f8ac9f1db341a69fbecc431bb5da8460cc9cb61b5e45a5c32ac SHA512 4119c56a125df67a613833c06d7db94be7f19c39fcf908eb52c403e70652c04d91a3b7de768e2465423bff69dd900cb45f1044ed673eb6228a8ad7516a35471f
+DIST Bio-Graphics-2.40.tar.gz 1105973 BLAKE2B 9b2d5d8406155ba65b5f51fe5f0d832383640985bde125e31784b102789bfc288565714f216ff9bcec0a7d25ff9874c974d6037b21f51d11f48a992807f7edf5 SHA512 a575ced7b5e59ad0f2b81ecc44f441760003b80bbe8f4f2593d4f2258d967a537ffbe35b031c8fda94c0c2e64a0687739fc789a05edfc2a0b38e336f037f21df
 EBUILD Bio-Graphics-2.390.0.ebuild 485 BLAKE2B 4e978f94dd96e568c1297fb479374613b527b8ebaaa239b14b7718b116da0c3a08627eae953f9fa71ffdf03da90c7b475c0891c0c74e6dcbdde06b647d39ee1a SHA512 d2cdcd91b45a9736d0678176d3c2e1feab9d7144275b20bf9e3db0fb9c623139979d066d592cefc1a0a10456da18f85e1aaaafb7c6273af9fd689bece0cb8861
-EBUILD Bio-Graphics-2.400.0.ebuild 490 BLAKE2B e97e8197223bdac006b6d751074efa02b0f6e1fe1caa81f51ca3b5067faac98db1a0f5228b5475700b8971d642b7b53e3d1c58b3de4123709199fb5ce100ba32 SHA512 6ee8bd845e403c235dfb8b947fc2bc792ae1794bd6be594149fe5b96ee8ae9927776c008899ce6bcf9cf2ccf3f212e4309ce3b1ca58ec1f41f215a0565e34561
-MISC metadata.xml 8788 BLAKE2B 7ddcb90cda1951474bc0564bea4b5380d8287a401e250c3d28f58a03a2e3cf1b451b163f04e2b011720a54c625d061dbc50222cee0cf67226f3c8fc0177191af SHA512 dc41e35305401b115d59349de36482e37b2c57ddf4c0723a3d2df338bed02a0269853f62b31714e6a7b631e99654e1282cddb71f15aa7c6995073d1d4401cd59
+EBUILD Bio-Graphics-2.400.0.ebuild 558 BLAKE2B 84dedc6c6c0954bd56974debe968a4f45a92ac8db4cc1fab5ac236399f7f877582af3db3fd711f97dec117a7864cb496c40d49046bb7ec4f699e3e08378df3e0 SHA512 c310247128584104377abf51f74bcf4317e47b7ea6a510eb1652595dc61a962d5ce21c02b6aa10ab04dbbc54b77effdcc6c77397eaa4304c220eccaa76add10f
+MISC metadata.xml 8865 BLAKE2B 9f55cb0cba88aca2985dbf955afa1b41afd230e88aaae85faaa7b8b0b22dfc9d0b532bffcfdfa8b7d41b376b85d2975d965451fadf4ff684f7d90a12fcded207 SHA512 0a1927fa1a3edc3e3994c3af61dcccda7a5f25c755d95a1a7318f7e5611c834bec57a3001202f14309f9ef70892bc4bcf6f310a16a8ad19a04a0281fc3b49ae2
diff --git a/dev-perl/Bio-Graphics/metadata.xml b/dev-perl/Bio-Graphics/metadata.xml
index df06b726cac4..4bfb768a36aa 100644
--- a/dev-perl/Bio-Graphics/metadata.xml
+++ b/dev-perl/Bio-Graphics/metadata.xml
@@ -93,6 +93,7 @@
     <remote-id type="cpan-module">Bio::Graphics::Glyph::three_letters</remote-id>
     <remote-id type="cpan-module">Bio::Graphics::Glyph::tic_tac_toe</remote-id>
     <remote-id type="cpan-module">Bio::Graphics::Glyph::toomany</remote-id>
+    <remote-id type="cpan-module">Bio::Graphics::Glyph::topoview</remote-id>
     <remote-id type="cpan-module">Bio::Graphics::Glyph::trace</remote-id>
     <remote-id type="cpan-module">Bio::Graphics::Glyph::track</remote-id>
     <remote-id type="cpan-module">Bio::Graphics::Glyph::transcript</remote-id>
diff --git a/dev-perl/Business-ISSN/Business-ISSN-1.2.0.ebuild b/dev-perl/Business-ISSN/Business-ISSN-1.2.0.ebuild
index f3f870816d17..79067bc0e145 100644
--- a/dev-perl/Business-ISSN/Business-ISSN-1.2.0.ebuild
+++ b/dev-perl/Business-ISSN/Business-ISSN-1.2.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-MODULE_AUTHOR=BDFOY
-MODULE_VERSION=1.002
+DIST_AUTHOR=BDFOY
+DIST_VERSION=1.002
 inherit perl-module
 
 DESCRIPTION="Object and functions to work with International Standard Serial Numbers"
@@ -17,14 +17,12 @@ DEPEND="
 	test? ( virtual/perl-Test-Simple )
 "
 
-SRC_TEST=do
-
 src_install() {
 	perl-module_src_install
 	rm -rf "${ED}"/usr/share/man || die
 }
 
 src_test() {
-	perl_rm_files t/pod.t t/pod_coverage.t t/prereq.t
+	perl_rm_files t/pod.t t/pod_coverage.t
 	perl-module_src_test
 }
diff --git a/dev-perl/Business-ISSN/Manifest b/dev-perl/Business-ISSN/Manifest
index 57f4ca2dc7a3..6cdad6697d56 100644
--- a/dev-perl/Business-ISSN/Manifest
+++ b/dev-perl/Business-ISSN/Manifest
@@ -1,4 +1,5 @@
 DIST Business-ISSN-0.91.tar.gz 4348 BLAKE2B aee7fb659eb66b6792e24b1df131c662ebc5027c0a7e9ec7151decd4a2fee98ddb606a1efd0af14151a1bed85342cb6197b21afad0eb97733ffbfef5b54d6241 SHA512 5a7d098feda97088b89b58313c2f05555a0c15f3220fa7bf6d77428e38cc25dc747671813ec64c67ed90ac0f29de4c6aaeb846d7ff41ba1e8e54b4a24c6adb31
+DIST Business-ISSN-1.002.tar.gz 9984 BLAKE2B ab28f613a13e8df8e19ff721a7bd2fc31abdf48adc1009a7c5db419e06911a525399b78acfee56167a05ab38c8aa142606c976391c00e446dd1fff98f98e16e2 SHA512 c6a2d4ff750071080fc5e6859e0f959bcc14ddc307a28891636d36bbee220de40100148fd96475ad0dd5c0bfac1fdd9f5f47c2d5797c9c1b78c84f0fc811a9a1
 EBUILD Business-ISSN-0.910.0-r1.ebuild 543 BLAKE2B d965289d9728368ed3fad25a70019994c58d2d108d2b26d121c6441f78a9fd9e71aa340f2a0141c92d15cf065786b043dad08d0c8d1a03f27fdf9f0833fd5af1 SHA512 91f947ca9dd9d6753457c59949eac0d55a9c119bd93d9cccacf475057847f0ba9a3cc844cfbb4e22efed664470294333533bd13cf827f47dfa8ead8f109466e1
-EBUILD Business-ISSN-1.2.0.ebuild 545 BLAKE2B 6c4ac74402b08100e706ff6d2466ec92bdeadf795bdbd3c6273d74fab3048e322a965553560771b8b01f48f848bc99daaac5074fe7e62a0ac95f146620344bdf SHA512 d1ba538863a7314dc72ae53d2009eb7f87a3ec12f531382000a8d1e3a1cac03c34fee8824701a9e9ca254ca31ea6cc43bec133ec576bc587cd107375ef2539d6
+EBUILD Business-ISSN-1.2.0.ebuild 517 BLAKE2B 806665748a3fe2755499a7864f9c770e513c89d9e24d3bf0250d1b64a5fb14a235139b46ed25fff265eee61cb00d9310ffe1608ee6274cd98bf67ba572fcd13f SHA512 e4ed38b62fb9771b1b0d8326aacb30e142cfe06e1aadf9dd6ef41e49eefac4a17a0192f4f8d381588b05aa316bd94f057cd295b1a5d06421b7d412842001b9ab
 MISC metadata.xml 386 BLAKE2B 51f1283124ba5390e7b6e4bc2bdc14d70046997d731b1d986800f2c5fd1d2075b05ff1a21b72e6afcf01a6d5e8c135cf51b0a2c614187352ef50dc2223d60dbb SHA512 e3d151450960dfbfd9ccc8a3dea0a5c2541a3aa76453a73741b26cf13fd5215e9da958f64e4d2f811c5be6e4e0dc765edb1cf838aa92e30a838bd697ca00bf25
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 986c5b00c734..9ec85e8891fe 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/RPC-XML/Manifest b/dev-perl/RPC-XML/Manifest
index 101a0af267cd..e1ce56166894 100644
--- a/dev-perl/RPC-XML/Manifest
+++ b/dev-perl/RPC-XML/Manifest
@@ -1,3 +1,5 @@
 DIST RPC-XML-0.79.tar.gz 209612 BLAKE2B 8135be3e956083b985a00056c4574ab7412223f554a66fdadea1d10abbf837b6c02464cd212d774ef940c6f1524cbbaf651155abc1c35e1cac96aa01e1a058d7 SHA512 541ee3abf4e44cff68a2b7b7c4f78095e8e4ec479d72b52d300503bc1688f64fd01a0ff3c2cdf8e18573d19af0bae467ac68befe7ad8756e6287ed494a50ce26
+DIST RPC-XML-0.80.tar.gz 211223 BLAKE2B e26ba4f667c227e84362ca8e09d17ee01ef45c25902e7bc433bc4a81facacfc6163fc06ddd20a08399131faf18daa97f0f1a173043147f2d5046424c6e3087d3 SHA512 a91586ea903b3e633f85ca8d9048181a7c3aedcff6788c7ae5fb4971e8552c421c86f30254517c25caa35f1991146dcceb34301bb49002e4ec75a2ee9c195992
 EBUILD RPC-XML-0.790.0.ebuild 1477 BLAKE2B f994b3f611a29e732ffc2275770c9da27453c368e0d4ebc583f02085b07b2b5d3e354a538fa613c7e32aa452cc6a3fbfb79e74def4b509dc340817b4359a8105 SHA512 175f0756fb13fcbf2a49d02d0cb12a4044b59af6ea42c064bc3bde2e41af1a7295377177690ceeb666b88e65963068a90f2c1dffd480187c4484d11683711398
+EBUILD RPC-XML-0.800.0.ebuild 1660 BLAKE2B 028c3eb8f391211bbc6c60a5064fffc6557a5ec05f6a2ff7dac7b41cf0deefa63f1978d3fcb7f4aa7ba7775dc95b71bce0103f9cf6ed51a53c6036bee8026af7 SHA512 9032bc0d981c4b51544e3df08ec2bb1a11686f24c6c5cb71957cb198b1952e862eed1a8955281839ec20a3327705fdcb2c6939af2409c7881a1a5d26fe2b3fbd
 MISC metadata.xml 2132 BLAKE2B d79cf95022d41b771f0fed70a1ac781ea84d7b6624e1e059f5f0f99173acbf86e6acdbaf180f12fbc34c6344ea817e47acf109d1f774dde0abfad403fde17341 SHA512 db4a73a2a59419f3840d86e6306eec5436b51fdb0011e537a61a54247ffd0e72f2570cf49d7831ec0a6f5b5dde3f94761fecece1753bbef8fbd0d199b9ae94f4
diff --git a/dev-perl/RPC-XML/RPC-XML-0.800.0.ebuild b/dev-perl/RPC-XML/RPC-XML-0.800.0.ebuild
new file mode 100644
index 000000000000..8f06c0d73737
--- /dev/null
+++ b/dev-perl/RPC-XML/RPC-XML-0.800.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RJRAY
+DIST_VERSION=0.80
+DIST_EXAMPLES=( "ex/*.xpl" )
+inherit perl-module
+
+DESCRIPTION="An implementation of XML-RPC"
+
+SLOT="0"
+LICENSE="|| ( Artistic-2 LGPL-2.1 )"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-File-Spec-0.800.0
+	>=dev-perl/libwww-perl-5.834.0
+	>=virtual/perl-Module-Load-0.240.0
+	>=virtual/perl-Scalar-List-Utils-1.200.0
+	>=dev-perl/XML-LibXML-1.850.0
+	>=dev-perl/XML-Parser-2.310.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+
+src_compile() {
+	perl-module_src_compile
+	if use examples; then
+		pushd "${S}/ex" >/dev/null || die "Can't enter ${S}/ex"
+		emake MAKEMETHOD="${S}/blib/script/make_method"
+		popd >/dev/null || die "Can't exit ${S}/ex"
+	fi
+}
+pkg_postinst() {
+	SETWARN=0
+	has_version '=www-servers/apache-2*' && HAVE_APACHE2=1
+	has_version '>=www-apache/mod_perl-2.0' && HAVE_MP2=2
+
+	[ -n "${HAVE_APACHE2}" ] && SETWARN=1
+	[ -n "${HAVE_MP2}" ] && SETWARN=1
+
+	if [ "${SETWARN}" == "1" ]; then
+		ewarn "Apache2 or mod_perl2 were detected."
+		ewarn ""
+		ewarn "NOTE FROM THE AUTHOR OF RPC-XML"
+		ewarn ""
+		ewarn "At present, this package does not work with Apache2 and the soon-to-be"
+		ewarn "mod_perl2. The changes to the API for location handlers are too drastic to"
+		ewarn "try and support both within the same class (I tried, using the compatibility"
+		ewarn "layer). Also, mp2 does not currently provide support for <Perl> sections, which"
+		ewarn "are the real strength of the Apache::RPC::Server class."
+	fi
+}
diff --git a/dev-perl/RadiusPerl/Manifest b/dev-perl/RadiusPerl/Manifest
deleted file mode 100644
index 644cc571271c..000000000000
--- a/dev-perl/RadiusPerl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dictionary.cisco.ssg.patch 789 BLAKE2B 4938aeb59610915926a1aae3b334e5373e5fe34373ed40f3bcdef51777a838fcc95bdb93f5878393c1403e4490f74d4ca68926ea1482f6cc85d14846536bd658 SHA512 78497de611aaf280c8d4291776219489b678f9cd479fe3f2ae4c61d8e512f448435da5e77eff14d5a40a0d73e626d70c55e1fa6f932d13daa2c330235e6fe4cf
-DIST RadiusPerl-0.22.tar.gz 40980 BLAKE2B 5c8a1870d7a95c89f9f2b8546c0285b5cf62873b3960ee67d45db3c9edfa0117fc40f3238d42a1306a15c4740e739381ae7bb88234bfceff2a79d73a84e384f1 SHA512 d5c7327fa3d4b6f74405e905f01be23479be542073d035c3babc34b63577069f6069e44dda9709b69b5dc25552170a764eb02ab6d2b6c2f7b366da566ae8e967
-EBUILD RadiusPerl-0.220.0-r1.ebuild 867 BLAKE2B 25a49ac6bd59ff1122c1810cbafb948dfad24fc04eb51dec6abd7d5bd8d4d683582a0406e6d51a8ab159ab0f56b2cd3b2252a757142c852f2c1d5a4a7deb8b73 SHA512 db376425633e6bd1f4320e6f5058b4b40351b71a4fa6247a5434cd7b5446e6aa488a68513da7cb2573b8ab0757fdb0d80061d1d1405703ef910f4e4966db0a68
-MISC metadata.xml 395 BLAKE2B 0ad03187b5b41cbf2678ce057fbe9c84a95f28fc1e52d1b73a4d4bbbecded5d7bffc6ac7f99e08297ac2e938c45e94c3a2013363ca85b3a53f303e8e114cb520 SHA512 481f862de0a5ddd228ed1f976d9d7712cb572dbc4041abc391e3f4159566630829f57ff0e6e84d4012882c7939038322e4298b2d8fb17c717abc404d839f2850
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index f4ddab70f87e..ff11aa189fd2 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index b6f668d6cfa7..cd471fce7984 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,5 +1,6 @@
 DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899
 DIST apcu-5.1.8.tgz 111260 BLAKE2B eb41b1af33500ed9ddbbcb5e1a92884af4b356e16cf76c70f75a8853522cc91af1c156cc0bbd464fce539a138bf4e2ead5101810223b0f1bb91cd062850ef08e SHA512 4f377389e713bcae5534c64ea28f72c20ab2176aa758188c4d956c1f2370be49bc33dd2a1db43941fff5344a164aaeebc4e73e6d579f62d17334bcc520171526
 EBUILD pecl-apcu-4.0.11.ebuild 1453 BLAKE2B 3d0e75d3dbe866f5e10dc464fb5a54a67ed79656ef9d97d62052da4670be39d91122fb2b1da4e6629c26b7aff71585e683e3fccddf59d77afda21d47eaea2c8b SHA512 b0fb1cdceb8e2c48b459309c6e98a1fb16faa48e1228bc0bfbe5c01cee0b038121ffae8a094cdc030fd1bc94624d4602e6abcb5b99dd6a2109024856446571b1
+EBUILD pecl-apcu-5.1.8-r1.ebuild 1980 BLAKE2B 9c1e584cc0322c4615a4be144e38e5b2cf34bf527889729630ec75ef1a7d860483dc57229512cdcc967298060aeae2c4447de0ae83e1ffe41cd73a951e3b14f9 SHA512 7e867d09683d87466f994f972b53d0a7c5ad7643313a1c377ed026d9c3e0d2d96a6de0e25db88b2ab6e3de16aa896513691f5646075a89538e7bb6d88cfb1961
 EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.8-r1.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.8-r1.ebuild
new file mode 100644
index 000000000000..bcf56069751f
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.8-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-apcu
+			$(use_enable mmap apcu-mmap)
+			$(use_enable lock_pthreadrw apcu-rwlocks)
+			$(use_enable lock_spinlock apcu-spinlocks)
+		)
+
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-pecl-r3_src_install
+
+		insinto /usr/share/php7/apcu
+		doins apc.php
+	fi
+}
+
+pkg_postinst() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		elog "The apc.php file shipped with this release of pecl-apcu was"
+		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog
+		elog "If you depend on the apc_* functions,"
+		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+		elog "provides backwards compatibility."
+	fi
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 086b07a82d3c..6b29962363fb 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index ea48d8f80ad6..ffab68145dcb 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,7 +1,5 @@
-DIST castellan-0.12.0.tar.gz 50497 BLAKE2B d5fbe6f0b29ad5dff2031f17d6883715fbf8ab96d3a7705cbb57d5de1c2e13f5f0490893133abc074b91579f6c589939196249553aeb3e7d60a4aca416efac14 SHA512 9fe47f9678dc2528cbca652029263db89b71939e70c4f5fddffd1769271c04bec3cad0a7c29a800b646098b3df89fc064049c4fe3887695fe0b5dd6b3146835a
 DIST castellan-0.12.1.tar.gz 50245 BLAKE2B 93f56301ffb57f44fd89fccafa5a2aaede3a3b8f54bf223e1e2a3cc1f14304b2d153557d62f884140512ef72747268b9f86e1102b067a0810bf8235df2e72a7e SHA512 f5e3a8a6ed6c00caa242d2a2a1431f2ddd56ff0168a62fa825eb90083cc1830fe2d8bc4d21b8ed6d1b5f6d1042cb2ad778d49e6a39b003768a61b9ff4d389027
 DIST castellan-0.4.0.tar.gz 49026 BLAKE2B f5c4854ce4837a33c6bca369799da2f6b6109a1ebb2bebf47ee93f687214f9388039c237d474ef401bdddd3f983d18af6e4d84f3d6fe3418d3f8989c6811a3f4 SHA512 2ccb2a757810c6ec125dbb8832cd09f918f9fbf84836ff69c79872471c7e4e40bc8030e305336ad9821de7c3b93617d39917387a6ab8f68443fb09d3f74d4dd5
-EBUILD castellan-0.12.0.ebuild 1437 BLAKE2B 69aba8d6c23bcbbe7438a5608761ea8ba4a0a0ddb010f5e92ca26c20cc5d9e1fddcdbf9c03e55781ff6b133515652354bf724e22fdc0101d2dafd97e047819e0 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c
-EBUILD castellan-0.12.1.ebuild 1439 BLAKE2B 693be4147a5d7520ac015b9181fe57dd7bed38d62790edc370b7881b2d70c5033d4e4059e71173dae4ab0f43bb4d388ac6f1b8309ab99db542c000bd46ec905c SHA512 acd45fa667e65fe1322725f562d5cd809cc6569209dbe25f0b3022ee7d06ed2f25b9712c5dd1aa9da45d0c16087eb18302d444d71e32cbfb750174c2e144fe35
+EBUILD castellan-0.12.1.ebuild 1437 BLAKE2B 69aba8d6c23bcbbe7438a5608761ea8ba4a0a0ddb010f5e92ca26c20cc5d9e1fddcdbf9c03e55781ff6b133515652354bf724e22fdc0101d2dafd97e047819e0 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c
 EBUILD castellan-0.4.0.ebuild 927 BLAKE2B 4970a777ef6a94cec2def40cbdc097b18fe8f001455d86c55f8aebf973aa7a076bb0f415657862828e8a6d91f9cbe0955de9f973f665c977e1779b096f07a60c SHA512 a7e4cf2a25a51e3b2ddf54a182b229ef441e6c2f5925b62c1efd4a457376cc36c0b8cef52691abe0e113c53913a13a0e649ecc3551ddf8c0ffe2529238a379c1
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-0.12.0.ebuild b/dev-python/castellan/castellan-0.12.0.ebuild
deleted file mode 100644
index b2400c1455a3..000000000000
--- a/dev-python/castellan/castellan-0.12.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=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.python.org/pypi/castellan"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/castellan/castellan-0.12.1.ebuild b/dev-python/castellan/castellan-0.12.1.ebuild
index 2d93dd3fb60f..b2400c1455a3 100644
--- a/dev-python/castellan/castellan-0.12.1.ebuild
+++ b/dev-python/castellan/castellan-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 0b0b82465921..4e51fa20d056 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-HTMLmin-1.2.1.tar.gz 2921 BLAKE2B 61601aceb58545972469ca3482e7e44464d3e3f1fd0b4a40d8f1c5e1c340c5b5292d59effc3a7a4881f1a012e90d961dcc0ec3b069f1c83d4b4cc76c99d3a301 SHA512 255dac2da4db1cdacb3cccf8dcd06507c249d97c6e92e7c413d3598fbfa247f657c294eb5f1ff1f50ed73ed656ca2a1015ab712f4ea880a209f13c1d8950d83e
-EBUILD flask-htmlmin-1.2.1.ebuild 515 BLAKE2B b3385cebbd9934d6bef3b4965cf1570b1d40e4ae1f1da63eca4b37a8ef6e8e10adf919ed1d8345f7e5975428931e2399239879ccf4e2a7bf3749382305058d83 SHA512 34058db8fe52027aee5e1fadb7ef8ab98a0317e569070f29bd3498192c46a5e65c87bd1d66944f13acf82283b6731554bfbb90af03d5f79999914846bfe9fbc7
+EBUILD flask-htmlmin-1.2.1.ebuild 577 BLAKE2B d0549ccf44b7dce8923fc25dc96c6afe54d4c14ed5e42eed255a19324cbcfa3a01f140115a5e8cc7e06411a864d65e760071f840c0e83c763bc95d4dc3412cc9 SHA512 8d72ac817e063c09287931b59856b4e2f87c0ee1643e13ee5992fc95ef996dc5556700dd598f8c5e84c9adb449297a3c9f308005938784a4824ff9f2724aa6b2
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
index e744d00a4a6e..00e93c0cb191 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
@@ -25,4 +25,7 @@ RDEPEND="
 	dev-python/flask
 "
 
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index d24538bf2d8b..ff348a7d0da2 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -2,7 +2,7 @@ DIST jsonrpclib-0.1.7.tar.gz 16980 BLAKE2B 76052a094d45cd483df8b4e12e657d43aca22
 DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
 DIST jsonrpclib-0_pre20110820.tar.bz2 14608 BLAKE2B 1cc7fea4984009c1c21d9dfd9cabec10d48406294262b973dcf5f3d3148fc74be5f201ee11c91600e7b6679dbd5716d197d727c89da738d2dc54aa9a0e1dec82 SHA512 80864890982c4a11996cd9fae21029cdf40b089eb6c2d265c645f52fe0a6e858b3405c5d899d2a5908527da04263d93064f365c5308adda1791105bf32329b71
 EBUILD jsonrpclib-0.1.7.ebuild 633 BLAKE2B 5964bd430a3d3278a602d079afeaa15762372d7ce35b0e84884efd525d8b533e4be79fc71358b2c39564a68b7233a4aee4bfe65a77da63bf0397dbaa15ad76bb SHA512 debe25d5265d5f2d50f7d17af46beeb6da9879bf54734eaa36481c3e0030d60bec3f9525674a4acf6360c8135204096f1743593149b9e32522a299d7238bc221
-EBUILD jsonrpclib-0.3.1.ebuild 710 BLAKE2B 563d5e0e4946e3912d6b87d60016bedecf8413d6947e48b1b0e77a2ae7519cfdbaf6ef4f09f2a4635e890db2016e9866f0c3a9dc56491aa6b0d60c2de912a2a3 SHA512 a1ddbb9900c1aa49fdb6c758b134c5ae00e9f17ca0ae17faf36a5024ce194ab00b80b583d65a4bce281defde4148ea0816b4e01c2a516ba707569fe22c9b073b
+EBUILD jsonrpclib-0.3.1.ebuild 708 BLAKE2B 708cbebddd314140bf094c3bb00780b33a7d68c31fe077f60c812f64f27d6724cabea52e8456bfb24fde044e49d2209bc237d7110baf96b940cc4007372b3be8 SHA512 d9d61aa7a6d9b35a3ea7c1a6a9fef2bc3d5e9f4999ef11f9daceb28e5d3accccda06b81f776b8791422844aab6e35efa6a37a69c160439510c3a529f301e407e
 EBUILD jsonrpclib-0_pre20110820-r1.ebuild 573 BLAKE2B d78437cbefdcc6f269bcc1139deeb82a7ad2c96bd4313851d57aca21635a7fd784545f9487ccfa1eacf74f093e80d76294b697a85004e7e6f0ce094b045d6995 SHA512 10a9c32643d393ff9f857eb2d48d708d1635cc52d3369bac0abe05d0cb29b67295d49126380f5c880dd61d83e0676a1934a9610e95c8a0217e1e920964b1b800
 EBUILD jsonrpclib-9999.ebuild 710 BLAKE2B 563d5e0e4946e3912d6b87d60016bedecf8413d6947e48b1b0e77a2ae7519cfdbaf6ef4f09f2a4635e890db2016e9866f0c3a9dc56491aa6b0d60c2de912a2a3 SHA512 a1ddbb9900c1aa49fdb6c758b134c5ae00e9f17ca0ae17faf36a5024ce194ab00b80b583d65a4bce281defde4148ea0816b4e01c2a516ba707569fe22c9b073b
 MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
index de6e1a8301bc..98f9b51fdf2f 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~mips x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 570e66698035..05f7b523e173 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,7 +1,5 @@
 DIST oslo-cache-1.17.0.tar.gz 47178 BLAKE2B bad4a005255a03cea4552b18adc242123923c3e5f8dfc73085ed8b0e600fa4c2c8420f0b5a4959d6272e8425b07da95ee77293bde486edcefd40471ff4fca439 SHA512 0ae55959a46624bd0b50cc8161f9428b3f61669f726ebc05d944f7e049c5172a1d9c83778c9632e8b2a21f047884d90d15b95c0e23a0dd19cb78f8d62f06d00e
-DIST oslo-cache-1.25.0.tar.gz 51267 BLAKE2B 7bdf6a38aeaa296bd87b965551eb57523d653aae247d3381af402bfbaeebaa0ff66b21b0ede30e3ab00f957bc36936484552996d30048d42224268ac1b59243c SHA512 3c21736c864cd63f3a55fe06cedad54a877970d3ede70fe9259cd549fb2a81d425547445238f8c8f9e42929b775216c79b34eead8655588ef8e1c2617bbae6a2
 DIST oslo-cache-1.25.1.tar.gz 51049 BLAKE2B 24e229d7c7a03fc244fe257394fcff1dc55509c6ed6a60ef8eef49c1a7660972a8412188ca96902b61463dd452bc63fed890ba27235d93dd620a93a52de706a2 SHA512 bc5b6502c6f310670ffae9b70b232ff90f0d0c04b75ba14aa4d528634f912efb243b89e229b8277e86ef3d7cbe2e81e69996c80f011d8ea4e1050646f074b297
 EBUILD oslo-cache-1.17.0.ebuild 1049 BLAKE2B 03dfb73c16f74235614ef5fb65b22ccf3c7c7bf981ac0c2db7beae7d00bb33aa5376071195848c6a068b99c89fcf7329d5b1e39378671972fb19a38b282fe632 SHA512 b23fe1da5ce175391e582189a6494e0fdbfe7c6cdd351ed33d53ad161aebf7fb905978f479530f69722ae4756fdde1fb6e50578848cb7c8c6f0dd666293d2d2c
-EBUILD oslo-cache-1.25.0.ebuild 1190 BLAKE2B 97e324d523d406a006a66c30afe34673b7e38f8032ca070e2ffe65f8e3de794debc745d78f71fb600f324ceb2c62586e282c89f5e2c8897f2b93a307f741de75 SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d
-EBUILD oslo-cache-1.25.1.ebuild 1192 BLAKE2B d87477ad9e4476368b85798b0f1ac0ac85a97d11800b44bfa880d80a39e8bb1f810a97338bf9a76a30cabae162f21109e383f2b994fac8a054c0be081281cc98 SHA512 ebd7a506113f6e73be88ebe29d860e66e294474639a75e125feab4e078d74ad284baa86393874ff72d1d88d0b941df1c0f8b0a461232f11d469067605265b04a
+EBUILD oslo-cache-1.25.1.ebuild 1190 BLAKE2B 97e324d523d406a006a66c30afe34673b7e38f8032ca070e2ffe65f8e3de794debc745d78f71fb600f324ceb2c62586e282c89f5e2c8897f2b93a307f741de75 SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild
deleted file mode 100644
index 9f4447b6a1cf..000000000000
--- a/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild b/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
index b655f5a5bee6..9f4447b6a1cf 100644
--- a/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index a02c461693eb..63dae82b6cad 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,7 +1,5 @@
 DIST oslo.privsep-1.16.0.tar.gz 30448 BLAKE2B b1bdff6d168c4215728e8a3e84df9973bdd066882d8409d12fc736861f9a796c5591b1ea4d4f6397ba742e0a2e0b4cc731058e8e8924f0c8598d315b43fb72ca SHA512 223cb4a32a9a8545833621c7a6e3a9ab5acf84a188f2a6f45df4311e02ec64cef8d7150ddde89ca3c207f5aee599ed655b1f9a5fbdec7f55605d4d3aa251edd5
-DIST oslo.privsep-1.22.0.tar.gz 33179 BLAKE2B f89c44deb7bfc7531063731db9a6eb2f92a85f686c8ae5f117068eaddee1ff26d45b14a2c7c0a65e8071f238e9239c98fbe20a2a524fd10a511f2bd71dc13794 SHA512 ba4bb9b4fae1dae029a72f1216c23eb7c3ec0d9376c6c1b6ac864b56d3a942e4774ef95830f451c6d2c11cac5089bbca3c7c1cc47f7efd9dc5be58a3bcdf76e5
 DIST oslo.privsep-1.22.1.tar.gz 32602 BLAKE2B 1dff51174aaf3b8b8c2c5006e476f8b6f386f071cffd5038c9261af3696a7ab1e05e8ab400a6c15a1dc050363e991587d8234ee6a99dfacd20f10162779766df SHA512 fc71b92b9a73e9de5003bf3e9288eca6a128c8d98abb51e5e372823a8ad549aa484bec3ab2bd0ccffe527282f96f12dd02c0bdcd0680b123649ac452ad4c0a7e
 EBUILD oslo-privsep-1.16.0.ebuild 1569 BLAKE2B 6e3cc5258fe489407beb7c661c89e491e10bf1ac991233baeabc6f84569b8b605be6228ff3bba07df8e7949b9f9232323b4ff897af583ac3e5858dfc81b78435 SHA512 74b826948de43144eb62e8221a2e15ce37f10a436975faaa287d8d16d6d28d570467256c7202ac7965f622011c9b593879e09f9c1d0898cce4b400fc333f11d8
-EBUILD oslo-privsep-1.22.0.ebuild 1794 BLAKE2B 93e0ee8b4cdfd90f7cc4013a3dadb140582576b4a31394c691a12d17ade417e5f5dcdb0eafedaca6d0ab7d43cc7c81ef830d6e8328a84763185bf8f31284ab02 SHA512 e46645b4149348dc6fe59c11e6fea184e4e3f51ad3e4634bef267591184da60f8ad35965f381ed578ca7328509445ac151e573b49dee6d918e4804b9e7f470c4
-EBUILD oslo-privsep-1.22.1.ebuild 1796 BLAKE2B 1176280a1e7d5ca019c2aac7b062efa7271af2617e91950f0a85a00a23d9377298372b6b516eaf41e0c7b6e64c85f0b1460c5b7071f301f27b31458fa6541377 SHA512 9e7b7a35ca35c17189920600188d7e8f52eb0cd212cd36f92d99e5775f877aac632429d0a61025bd1ac6d49c514b64240e094fbb0b44f396078bffed9f867a71
+EBUILD oslo-privsep-1.22.1.ebuild 1794 BLAKE2B 1bc84d099ab37d2ede53ae4347e6e76f5b0420a71a66386d676f1196c0afea30367abdbf5c510d49f9c771ea4d6274a668ec3ad73811bbf2b259ab779dd037e0 SHA512 d69fc20db1a3aa80f5c79b19d9eaff293dcd11ecbe0ddadbe1c8ca9f7935a9522108de8103f83e037e5ae4fe49abe293bd842b14ac1da6402d8c241ee6015278
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild
deleted file mode 100644
index 2994eb02cc86..000000000000
--- a/dev-python/oslo-privsep/oslo-privsep-1.22.0.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
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
-S="${WORKDIR}/oslo.privsep-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-python/cffi[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# python_test() {
-# }
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
index 7e62a26bbdd3..f2203d0c8cce 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.privsep-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 327b3ec8d0ad..1ed14ac3d3e1 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,9 +1,5 @@
-DIST oslo.reports-1.17.0.tar.gz 47891 BLAKE2B 8f39a955585baf10a8bff017c7cd652f511e97061705ca63671522cd40da7d4c3d1b8f3d2aa3da69257b3d7c9a57a6f0f8d4bba12d7439edbb91af5f81733399 SHA512 1fded7c8d6149dbbe11fb6fb28f6db656571519fcc093bfa7bf85a8d998c6cf23f28512e0658c9f8f547185f10bfb3b993fdc52942eac5ba884d2ee15556ad20
 DIST oslo.reports-1.17.1.tar.gz 47828 BLAKE2B 414020c3ec934fc32132837b1af16a5f4ad481b392237a930370111e0930d18681c1fbd9d969ad5207966856caaed4c94c3dd89e63849ca042acad72cf3440e4 SHA512 2ed6d69c8643901a185f38de34cff663160daa246d372503f17e2102634c6634dfafeaa7d6474b7bd702f43aece27a3e4d16c06ccc0a9f6bee1d79a2204ec704
-DIST oslo.reports-1.22.0.tar.gz 48141 BLAKE2B d7b0518cde504152336451fc73dd9acca1fc5fa44717eae358e8065051944ea25e6624fedd4795125405cb423f099f1cd2f63a127e2fada9928b34baa386a4e2 SHA512 fa4d6f08531c383fbba3fc2785db0c22a21226d477faebe65ae6ede5e2c7db7fbcbb6edd793c38e6f862679e13f2e7e5838ee48784ae554f18ba9363edbbee54
 DIST oslo.reports-1.22.1.tar.gz 48151 BLAKE2B f3867bf3c6c7fd207b1e730e8c96098d74b42239107999194bcef295ae0a86048bed7f47498a5d4a0186d15d48f97d897850fd2558eaae7bc386b9401c01155a SHA512 c2c7f35fe80df9393cb1d9add59a7be95586ee078074548795f881c8515073946bcf3dfda02536850b943f346a6b81bfffa1d9f461f0cafdf6163da09b6d07d4
-EBUILD oslo-reports-1.17.0.ebuild 1216 BLAKE2B 9a68f2237752bedaaaf13d7197f33eac27d92a4481458ee9b994fcda589edd39b95590e8e386a0b05a2c843e203d2235942f4cccee49b0572b1b28bd32a36ded SHA512 0ef892ee3ef4fc5c114c623d8a44fcf48276089252182d22e81d6807500efaf121b32523b5907ece493e878443574813380111a7fe16183bd03062bbb85b6008
-EBUILD oslo-reports-1.17.1.ebuild 1218 BLAKE2B 919082da9506e999e1e5b290f10ea6bb242042b93f0326e66e89387090ed781a9953af8b43f2eb81b84c9742921db10161d75f25c5616feff76efc421e5a7c0d SHA512 c9874eac382be979797970151447313943d6fde38afc3919d1a402824ee92b5214d56e94eef848f35df8d266cb84595d6414f42c0f701d69846bb09c790c475f
-EBUILD oslo-reports-1.22.0.ebuild 1349 BLAKE2B e6e3c2cbcf89616d6ea7a30ca9e0a622cfde35683209f7cf56aec7afb718699ea5d0cf3fa276eb24ba5cd9dc111cd6ae5784b0542f6f4510f9cc81cfc3af7527 SHA512 34a44e0e2b3feda056aaec1b61996cd7bf7838b9a98304bc74565d543f2f013ec90a2b37181884b61020f16f05d20a365326929b2b717ea84e3a3798c527828e
-EBUILD oslo-reports-1.22.1.ebuild 1351 BLAKE2B 83367cbfd28d874984e164d4f8b15ccbca009d4270d2947ff1141c3160999e6d9ae4aa3ba53b06a7b25d8419f0699026799078d6378ce16550c78a39201ed680 SHA512 084554d3cbf8e69dac1c5ca62f78f98ecb9a2e0dbcc38be10e1774e3a60aea77037211654562e2e1539e93e0b95e06aa3f7b074c0258b0732f52fe8af41f29ae
+EBUILD oslo-reports-1.17.1.ebuild 1216 BLAKE2B 97b3facf59f234514e4329a10efd272899929250accfb4183de2c42ef6f99d680ef3d6c4bbabb816cd6a037e5aeebf09d0e5162208bc2b75b908daf1ed089dee SHA512 ec46af4946bd83efc02ff72b36e6ebd1ee2cad29c7e34e4d308c690215633341de9e6f63637e89582ce6dd789ab5d704677ddb9f9ad371d6921c2bcfca8abac5
+EBUILD oslo-reports-1.22.1.ebuild 1349 BLAKE2B e6e3c2cbcf89616d6ea7a30ca9e0a622cfde35683209f7cf56aec7afb718699ea5d0cf3fa276eb24ba5cd9dc111cd6ae5784b0542f6f4510f9cc81cfc3af7527 SHA512 34a44e0e2b3feda056aaec1b61996cd7bf7838b9a98304bc74565d543f2f013ec90a2b37181884b61020f16f05d20a365326929b2b717ea84e3a3798c527828e
 MISC metadata.xml 329 BLAKE2B 431c4b925c3e743ab9f24b399affb6c0debc3c81f2dff9fc3e30c04af99b1984b8b8ee56d143c5f130a2c77f3bcecc0ff905d07fad2e3301ce5ca1b7920715d9 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec
diff --git a/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
deleted file mode 100644
index 074ad9e09bae..000000000000
--- a/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="generified reports for openstack"
-HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
-S="${WORKDIR}/oslo.reports-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild b/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
index 62da8e1b81b7..a41d32fdc2f5 100644
--- a/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild
deleted file mode 100644
index aba2422ed1ae..000000000000
--- a/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="generified reports for openstack"
-HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
-S="${WORKDIR}/oslo.reports-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild b/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
index ad722b7e1add..aba2422ed1ae 100644
--- a/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index d4c52db82168..aa5dc15cb720 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,9 +1,5 @@
-DIST oslo.service-1.19.0.tar.gz 74937 BLAKE2B 0459f16c7eaf75c3df5a58eda40fb5b9cb3831662038c5ee19e6049fad940474a65e9003641f6ba4755b918d1d7f6333fd60670c672b30339b6b7339ab5275ee SHA512 d9f8c5d07d418ab2d0234299071e4ff129ec4af4bf8f2973f7899c1a7636fc67f1ce16e770ada7c7fe8a19f28a156536e1c159546a0dd708f26404dffceb5c70
 DIST oslo.service-1.19.1.tar.gz 76246 BLAKE2B fb5355d058459da0be54f1d208201f130a20a1a59c90fc15ecb4e748c8cdd5174410a521ad05bd125b3f4ada673d1ba2ad7c7a2565a2d0821e2ec55a50e7e61c SHA512 3298ba9e0dddfe477c324b3eb55d4d20ab5da6231488658b78290d1e9e9eafab758885d350471d1c87c24d01551a4643c1f748323a8455d743f0dbe74d4c5d68
-DIST oslo.service-1.25.0.tar.gz 76400 BLAKE2B 09dda44cbe2633efe149b552b9d2c484f1f63f085d2772e1caac9adc38246b5ccb5fd04c3d94b717b1c70f620898ca686ae72fb306b5236232902578ed2ae456 SHA512 829c9be54813900c4bce0072e408a4c996548ca123524c76b4a3b99d7bc940d22f7d4a0a1d6e02ce88b252fa34bdedf26129bdfd4894c4b5b14c8ec71b85629c
 DIST oslo.service-1.25.1.tar.gz 76864 BLAKE2B fe4c8ac0f52ad7dcdd5240716030cd807d7755bf6f39d949331d18c1d0ce30563609f15db0db10824712b0a22cbd5ee9d6985fa5c9a51e734b000382d0ca7501 SHA512 2632ff6ce079916e44d6250487e202a7e1590cb0ba094868bd9d8e01cea9f89f22a5336edeb74aff2fa0f6aa017aefd454159511134670cceff5112b9957ce81
-EBUILD oslo-service-1.19.0.ebuild 2062 BLAKE2B c08d9b2a29cc5596e4254eca16e8c9ee9da9a6e9ef9a785ef400632a5e198462494d74d0f1217d625f5285752198014dbb175ab14cb04ba89301defe7f70c26e SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a
-EBUILD oslo-service-1.19.1.ebuild 2064 BLAKE2B 87c27ff38449f2f1f6dca056162db9de081b93423bba9702c7aaed572233df87ed4249a219a2d1a0c251fa2230f85545f6c918b445d2d53774b73017d1751fc0 SHA512 32a3713312f0332458d112ca5504a1982c22534ac973a0ce773f5f7eb9ed3ba21cf3c9617f1f0a9aa66117b4f444bf7862312e87e22dd522876970b4f30c513a
-EBUILD oslo-service-1.25.0.ebuild 2207 BLAKE2B 413d64c460fcb44bd70704262cd237fc852201f417d203dff5b6e283918e939fb270cd7268e00391d79192bccd868ea4ef261cb8f54fb6f2fb6c3b715133d420 SHA512 30109f79017401d8b966283c1a99b3b55b287e4275f057f069fb6c7b66b785c2d5a5b314fc0a8712776e30be11bc3c37ba2782efec80e29131da8fe9b3f3aa43
-EBUILD oslo-service-1.25.1.ebuild 2209 BLAKE2B bb9c522991599ea1a3b333b565b8d4b8c788abffc97193094d9706581328e64d6306eda3f40983d3e79674b1845b638ad8b28f2609ffaa28b3d73dbf9ff29920 SHA512 b884733ccb9a5e9ccd993ae639677c1300d62304bed0f9638d68896734f8dfae4e5859a3d49f60a67f0b1434aa68fd639a3c7e6cdcebc200600dac25fbad4486
+EBUILD oslo-service-1.19.1.ebuild 2062 BLAKE2B c08d9b2a29cc5596e4254eca16e8c9ee9da9a6e9ef9a785ef400632a5e198462494d74d0f1217d625f5285752198014dbb175ab14cb04ba89301defe7f70c26e SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a
+EBUILD oslo-service-1.25.1.ebuild 2207 BLAKE2B f0b267507fa5a90770ec57cc24debd421ae9ea7949f0e590b42869717f5c5553d169507f2cbe056bf32af7a7696fc299dab858ad1493d528540e81b03a73f5ac SHA512 84d67ce2b71608204676112d4c8618210edc6d309e0edd9ac49ed583321c782118ba226a22a81fbe3dc8881302d269762fe9f64fadc0992d3fc412dec334fe26
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.19.0.ebuild b/dev-python/oslo-service/oslo-service-1.19.0.ebuild
deleted file mode 100644
index 68dd17fdfc1a..000000000000
--- a/dev-python/oslo-service/oslo-service-1.19.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.19.1.ebuild b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
index 0660928ac7c8..68dd17fdfc1a 100644
--- a/dev-python/oslo-service/oslo-service-1.19.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-service/oslo-service-1.25.0.ebuild b/dev-python/oslo-service/oslo-service-1.25.0.ebuild
deleted file mode 100644
index 4443ed6a468e..000000000000
--- a/dev-python/oslo-service/oslo-service-1.25.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.25.1.ebuild b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
index 729b8faae141..af307573d4db 100644
--- a/dev-python/oslo-service/oslo-service-1.25.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 16c0c10124d6..0cee851abc57 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,7 +1,5 @@
 DIST oslo.versionedobjects-1.21.1.tar.gz 145514 BLAKE2B a5cc7b4a814718cd24c460b2b39af381c55fba94d363ca8ebfb096386261ac86f0f18a6aafb78b032e454c7fcdc4ce7c3d9ae5a9348036283fa61eed98b05e27 SHA512 e594d77a923c588a7ca1bc4f1faae4532f28cc2306d548235e0bc3cf0c6c16a5acb54f5b82b97f4ead165bbbbb29982d0f96f20357b1fa0a1b2fde3445ecdc15
-DIST oslo.versionedobjects-1.26.0.tar.gz 146388 BLAKE2B a3c2d6effca31525c33631b40abe0c0507155106b3fc9917b2c13e8f2849036fc57a16075d06999a6212a11f7ea653c9a2c9d0fdc7d9b42e9bcef4b81253398e SHA512 633389177b0f4d62e77e5902011bc783f1e7d2993a3d8dee693526c8af435764b1a86e383f861192dfac8d93da7c49b11e16b08485027470107597804c72a81f
 DIST oslo.versionedobjects-1.26.1.tar.gz 148214 BLAKE2B fa449b57db3ae4148fa431616b49b83d6a1424cc5f1845546fc945270bfa1b470f376a52edb0426f1fd86783cfe25906f476fab3417b3944c5f3074548704c77 SHA512 13962e9cfd5c63d9691bef0e1b31aa1751a506dc7a8aa3031612220778ba887d3122eea205456809bed9cec12c8fd5debfdce827d59ad8fc991ff85de7f841a1
 EBUILD oslo-versionedobjects-1.21.1.ebuild 1377 BLAKE2B bcb8d5fffbf2eb745ed2c4291153546a0d0328fd87e80482175e14defddb6bd951b8758b5ecbe08a27aff3f173939c53e055b1853c7ab5c13a6e8d105f44bb99 SHA512 bb959ddf306a4ee951b118d14959de291221b399dd2f1bfd3754be1db9cb805cb8d8a41280a3c654e499686b4215052a6949f1d3d8a6f0b7dd3a6efb0d00cefe
-EBUILD oslo-versionedobjects-1.26.0.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
-EBUILD oslo-versionedobjects-1.26.1.ebuild 1613 BLAKE2B a7a68d5ce1f68be1da166650d7cd0f8600dde81a087c4e21c5680d3a4f54e6ed787244f6d86be0d4fbf5c82b39522b7b6539555083381a57b6b15c0e08e03d60 SHA512 9998ac410a9dfe0d93c8fb61fe1c194cb5bf1d2e59303fd0bdc957b427cb23721c7378c430a8d59b22c6ff2b39650907eb5e1f24bb09c6c142430eec5d301177
+EBUILD oslo-versionedobjects-1.26.1.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild
deleted file mode 100644
index 589284cf89bd..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
index 6120b8f21bb6..589284cf89bd 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index bed65c373fdb..24261b329ad2 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
 DIST oslotest-2.4.0.tar.gz 26392 BLAKE2B b34d478f9d18cf6582544499555c6daae5cd47e47731b17c835833b7cbbb65c652602c6642c0c682b0690dde495f5014b454a3c9e0a56b2f69b278935ebadd7c SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886
-EBUILD oslotest-2.17.1.ebuild 1812 BLAKE2B 93311c5c47231e120c2818c3436ff22604166f1d874f4f9c3ce35053a0894a2400e80e3dc35e9e7befd57ffc0b31e995f8e515bcd90e86721084a52ec3c680ac SHA512 5f1919d1df7bb7a1ca2d175dac76aa2d5c3fdf6a6eed281dc688098c67027380398870157be6e524cb033c6ad983c68b043a22064fdd2d09689f4c886f06858f
+EBUILD oslotest-2.17.1.ebuild 1810 BLAKE2B 0596613272772ab853921abe8e261e998cd836515f1c19810b4ceaf48a03541b9ca7f9da0e5787e0a769f5eb3c961f064308853c991073dec6a28f3366e88840 SHA512 957fe51f09042979f9d65b867b71ba7579a0868b225a75a8490982bbb48ef0896634fd3d2cf18cbf46d4e93990919eff66d6c8fb97797d006161ba0cf9f9d656
 EBUILD oslotest-2.4.0.ebuild 1720 BLAKE2B 7d9c6693e8e416509829a3e670bddaf35437f3a7534e4dfd955a3bcb80ecc002154c92cf813f5a5c8a3b2794799de82fad7cfa950010016cafd6793f7d5b25d5 SHA512 aca409a3cfff3da8358de290b7bd119a2a13a9b0e4c142cefd8ecd29230dacf4e84fe70f196bd0e4e415f8e263b300210d56c0dae057b2ea68ff030549fe86f1
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-2.17.1.ebuild b/dev-python/oslotest/oslotest-2.17.1.ebuild
index c77840476418..ea3ef000dcb7 100644
--- a/dev-python/oslotest/oslotest-2.17.1.ebuild
+++ b/dev-python/oslotest/oslotest-2.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index b10830cc86d2..e4b3cea1b495 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -3,5 +3,5 @@ DIST PyGreSQL-4.2.zip 1377728 BLAKE2B bca6846881645e9ef9b29e2960b9db99b1029754a8
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 EBUILD pygresql-4.1.1-r2.ebuild 1592 BLAKE2B cf71efda28ab0c4cd24540307c5b68d8585cc06ce92b415b399d4a2ce4bc70d2a9a2a4293061e75a3c3e061b37ae0d56165010ae7b048bf2512de46981ab87f4 SHA512 c862f696772b9b8d6242fc98721d8b1e7e608f3a54ddc2bd4b34e24e782390cb1ac8e4060ab13ae025b9d8c229d4b9bb03cc2a6facb254ec49073477cbe32c2d
 EBUILD pygresql-4.2.ebuild 1599 BLAKE2B 67c802c464a6e5baa9df016950a4764a732d848df73f876457fb63ae09aa9e405badc033d318784cf678951428a9cde0ac54fc546e842ce08a4f79a7829b2c31 SHA512 c1e92d885ad8d6adf971c4b9926f3b2bcecbcbc6a2392bf5da15dc7562deae453ae9ffdc06e80af3267ec8a79caebb70dc3f5822c4bfcab3a455751c066260bf
-EBUILD pygresql-5.0.4.ebuild 686 BLAKE2B e8d047b85a65a254d39059fb876a1d7bc73fe4b35b6c6bf638838b77228d2052b2964b0f006cc5c240cb18da9cbbdf12262d678ac981676f444629fd6efa9296 SHA512 e9e5994ecf05ae7838d4ffea8c60ed213045d9173011793408fed1d0c37c1199352b9c3d12ac71c43ba8e68cfe6f34c16697f44ca1712fec033b56e8d8524959
+EBUILD pygresql-5.0.4.ebuild 721 BLAKE2B ebb2e7266c6a1e545bb737835c00a032dc10ed09f111982f59e0a33ee20a6d0e712a9270b5fec10f201b8ded2953e974754e7b062f1b662f0dd10142983b094e SHA512 1f59f02b6e4e3c14d31e77260dec585ac143a5adda21f598c95a7392285f158b84349154cb018b3ebd39ca0de90e68fa741e9c2ab1b1d9898db910ee4113f7bd
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
index e1d98174fea9..55f4eabc9023 100644
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.4.ebuild
@@ -16,9 +16,11 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc x86"
 IUSE=""
 
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
 DEPEND="${POSTGRES_DEP}"
 
 RDEPEND="${DEPEND}"
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
index 60409e8a67b7..25420ffde557 100644
--- a/dev-python/python-mistralclient/Manifest
+++ b/dev-python/python-mistralclient/Manifest
@@ -1,7 +1,5 @@
 DIST python-mistralclient-3.0.2.tar.gz 78255 BLAKE2B 58d9fda6ac9b87493008ebc809ae128b2e71443af854b7719928134f9802b0da7877eab79ad96b60e47f222815b4c4476ff93f43af557e79dc88c2f714e0eb3a SHA512 3f2bcdf7723e3acba9c34947fb26c2ad3814b89ee43a26d3779f4ac7ae0845c4129c98d1a5b6deca2e2dcf77aec128639af4e8e650863cc19b7c03864bae7ab4
-DIST python-mistralclient-3.1.3.tar.gz 78743 BLAKE2B f219028c563fe219c0715174cb53abb482732c74712eb7e89b129a001cd46e4e166bf557faf7a7c06036df9bf5d1804cedda334793e41cc1c66133a411051ac1 SHA512 d18c8ed486e83e91904a0bb0fe0cce21d4a603d383d309efa249f145cf89aff5b980828eb928d6cee92184e0444e49ac9e3aba0a3095ed9179c67cdbf82dd243
 DIST python-mistralclient-3.1.4.tar.gz 77670 BLAKE2B 37184cf32606affb1e08381c1a6f4d47a68d0dfc3abf4276110c7c667b12f8dc57f859f47561ff3368ccf36e684d63570dc1a82325f62a0d8e8e59366c7ba9e0 SHA512 dc9d79e79bf0f1829b218db43deb715ab000eb2dcf6d8cebfec912acac3b111d4dee9101aae7868d631a87fabe6014048709585e6817071c73ee95a8cd7f6baa
 EBUILD python-mistralclient-3.0.2.ebuild 1176 BLAKE2B cebc424d3ac9810ceb3ad4385692829e7f64b9919e2a2a85b805794c5d9b9d008aaec97714ad107ff7ab27c4460145056578a8e0afed9179db4c93cea87f5756 SHA512 eee25284ab2e9e244149e45ffe9b6f1d91f5e3f4098e687cbdfca2e15fe4cfeba4e152943b525a29a4b76e822f57f411fd35acccdc6d88f42234ef5b6536d3ad
-EBUILD python-mistralclient-3.1.3.ebuild 1203 BLAKE2B 9dad4d40f01ab134417386f34fa64ce911f6955f83b47bace58210077b863bebc31129b8f438346d4807e41daf2e77a256d9c9b262014261094d009aa6a80a78 SHA512 3e69628018dc33bc83d8fcf20715812ec8d96d6b4e78d6e13eb8c95dbc081ffa78df6f4e2969965807b7b97b4ca1f91b8ac911b6189bbd9d2033818b44356c86
-EBUILD python-mistralclient-3.1.4.ebuild 1205 BLAKE2B e2cf623468ffdc8f22c41bb644368b346e5c5b2a5499fe6884889cdd6e4434e3f778ee75cd71dd734ff59596eeb2bbb21082d090f456f613e7daa84566720215 SHA512 262ae2d7a96201121f40a5f945292ed8286c267f397ed061f5c2d11139671fa83803a4c94a85f0bafaa5562df7893547fc6231e5d181467c805a80d6749583d1
+EBUILD python-mistralclient-3.1.4.ebuild 1203 BLAKE2B 9dad4d40f01ab134417386f34fa64ce911f6955f83b47bace58210077b863bebc31129b8f438346d4807e41daf2e77a256d9c9b262014261094d009aa6a80a78 SHA512 3e69628018dc33bc83d8fcf20715812ec8d96d6b4e78d6e13eb8c95dbc081ffa78df6f4e2969965807b7b97b4ca1f91b8ac911b6189bbd9d2033818b44356c86
 MISC metadata.xml 635 BLAKE2B 7d074b84873590ac98f48bfde93536bca796bf1544ee050a900f0e6dcaf9fc4f48e47dae31201e530cefe1cf58343d4bd13a07c0cb4314b05636c732e2ae47c1 SHA512 f3e92e2bb38afdbfc7605c5244d6f60b0c72843617197e7bdb08031d69ca283b544b88af340ce75382bf2135150f9314eaffbf1b0e45c16a9434e15c89131622
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild
deleted file mode 100644
index 601d4f3fe550..000000000000
--- a/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Mistral API"
-HOMEPAGE="https://github.com/openstack/python-mistralclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
index c1efe1be05ad..601d4f3fe550 100644
--- a/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 04dae4145ca9..6bd13e2946e1 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-zunclient-0.4.0.tar.gz 81489 BLAKE2B 20d2a22ac8b8319d8701c2a7021de28040b8e26e8d23351099025978a734799483b326015083d26a59312215d29330e10a1258b73d29bbefbeffc9bc5debedb0 SHA512 f8ba7ac60fe81c7d1deb7e5f758a7d7554c9f3578a4f84b4d38ff6b6514e846c18d0f92ef494e5257cab8eef981aef540440dfaa0c28348a8adec18c8c6007c4
 DIST python-zunclient-0.4.1.tar.gz 81441 BLAKE2B 9a8f1b21b9906d1b3e0cecf9525a6d5e8eae05aa8999a191625aac2701dc6997f53f2320f214e8e62b6be6357cc00945792ae7baf19b4be85499c5b1099259a2 SHA512 4e32f569d460fb1ef9eb0faef278b0842907103e6a56a951caec04b3b1544b093261db303d7f62b429c3dbfff7a97b9349b709e7cf62fbff9ca90ca9bb098ca1
-EBUILD python-zunclient-0.4.0.ebuild 1127 BLAKE2B a40ff93241c3329188a9f350f246691a86c815d5739d00b27259ba6a83646106d4dbf0843d363c627bd3ca5b9127ca78cc340e0b5870f18881382874f729c44f SHA512 03c17c9925ead1cce714de10f3db6b73c0100a639695f638e158a27ca7c4fb1de65678a9bb2821eb924abba68b46aabcfb96d42c3622887d1e5e3fa4a3673b82
-EBUILD python-zunclient-0.4.1.ebuild 1068 BLAKE2B 0a88e830c7010575b20f07545e9cdc19d26657d05ce9824e60791fb2afaecb63eadb7bd094fde14da7910401cbe0a2234989a9b9e171380acd81ef465729ad0a SHA512 340a5a7d377e86ca8488268434bd78ce6b1ac661367eefe11b470c284c46a2031e732fca04fd5f73d1248830d88c1b49dae6bcdf5b747e2aefd4e734ff36f84e
+EBUILD python-zunclient-0.4.1.ebuild 1066 BLAKE2B 561e42f577c1df3a270186efbf05c060de2a93b47310e0723fdef011f18e71fa41c660f179221c9d4ad943c133f0188bb250509ec8ff668e8d456599e798ffcc SHA512 5b1d91bddf3c54b23bc7682bb47c2fe970f1fa9bfc4cf33085b205bed73518832f99dd4a9907d9d7bf6ca0b89d49a4949e656d7932b9625dff4118f504d30828
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild b/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild
deleted file mode 100644
index 6b3365583662..000000000000
--- a/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Zun API"
-HOMEPAGE="https://github.com/openstack/python-zunclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild b/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
index cf67595f79a1..e573b87df465 100644
--- a/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index fb28d781a488..6bdb4ff6a798 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 7e6bdacf1e3f..d55fb0e28f41 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,5 @@
 DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
 DIST rb-inotify-0.9.5.gem 14336 BLAKE2B ad43d1da83addc34128b324c2b190e30889ca3ae7cb04181c9cd67b716e1192e9b5e5fe648212e98f670cd953b700c3b5f704c989ac4ff38e6ceeb95f2521d51 SHA512 1ecc0142ed44358a2f51403736533e9854b5fc13cb81b552eb866310b60535b14e2ac6bfb6ee53bc1ee65ac14e51fc5a981e52f843607dbb3d8390c1d6c13e60
-EBUILD rb-inotify-0.9.10.ebuild 962 BLAKE2B 6d0c8909bfd2937695b098c5876133400806ea5914745ce03bfcd2a94267d8c4bab92aba53e4c3bef27ef69fac9746d22c54f1c3e63ec494d73e585e28bc9981 SHA512 8be69c10a76762e4f7a8f8f0c75604cb2e496ffdc7ae0bc0ccf3f94105e857b4b0ff65dc2219318fe08f00768b8557dacc697f5332ef48570f906c2fe66e57c8
+EBUILD rb-inotify-0.9.10.ebuild 968 BLAKE2B 6d9884650f63f4531471b169d7a8716daedf140f70779762945562514468d4c9d81f561b83e467275bb7f197cfd985d80ee581302c8f81526216a619d63369f6 SHA512 2641b4443d151e13b11aab553482da732a6fc301d123331b428fc94939a8f26493c19e1fe3016693ad2c367fa86d4bf35b68ed8e3abeb5e997f04353f586f66e
 EBUILD rb-inotify-0.9.5-r1.ebuild 959 BLAKE2B 7e55fe401ea8d9e73921a1b0505584a23e31e389eba47d378ccc19ee848a13290e6d4e52b4dc096f4b48ffc2fbf5e16e42c7c867b9655304873fddaa7e5b4e81 SHA512 411c85891d605fe40032af3cdefcdb18f223bcad0b609ae0bc450351b2620bf34b2e5db2f05ad102c656122fb7a9aa9039bd9e044a1faef0426fc0f59453e68f
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
index 4919714f0572..6e726129b110 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ffi"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1ed1d8cef37b..ed3dc933303d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index bfa04606a653..389d6ac7d696 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,11 +1,14 @@
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD bitcoin-tx-0.13.0.ebuild 528 BLAKE2B 60a0d9c8a7f9e3fb5d8133bbc3901d66c926462d17934c154be41526b055c63d81f375bf8cb0088eb5cbd647dbbbdfcdd6f8607d69fcfc23dfb0c61cdda6dcfd SHA512 42d7da959153cee964d123c71bf1e208efa2c659962e3aff3bf4a3870bdfdf60d7ead83f406cb34c2f0c000647c1bf253fddecd44a2367e66ad98af4505d1f0e
 EBUILD bitcoin-tx-0.13.1.ebuild 528 BLAKE2B 6bafef6268bc694a82b9876d4ea579e21bbdb22d468b914c96782256ecf9279c77ccfc94a0a8f61aa5ebe272126586023e908e2e0a2a790bc15e05ea17340a00 SHA512 023bcfe09bd579348696e3ff8633ec7632154fbb1e6e7f00cc95fb3dba78c010bffc94df563bada1a5261d409fcc1c373d60a078d4421db1d0c0974a07f1df98
 EBUILD bitcoin-tx-0.13.2.ebuild 530 BLAKE2B c888139f668f5ebc58b08e868d14d5678532d0bf099921625651a7bdf61028883717f14e457eeab996352e435485e8c67c4a8acf2666b4897b132b6b6f773906 SHA512 ce2ecc28c077fdd95022ac4783deea341a756cfc7061923ad3046cc620699b42407e57a350c4faa7b52c8818eea0bb2a9cb834920961987edf5e83123748344a
+EBUILD bitcoin-tx-0.15.1.ebuild 2469 BLAKE2B 7ad5eb31dac6a0d63e5f42d4a6dc87136f82dd586a90ce36df0e8320d01328a277f18a7cabae659594248ca679b8bd15809a0ca5a1214d1cf39b67be886624dd SHA512 d103ec9b73e80796e71c074c9b68dc602711fbd18c2f992c09c1efe23ebbf80c20bf730dc5d3cf6512b85e5fd0b06d29edde33c95b625dc3ab611531bd43e0ef
 EBUILD bitcoin-tx-9999.ebuild 369 BLAKE2B a9febe58f8b0dd30021c3c36fec19bd6c0e5a0281fd58fc9e879815a235dd416419eae0e9ae35ad2ccbea9c4fec635d7e7f32dfe7508ae255db9da41c0283b71 SHA512 d45dd15def027bb94ba98512b76be42317098f5ac76b704f8754ef757d7f72b7ba1b4612037d2efd6f1fcd37ab58a5008a5aca3ac87f1a764b180d0f193b10f8
-MISC metadata.xml 615 BLAKE2B 4db8ef430b47bad4dc20d6876c6356be3ed9cad2b528abf3351bfd6a5794147dd919dcd587a4dc1fd16b970f45e0faeac5edc2f2330d7090011fd557b6d133eb SHA512 040c29a3e1c5221656295920117d05b5d098c445b77efdd39a7e6c3877c663622b98eddbd485e0b6599281ca2a5939035328ffcb7ac1a2cd3d3d1e6324f6b638
+MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
new file mode 100644
index 000000000000..0fc227141642
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="knots libressl"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+	dev-libs/univalue
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-experimental-asm
+		--without-qtdbus
+		--without-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index 3747c3a5a6e9..6f3a3a4dd7b3 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index c696bc730922..a035f5e85e20 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -4,9 +4,11 @@ AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28
 AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
 DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
 DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
+DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
 EBUILD catalyst-2.0.18-r1.ebuild 3119 BLAKE2B 2c5c658caeea4d1f6fa8436273b9da86fdf9fe3cdfb1b94633c320c1a415c39ad52b98809ed5020ad0cc240e1f3ecb383a30ff9b139a6090f6fe8a15a1991bf7 SHA512 b7c088b0d52a1ff3805727379ece6ee9077e2e7359454d81f4d0dff0013322b50b9049d5d19ca0fd655e5bac2f5f1b74047d26d7a6fbec681a977557022c8b1d
 EBUILD catalyst-2.0.18-r4.ebuild 3287 BLAKE2B 36a68bce5a1bd41473ee67804d6d99223eb774b7ce89e88f6588cf2f57d70652f52727c512e4724bb2eeb958bf6e94c6f49121ff13204f9ee20c7a35fe63cb1b SHA512 6f091b4d783281c48daacd65dcdc88f791f76250760a9bffa33f8086a25ba5866c4e6b3ba14a8c610accb924019435c4b851aeb6383335d9ce58acf6000094f6
 EBUILD catalyst-2.0.9999.ebuild 2920 BLAKE2B 3d64ad52708a6107176d17824c0e0672aeeec1eee8a6070d1a75162861ca91b89db93fd920a07f3d1e5e11a176051653f2fc1108a54ac1f7093481f22723547c SHA512 8b034a56f52a4c10edc696689c480ed5737f59bd23f5f84ac7535a78d82bc488dacedc62b406a2895ef0b450c02027522dcac8dedcd4677cd6123ecd795172e5
 EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
-EBUILD catalyst-9999.ebuild 1709 BLAKE2B e4445e9c6ec61a689e194123046c151c452f1f9477974dadab2df407ac9b12cac79b38f57ad6cac4cced0ca1872b38f05e3f70a71e0dc72d45b6063b25fb05b6 SHA512 f6a2febd93f2be2a1d7e9a931fccdf3d0c11dce70c5b2015ce8bbcbea19cc2e3a58e044210bd653999b201d3d868dd644282d02e835c42f32683565b547373e0
+EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
+EBUILD catalyst-9999.ebuild 1752 BLAKE2B b4dce3d64505cf72d7d546be2107050e4840477a4ceb883cd3aa93ea2c6f5a3fc63470e6dfea172f15c5f37fcff30dc29d2e972314aba46c2890b6a73639904e SHA512 c6548d3b6cfa924e4ca5dab4fe9680d5a4562dcbe8cb1debeaf1088c1c9fd8bbc66c2cf7272a1fea1997fdc0d8f8ae833e3ed6c3b7b6b16a10eae17b61993271
 MISC metadata.xml 417 BLAKE2B 161ad5d6df19baf10cd3110f677c85aa0d4c08051fc3be98c28d3f02312a50460a1e71619c314921e23fa680506ab88375ea033ea945db78a82a5fed35c953dc SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8
diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
new file mode 100644
index 000000000000..2e0198f3ece7
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-2"
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
+	EGIT_BRANCH="master"
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 multilib ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc kernel_linux"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ef20b4711c2d..c5635f4c74e6 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,7 +13,7 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
@@ -36,8 +36,8 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	sys-fs/dosfstools
-	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	x86-fbsd? ( app-arch/libarchive[xattr] )
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
@@ -46,8 +46,9 @@ RDEPEND="
 "
 
 python_prepare_all() {
+	python_setup
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 375f6c0e01a4..34c16dca337e 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-5.1.2.tar.xz 678624 BLAKE2B c351adfaa6be6c6c7c6d01e13e4de04d16eb4a0184ce5657a0152d3365e4006cf8bc4d89a5ce91c77c9e31c06fd8ad2ed2fb6e5c13d965f58450508f869762a9 SHA512 c5c6fa288b048fb19597c8cd9708a2d8570c8eaab4584a1ec0808cbd65788ae15b140e8c0437a3a18c2561c078c26208597c674efb37623b5199260ed5b3f851
 DIST kdev-php-5.2.1.tar.xz 683244 BLAKE2B b0418049ac8eeda1a57c7e5a863c91feda3f84638a69d018f4d5141815ebe2f34b94fcc166632c6146c4110015e8c42069ce3c129fb8c346a36f123ae682babf SHA512 4f2a0f08ff8f341d5b65c28d7392e794a20182d5f898a6723c6a9cd34bf1ce81ed2f8e505cad5a920a6d2a2c50210b0836b7718a892b61a27e8cf6c4d7f30f52
 EBUILD kdevelop-php-5.1.2.ebuild 1143 BLAKE2B 46b646ab5e0c34d42076473b89b52c100ca133e02fd91c8049d46f1365d419f952faffe5ca7f7587a3b0e677866a781ad57f0832c3e2e800acf17774b3d425b2 SHA512 8903207ea6055a10cf174d7c45873107c02decbf149457874030b34aa3451118cac3c1423761e9deb22f483949e6a22a5b42faa4034cf69b90fb1954ce76836d
-EBUILD kdevelop-php-5.2.1.ebuild 1064 BLAKE2B 5bd99788e66c4fa05291f95836237301f74874417e8593a21d52725661eb7b414773a4f461f898f56740fb64f8242823a6e0a7d29c7bc5b4c6de02465355c329 SHA512 d70b4dd90c7636f5cf59054318d21b3180c95649f1da16dbe9f95542cbbaf22152b44ffc7fe72bc71cec39b6adcce75fb741a10c3d3d28745217fff20f0119a8
+EBUILD kdevelop-php-5.2.1.ebuild 1063 BLAKE2B f5fc329a73b209f788199dfac8b536ba6b9c2817b01fd291e619ad33f024ba0c5e589c1ea756082f6c48675dfcf49a033de882c15a74c7f2af692e998097e9c9 SHA512 d11317bc8762386c4378c03920fb00e415f645659b88ec8c00c4fd9de911d289d7bbe7b8f52af89006d6b1173ea758e9c4d31c29a62dc3f2b84983556492d024
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
index 8b45c88c5835..03ab96b2efcd 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
@@ -15,7 +15,7 @@ inherit kde5
 DESCRIPTION="PHP plugin for KDevelop"
 LICENSE="GPL-2 LGPL-2"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index bf747d19b3c4..2e96684c04c6 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-5.1.2.tar.xz 1069080 BLAKE2B 7727deeab491ba9e6dacbe29caa040cbacfbe07ef4a8060138e158e6317709fabeebc00d0bd45005f4bbefa768c238bd9c3f6235fe10dfd2f3d394de21c0b947 SHA512 1c91554bce3a1bb92b247a8b924e5b73865b68c8b6c2898d708d3b45f89f1ca9cb4207bd2f1a6f71e7df95781cd5d0ddaa610fa5c18e8f4e902306df5c38591a
 DIST kdev-python-5.2.1.tar.xz 1070708 BLAKE2B c1381e2a692446ac544e5e837236d90d5250c5b854f982374ff3c195d6d42d6534f6f81b118e872fbe4bea3f15e81b5396f3b581d6a64bf224e1a5ec631b9a89 SHA512 e65317a7da59cfaa5c14f0c10f965b1d7167e1e4e1b553f4c5f2ad9bce6d0ddbd93267cd9707a81a63117016fbc4dff77bca4ff2b2680ae585eb0f7354f3cf23
 EBUILD kdevelop-python-5.1.2.ebuild 1193 BLAKE2B 15ffd94275c1def1c4d5f4515fd29b24842bdb3f9b9a684a2b43ab247e275a89cf4934733d1a15fd3abd99b2eddc7bdac632051e37a8655de620710d22766ef6 SHA512 6e09543bcefb858af40fa21e193393da6b00c03ffb3d621bde29721b1312b90694ed603da1929ff60ac153da613db6791d549dc844a87b3d714a6efbda4be642
-EBUILD kdevelop-python-5.2.1.ebuild 1170 BLAKE2B ab48282d464679d3430110d70f3fcd8892a54a40c6a363303b6d23b1fab1b811095ed3c4233452f57a4aae051764fce9adac1cbf1ef0fae56b47d577adf250a9 SHA512 817a237af618c8c68e1d125cf8ef69b0de19e6ef4b8da7c18530fe557b88b5754d83ba07a6cde22ea4de3c103ea1202ca68061500faf0981eaf32671ad8dd7a2
+EBUILD kdevelop-python-5.2.1.ebuild 1169 BLAKE2B bf08fef47017f600eddc7b7d9395dc7d67ae32cbcb8efc023296fff48e95a5f79c3e6da8e29f978818cf563fb0a908e815ccee1b57a8ab21aa968a1a7c1da2c7 SHA512 027edc8bcda48430313a8fbb1d50f6a3d49e9fdba9c8a5fe06acb26fe090fbbc56917304eae54c3598775d042288d207914e056bcfd810595f5fc589dcc6af96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
index d2599b41ee23..e59c88de6739 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.1.ebuild
@@ -12,7 +12,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Python plugin for KDevelop"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 165fc72f23ff..7a3e10f400ee 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-5.1.2.tar.xz 4688696 BLAKE2B 6ad2fa04bbeba54b92cfc3be48d21ad6bd22158b588e0342a5a00d7f3122f9261e40103fdfa622ba29114e86f6b36d335ffacf56de14ec430ff6a7eb23590bd5 SHA512 3f359587c7dca3ad4d0db4940cc9557bb61647672432f21c21d6f493e5e5c96e026c7dc155b66a7be4d20b06972fe961d8a3dda28e8aa273d0a4044a6242e39b
 DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
 EBUILD kdevelop-5.1.2.ebuild 2568 BLAKE2B 1b8c0c5dbb25f022cd088301419a65f99a8502e3b09551f8e7b6f896f4d662eadb562e8f9f9d1be43ee078c2d43d7aff5821fa3435cee5c8c83f2bd26f90a9db SHA512 57ca3389455999bab6baa88e35b8f54af7f49a529311ea44b39b20985de16763c29d1366e4933b432fc810673c359888ba30f1a8d8486bac43b787050f5e0d2f
-EBUILD kdevelop-5.2.1.ebuild 3811 BLAKE2B 6719332daba66380ab746e440a37d819109fc13fcb3ca95d4130c4ff4743b2e08d8dfd0ac07c767e57feb5392aabe4467fd54061fc6dc12c14b25482282ec2a2 SHA512 3d592f4d8e0842a8ad6c30d41c02f6e58a2a579613c815420d70b3903ceb4086ffd8cc160b2f0270926af89b1dc0a4f5c619c14f5934e3f2e1fa4089f5c09869
+EBUILD kdevelop-5.2.1.ebuild 3810 BLAKE2B 45866728f5fb3517ad6fe62a41eeb91554d4f55364a429aeede14193dd3f7ee2c46fc3e8b325fb37d6c2bb1eb5728884d12719793e74816e01af3819cc23a7be SHA512 4339ffe88ed704ccd9445abd3ab3b8f6c2119b8b9d11e6791c3e929fcf26e36dc7d2657869ec291580767a826c1d890dae5100a728c9cbff2428f9460f3add89
 MISC metadata.xml 794 BLAKE2B 765d868d9ca5ac71ee71a7c22d85beb02951dd7a601c2d52da87b1d49686494e8ce17c9e7e0f5f2767e0cb02625d74bcc6a95cfe3ae6793298150fcb651fcae4 SHA512 4d96ffa2a718e987a2d61531fe4a194c3fca3e863ab9cf8ac59d3b187a526c841066936f0a92591475672c6c22b57bd04a798908932f839644025b615ce8b417
diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
index c75aebfa2df8..cf401932b697 100644
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
@@ -13,7 +13,7 @@ inherit kde5
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
 IUSE="cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 x86"
 
 REQUIRED_USE="test? ( welcomepage )"
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c134b09c50b4..434e2d5d2841 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 8563936f73f2..a0ff8fd20925 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -13,20 +13,20 @@ AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.13.6.tar.xz 4756820 BLAKE2B 5fdb7aae5ceb1e1d0bd9be2541e8d39f28503ebeda5ef30eee306348afb290171cba7f8d6e0002775288bfba699ca12e388a4007008509d91a9ac92e90fb5d5c SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada
 DIST git-2.14.3.tar.xz 4802252 BLAKE2B 9b5a13e337ba1f4609875897a3ee92dd5a433fa5e7f8bbac1436dcd8275514378fe99dd8cfcf6212e27825e43f000100850ad6f3a0b3fd53bbf9ee820a3973d8 SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
-DIST git-2.15.0.tar.xz 4892056 BLAKE2B 89a035e143f2146d9cb6be3c7468fc8815c1cbd94cd3755be0dc4b34666c3f2b5013a542eaa9b1d420fc54b74533893b018b1f9b5859c4287a05008834ef40c9 SHA512 994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64
 DIST git-2.15.1.tar.xz 4894768 BLAKE2B 89258e58ff06b50759364c79bebc9a70a267eca7bd25c1feb73ca49cb2b9cf5f6b890729aee4c9bda9025cbacfd8ed29d1a251ee0add9cd84c277e2bb29dbad5 SHA512 dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
+DIST git-2.16.0.rc0.tar.xz 4943744 BLAKE2B 73e8734255bb5661fffbfffe9f59ed0cba11e47e69e47b909c064c66ef969b45acc4d8e9022218c638a94340a15dac9d15a2321619c99b6d8b88f8ced3a57b38 SHA512 288e666e7a0e33d3e23d02ddb54b20201a5bb95db6ff9216011b415a26cc07e8512d6cf6132fa054cc1a10fe9be09c1767bdc8ded77c8d0aabb6d65376f16600
 DIST git-htmldocs-2.13.6.tar.xz 1110668 BLAKE2B 7cfbd453c72c3e300244f9a8c4d13efd60d22219dee48f6a06e6f23fb3a0bd5bc66e624829d685b3ae8b47b81bba39e605f0dd6fd3459364c83b2d922be94a64 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
 DIST git-htmldocs-2.14.3.tar.xz 1116824 BLAKE2B ca7068a4983e2f7c3694222f6a932d8db132b0a20a50a10415f58a77100a95d8e0fd2e8cf980ece8ef55be0f0ca652cc1a75af62a22b9d60ff19ad4801383416 SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4
-DIST git-htmldocs-2.15.0.tar.xz 1132908 BLAKE2B d90109c71b99e063c3494be44a35b19d4b445dccf7122563c38ee211bfd73b63b4c747048150ee89d3b92eb10b55e3856515a28280153bdcff640673b30a2a09 SHA512 a3ed8dd5ba7a35eb89b375a04bea2aee8ad08744ba4e0016842595491fd9ed95cebc969108865f4075271301fecc75e89393f83ac384abf8b74a0b3acee3b67e
 DIST git-htmldocs-2.15.1.tar.xz 1134848 BLAKE2B 1efb6d4ca16779c39be69fed57fccb023ddac6bb9c9727ebd7050eb40035c1d56dbce0191224e8d3370d433d8e1cf210df9bc9bde2effb6fbb2d62bfd5e9e440 SHA512 50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34
+DIST git-htmldocs-2.16.0.rc0.tar.xz 1159520 BLAKE2B 1df3751d59c5b1700d71e3b70007dbbbc10dcd061c8eb6a2d26dccfc9dd763c3754c342f962852664140e2d0014fe31c4eb76ceddf0613804ef68ed9c58c5230 SHA512 0d0c07511f806db097cf879c894798e5a4f2580615152f5c3b96c39a2c3cc33b10836dad73b7cc46d8eaecdf65393630ae0cf07abe5e8e8a0df894ceb9a3b16b
 DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe10021e354374e37de6ca5eee6e60e1c7ef3b2dafb086c6b8d88f35216204269945cf45fcd6868f9940d2f00b72a87bad8e2 SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
 DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f5902bf869e746333c0598f8c494efb56c65c4a9d5d9eeb54a9a38a6b07776abddc4267b73c2ff020cedf65248ac89afca6 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
-DIST git-manpages-2.15.0.tar.xz 412688 BLAKE2B 10b92b6fcc560a4a655124fde2591e496d6bf9d056058bb4729e03bf4d4c20caabd5eef73fab1adb8913070172b79adc9e4868649f3dd679099918e689597f45 SHA512 4101d11c0cc2bd91fa496f11546ec439bc136cb40c7146d53532ab4c525b299741be64a5c4061ff0d5ae5c049d798c7662c7f1500d856f78e8ed653d2ce28aa5
 DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
+DIST git-manpages-2.16.0.rc0.tar.xz 416944 BLAKE2B f146f52700c46e1c9a340b8eed28ab6b7d6766f45c3b6099ada40ffba419b73fa7679de3cd280e261310ad6dfd6fe3e194faebb930cc514a15037bcd13756803 SHA512 a4170962c7f7433893aa771e7b1f1d03aea3796529f87be579b26bac4483ada4750a548b9a60553ef9cda349045a2268567cc950816f4f0cb3f36c90b09339da
 EBUILD git-2.13.6.ebuild 19016 BLAKE2B 2ce31b1ec5d0347045270fe767e2a665b7e0dfa3af355c526eb4544aa73891d27ec58e56a877a4ad2a4ca84ed798d0dc19e6fddac3e3e6fb9c6c89e6bed9a7b5 SHA512 4741a465efa6fbdc86775abc4088a9512971658988154a5da2f410e1e243b6f6a1e7c5bece23582f3a47e1ddd587685ebfc32c7b00c8ff325d2e92996e4d840d
 EBUILD git-2.14.3.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
-EBUILD git-2.15.0.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-2.15.1.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
+EBUILD git-2.16.0_rc0.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-9999-r1.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-9999-r2.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
 EBUILD git-9999-r3.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
diff --git a/dev-vcs/git/git-2.15.0.ebuild b/dev-vcs/git/git-2.16.0_rc0.ebuild
index d079a65a75eb..d079a65a75eb 100644
--- a/dev-vcs/git/git-2.15.0.ebuild
+++ b/dev-vcs/git/git-2.16.0_rc0.ebuild
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 7a1a5c7ee960..b2bcd1fc333a 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,6 +1,8 @@
 DIST tortoisehg-4.3.1.tar.gz 7930491 BLAKE2B 9f47504961fb97e2acbec272cea959fef00f5aa120d1ef902af3839beb11813ea93ad8f6e497ba610b65c73596dcf80eb1728a24727cd029d2774187824ae7ca SHA512 dc43f2acd780a7868b642d6ce8a8dbf8f32be94134ddbb72178d7f1eab1e9f58c8e9bcfc75ad589ec9404cabefd9ccfc697af9ccd037c20bd933ee862e812f99
 DIST tortoisehg-4.4.1.tar.gz 7923557 BLAKE2B b2574bb87693a3fb824c3c02424b8f5828c1e3673b111ae82ff0692588083eec639a67b200ce6e3def58e5a0e021898c3df62a053fa61d477f92d4226d3a1b69 SHA512 b364e6d16845c03aacaf691e8528e0bd87151026f9f55bcaf61ba67d1eebfc3f9935457e5ca3391e29417682367b9b33803a9870817c22db31f1dd26850e9d53
+DIST tortoisehg-4.4.2.tar.gz 8939270 BLAKE2B 858ef57f6e80244ebb99b43608b1d939896f60d2154e461a128efdb0d5ebffbf1b8d5a9a40596316b0bed8edd74e292b5e562e3119f75177d430c081ba07511c SHA512 6b0335d8022d015846d456d351b168f826afa5223b77ee45f2124fbd1099904cca4e2a3ca6cb7a48324491211a149bd431d29fab6932e8f8240542e13d814381
 EBUILD tortoisehg-4.3.1.ebuild 1954 BLAKE2B cfc09db06a657561ea4be0554d5ccefc8b0e9bf743fcc0aac48234a18cea202d3eef204571765f61c0fa39b3645662cf7ab1bcdbd62724f3d2de880bbb7a975e SHA512 5032e7aee5f381edda81e4641bfb37c9a936a1761fc266f2a68d7eb6041076c0c5b5cc007ad60d0836eeb03c23af85870e9b50d4c192eac3f84dce6b6e47c6d2
 EBUILD tortoisehg-4.4.1-r1.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
+EBUILD tortoisehg-4.4.2.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
 EBUILD tortoisehg-9999.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.4.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.4.2.ebuild
new file mode 100644
index 000000000000..441fed1aec6e
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.4.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.3 <dev-vcs/mercurial-4.5"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${LINGUAS+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${LINGUAS}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d98c528f47d9..65fed791d8d5 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/php-ext-pecl-r2.eclass b/eclass/php-ext-pecl-r2.eclass
deleted file mode 100644
index 5fd3658e0f63..000000000000
--- a/eclass/php-ext-pecl-r2.eclass
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: php-ext-pecl-r2.eclass
-# @MAINTAINER:
-# Gentoo PHP team <php-bugs@gentoo.org>
-# @AUTHOR:
-# Author: Tal Peer <coredumb@gentoo.org>
-# Author: Luca Longinotti <chtekk@gentoo.org>
-# Author: Jakub Moc <jakub@gentoo.org>
-# @BLURB: A uniform way of installing PECL extensions
-# @DESCRIPTION:
-# This eclass should be used by all dev-php[45]/pecl-* ebuilds
-# as a uniform way of installing PECL extensions.
-# For more information about PECL, see http://pecl.php.net/
-
-# @ECLASS-VARIABLE: PHP_EXT_PECL_PKG
-# @DESCRIPTION:
-# Set in ebuild before inheriting this eclass if the tarball name
-# differs from ${PN/pecl-/} so that SRC_URI and HOMEPAGE gets set
-# correctly by the eclass.
-#
-# Setting this variable manually also affects PHP_EXT_NAME and ${S}
-# unless you override those in ebuild. Also see PHP_EXT_PECL_FILENAME
-# if this is not desired for whatever reason.
-
-# @ECLASS-VARIABLE: PHP_EXT_PECL_FILENAME
-# @DESCRIPTION:
-# Set in ebuild before inheriting this eclass if the tarball name
-# differs from ${PN/pecl-/} so that SRC_URI gets set correctly by
-# the eclass.
-#
-# Unlike PHP_EXT_PECL_PKG, setting this variable does not affect
-# HOMEPAGE, PHP_EXT_NAME or ${S}.
-
-die "Please upgrade to php-ext-pecl-r3 (see https://wiki.gentoo.org/wiki/Project:PHP/Php-ext-source-r3_migration_guide).  This eclass is due to be removed."
-
-[[ -z "${PHP_EXT_PECL_PKG}" ]] && PHP_EXT_PECL_PKG="${PN/pecl-/}"
-
-
-[[ -z ${MY_PV} ]] && MY_PV=${PV}
-
-PECL_PKG="${PHP_EXT_PECL_PKG}"
-MY_PV="${MY_PV/_/}"
-PECL_PKG_V="${PECL_PKG}-${MY_PV}"
-
-[[ -z "${PHP_EXT_NAME}" ]] && PHP_EXT_NAME="${PECL_PKG}"
-
-S="${WORKDIR}/${PECL_PKG_V}"
-
-inherit php-ext-source-r2
-
-EXPORT_FUNCTIONS src_compile src_install src_test
-
-if [[ -n "${PHP_EXT_PECL_FILENAME}" ]] ; then
-	FILENAME="${PHP_EXT_PECL_FILENAME}-${MY_PV}.tgz"
-else
-	FILENAME="${PECL_PKG_V}.tgz"
-fi
-
-SRC_URI="http://pecl.php.net/get/${FILENAME}"
-HOMEPAGE="http://pecl.php.net/${PECL_PKG}"
-
-# @FUNCTION: php-ext-pecl-r2_src_compile
-# @DESCRIPTION:
-# Takes care of standard compile for PECL packages.
-php-ext-pecl-r2_src_compile() {
-	php-ext-source-r2_src_compile
-}
-
-# @FUNCTION: php-ext-pecl-r2_src_install
-# @DESCRIPTION:
-# Takes care of standard install for PECL packages.
-# You can also simply add examples to IUSE to automagically install
-# examples supplied with the package.
-
-# @VARIABLE: DOCS
-# @DESCRIPTION:
-# Set in ebuild if you wish to install additional, package-specific documentation.
-php-ext-pecl-r2_src_install() {
-	php-ext-source-r2_src_install
-
-	for doc in ${DOCS} "${WORKDIR}"/package.xml CREDITS ; do
-		[[ -s ${doc} ]] && dodoc ${doc}
-	done
-
-	if has examples ${IUSE} && use examples ; then
-		insinto /usr/share/doc/${CATEGORY}/${PF}/examples
-		doins -r examples/*
-	fi
-}
-
-
-# @FUNCTION: php-ext-pecl-r2_src_test
-# @DESCRIPTION:
-# Takes care of running any tests delivered with the PECL package.
-# Standard phpize generates a run-tests.php file that is executed in make test
-# We only need to force it to non-interactive mode
-php-ext-pecl-r2_src_test() {
-	for slot in `php_get_slots`; do
-		php_init_slot_env ${slot}
-		NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
-	done
-}
diff --git a/eclass/vmware-bundle.eclass b/eclass/vmware-bundle.eclass
index 6f72028c2fef..0e035ddff072 100644
--- a/eclass/vmware-bundle.eclass
+++ b/eclass/vmware-bundle.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: vmware-bundle.eclass
 # @MAINTAINER:
 # vmware@gentoo.org
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 8f57648e7654..89f3f9fe077b 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 1f2686a00ad6..a704f3f7b86e 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,5 +1,4 @@
 AUX ppsspp-1.4-O2.patch 1576 BLAKE2B 5831befac76d1a674c0bf453043c1ac36435c76f04ec5bd95885582c9f44c283232a9dbbea629433629d9fbfd5cc1415f5e0f47c50dbbdb9e834891280e98a49 SHA512 39f18c074e56aa823b223a78b099771257b4a5672a41c6d271cee5b817a2a63d17f57ad9f936da41185dae5b4bf2a94cc62cf92596d94b6e0660f1b05bf9ac2f
-AUX ppsspp-1.4-assets-lookup.patch 525 BLAKE2B 266cc50f6a50544304d62df8f1923c00300deabeb9e70c4d588c56f102e1fea7dbe2059fb2643593e418bea0a71e5cb82169a0a790c17784eee6eeba70ba5e61 SHA512 48153b37c99a082a5bb4ccc233df64de1e981d3d3474bfb43ad191205bcc93318bc1f0bac55f2f318627accbc9fced7666f36a5009ce5f189b3ef79a6a316519
 AUX ppsspp-1.4.2-assets-lookup.patch 525 BLAKE2B e0614d010e1708cfdfeba376ece25c6bb121e79dae7243988706a80d6ef022ba52286878c9e7c868bbe23aca6c5182ca1e0c6b5baaa6e4b32e2c79eb4febd10f SHA512 9963aad44ce72e9625cdf816bf58743ab8936d8f1fd3c75ac9ddbda5e179cd71fa4d23321c42ba4d56bd472cc016a62430a0c6d8b84792e2851977a5155cbdb1
 DIST ppsspp-1.4.2-assets_lang.tar.gz 273563 BLAKE2B 54ab5cabe00ec8bd24fef62bc17894e8c663141283207eaa8ec79313d4d6131c3bb32f1d07f7e191592e973831e3852eff96d9e682d294d2cdf5967f95e0cae3 SHA512 b252e3335c84bedd24764caab15909f31dd8de60578b2c32ceab200a53de5689d8e82e1853c921d8835b780cefda10ea2ebe5e98e2afb4ba44204cc2b5209a5a
 DIST ppsspp-1.4.2-dx9sdk.tar.gz 14582591 BLAKE2B 12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch b/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch
deleted file mode 100644
index 6f75d5ec31c6..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
-index 8452d4d61d5f..3d5a4bbd2aa4 100644
---- a/UI/NativeApp.cpp
-+++ b/UI/NativeApp.cpp
-@@ -316,7 +316,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
- 
- 	// We want this to be FIRST.
- #ifdef USING_QT_UI
--	VFSRegister("", new AssetsAssetReader());
-+	VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));
- #elif defined(IOS)
- 	// Packed assets are included in app
- 	VFSRegister("", new DirectoryAssetReader(external_dir));
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 2f528b75bd1b..10ff55ad63e1 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -2,6 +2,6 @@ AUX vbam-2.0.0_beta2-fix-install-path-bin.patch 475 BLAKE2B a08a94cf0db76d7e70e8
 AUX vbam-2.0.0_beta2-fix-zlib-macros.patch 238 BLAKE2B 777accae17b4ad82b62c23ce1683bafb7b8a7ed72914a1cc539e55a3092791b309e02bf79b8ab0d9e9172c7288162e902ec3e73d025d9f5995eca40395375eaf SHA512 ea591ea9d3a5a766a4f5345b54af2e8d8406e2854d2769449568d1355af333d11d95fbc8351202d7673adad89e31b4427a10a39f2361d679d8fbf3e88ffbb29c
 AUX vbam-2.0.0_beta2-remove-hardcoded-flags.patch 6368 BLAKE2B 491238ca2c2e45c73a4a2fef951df289274ffbf06e8bd0fb33c9650c3c3a550581a6acd0d8662b0aa6770b93c9d4d04a070c55408b0ea4ee96cc239ce958bd67 SHA512 b51c54e543b3a3fe0d3a66e1219aeefcc1ee58eac65a9df12a4a5a7ef14c702d47b3cdfeb8d7903444afe12d531a5b2ed77bd36ab2277960ef8af6faea2a40d4
 DIST vbam-2.0.0_beta2_p20161211.tar.gz 3075570 BLAKE2B 69b1272f5e048fe96a7a6798a3f934395a607439ba3ede992f8d49557a4ea8ea64ed512f11440200548eb039d3b1f4b4129603e5a897f3e04fac48d4d39906f1 SHA512 1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40
-EBUILD vbam-2.0.0_beta2_p20161211-r1.ebuild 2546 BLAKE2B 19928a2e85be3c7d8feef8058504a04e947b38d8bb7a00c445ad95c12d217bdbc0b9b05080f072c7ba79aa15b88a6ab49a23d6ff3add4c42b538d52036312b32 SHA512 94568b78f291d1673406568b918b602be90af8be613b821f7384acfeadc31780061e9a325e8863e8c617190cac899cc884116007cee0908bdb88fa8b7faa80ae
-EBUILD vbam-9999.ebuild 2422 BLAKE2B 9362b08b9f23fed9bb2fa585ec5b0ce338658e5a42038696189a116c86151d9661d59555d6a462cba048d36d128894ba1a95ed72a9a74acf73e91f51fe464feb SHA512 c54d321cb6192e3d763ea94d18062b13a55415e94a81715deb05b17fa0fe3928969606534870138800ba0ee20993fb0fadae5bd2f762dddc5d65997e2bb6863b
+EBUILD vbam-2.0.0_beta2_p20161211-r1.ebuild 2580 BLAKE2B e2e69c1c1906088b1eff9bed1a9ff8a26082ed4cf8e90188cbb11a3f2e64fd79de7aa2ad87a3d1cdb9f04965adc0d74e075f1bfb33807dce091a0d5aeb00ec16 SHA512 feb01ee124b29500b73e44da4b319572fe8a6ac7fe1f2e66bb072007bf786a2b0d7f9b2a447817ef665d95ce68219020ed7538400c741485dcc8c167db7e5cd8
+EBUILD vbam-9999.ebuild 2456 BLAKE2B 10684733cb5dad8d9391d3e6e86afc76a788500d551ac8e2089f1676a6103ca2d089df71c151e6d7900511c8f2a75dbf72ca5f65a1bafaa140f4d60d580f4d8e SHA512 75b2f006494b40c56c500f7298eab9cbfe7840a8bd2045ceff92e1846273ab4c3a547b776f2e4bfd0e12d056bb6d4600e5c6854609d66a3307c346c2b369d61c
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
index 055ea0f7ff43..21315294a29e 100644
--- a/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_beta2_p20161211-r1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 )
 
 src_configure() {
+	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
 		-DENABLE_CAIRO=$(usex cairo)
 		-DENABLE_FFMPEG=$(usex ffmpeg)
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 5fe89033daf4..0af06c4e2c8c 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -52,6 +52,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
 		-DENABLE_CAIRO=$(usex cairo)
 		-DENABLE_FFMPEG=$(usex ffmpeg)
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 714ef97a5d1b..e88b693eaf0c 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index e4315fb2426c..f3ceb5ba3574 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -3,5 +3,8 @@ AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
 DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B 7157f8ed5f8798a533d992811c804515acc8abb3bb84b25af6905fd6b2338e95879e318bec0dade18f1eba1421d17a781d1da8b49c719988d2cb6d7046b0c3be SHA512 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
 DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B 4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d SHA512 d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
+DIST df_44_03_linux.tar.bz2 11945628 BLAKE2B dd4fd2ce847a0214fc0ce49c84775a64c112354eb7cede8b4cc45390bd9c9f590f1295b0242009ed38284851494e50a6487414b5cecb5d84cf824f2a9f16dca4 SHA512 7f1ed0407414b6716b5a172a5b9cfc002462b68a86e7a3ad3774728922d1439b78a04bdd3b0a17d996c3777ef6e0b4274da83a417572b22813e1c93d3cd2ddde
+DIST df_44_03_linux32.tar.bz2 12548954 BLAKE2B 8191806b3695562b4f6716fb2e090fd21a6d0cb9dedf1e812a9c18a7ca663112bf291f616c25fd53a92d14f1fdc586520b9c7a3493440bb3ec9f7c1c06e2cdcf SHA512 67312d2b29697d215f02f21ef3c08e9b012c24e43b17743a67610a47288e69a3eb9fe6a5ec56c9882c05412f889aed4de7bc3f2f98635d94ee805ba2328778cf
 EBUILD dwarf-fortress-0.43.05.ebuild 2320 BLAKE2B 6cd9da51415216f6c86f2e4d3bf08cb543f89873263b956a7b8f1c1548d2af4f4d943ca8997daeda859ed6fb2317da03253fa73cfa17a0057aa0c814915d87c0 SHA512 81a4f5c4fe27f5f53344b2d3b889930863ae221b1cd7342be05f75e9b04fb956fcd05251cf21288898d37675b5b35821f69cda0721aaa601755cda7ae629d3ce
+EBUILD dwarf-fortress-0.44.03.ebuild 2320 BLAKE2B 6cd9da51415216f6c86f2e4d3bf08cb543f89873263b956a7b8f1c1548d2af4f4d943ca8997daeda859ed6fb2317da03253fa73cfa17a0057aa0c814915d87c0 SHA512 81a4f5c4fe27f5f53344b2d3b889930863ae221b1cd7342be05f75e9b04fb956fcd05251cf21288898d37675b5b35821f69cda0721aaa601755cda7ae629d3ce
 MISC metadata.xml 583 BLAKE2B c146d313f3f7192527b5ae2bd81a12db0c4587b3cd479bc68fc15a44a7a77dd1d45558ed632e4e979d9ff018e74860dbfae88ab6f3f45eb88448f9cf66890090 SHA512 084c03470208f5439a6831d3340d1f8a37c46f4f00fc0c3f00a834ae2faee9ee2e8dcb711943b095cae602c15eda1f45517d28f9416d65b55de63206094213f4
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.03.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.03.ebuild
new file mode 100644
index 000000000000..6352e7dba598
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.03.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
+MY_PN=df
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="A single-player fantasy game"
+HOMEPAGE="http://www.bay12games.com/dwarves"
+SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
+	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
+
+LICENSE="free-noncomm BSD BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE="debug"
+
+RDEPEND="media-libs/glew:0
+	media-libs/libsdl[joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/gtk+:2"
+# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
+# dlopens them at runtime if requested.
+DEPEND="${RDEPEND}
+	media-libs/libsndfile
+	media-libs/openal
+	sys-libs/ncurses:5[unicode]
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}_linux
+
+gamesdir="/opt/${PN}"
+QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
+RESTRICT="strip"
+
+src_prepare() {
+	rm -f libs/*.so* || die
+	sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
+	default
+}
+
+src_configure() {
+	tc-export CXX PKG_CONFIG
+	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
+}
+
+src_compile() {
+	emake -f "${FILESDIR}/Makefile.native"
+	sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
+}
+
+src_install() {
+	# install data-files and libs
+	insinto "${gamesdir}"
+	doins -r raw data libs
+
+	# install our wrapper
+	dobin dwarf-fortress
+
+	# install docs
+	dodoc README.linux *.txt
+
+	fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
+}
+
+pkg_postinst() {
+	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
+	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
+	elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
+	elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
+	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
+	elog
+	elog "Optional runtime dependencies:"
+	elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
+	elog "Install media-libs/openal and media-libs/libsndfile for audio output"
+	elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings"
+}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index b37cf290833d..0e949aecd5b4 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index bc781a81f901..43e41b9e7e77 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,7 +1,7 @@
 AUX networkmanager-qt-add_EAP-PWD.patch 3077 BLAKE2B 5725f8f6b4a2580e50c236b366513e4adf99f46725742ba4716e73f0218457bc29651f2a7ad6c601a881b0582e90fbd754c766c66afb763f404f1e677d9e23f3 SHA512 fe483c7b53a98965e37e1e424dff2582b386aaaa420e95dddfef9619cf7297127714d079b5f4035936c22d7a0b3a0445fd1aada9706b7351e70760a0631c1303
 DIST networkmanager-qt-5.40.0.tar.xz 163456 BLAKE2B c8d0e85f06219ba5d89817c86cd97c493146b5a184f363b5367c93d138d52cb2c4901536afd9950a0c9cb54b1cd4ee9356f614d4573ddc6158da5cff873f99c7 SHA512 6c04dd10c85573fa33d1651aa17afd1f987cade3ec299b1f73c3f6052aaf65aa393aca97e0a22f6434e325e99a9c72c7c6398946c1573be3df57c08905460bac
 DIST networkmanager-qt-5.41.0.tar.xz 163516 BLAKE2B b07c191e25a70150ed436670bbcb964b1bc59c47deccfe0602e660e58bda3672a94901c82a8339252b10e0231ad0f9f0ff2b4910ff75f2a1148b651d86a7edd6 SHA512 7dcee7ca4025c9104ab9e1c583fcf0f1adc44c714817e730f35b0acca1ccb7ac059c9ce1bf499763e816f5231ef755c92ee5dc60792d1590139082c2aa856382
+EBUILD networkmanager-qt-5.40.0-r1.ebuild 740 BLAKE2B 74651e20523a2b6a8c8fe50e17a2bf458d31ac0fa8e21dbc474c02d528c00a8580e63a31aa5120bb2eb7518268c229dd61ea210e2c3fd867d895a44f6d72de76 SHA512 35c46e75f18331bcf63cf03490f81e5e2a4097a8f0cc88ff174997e2931c31c6c331c49d5203484c5991d7d0ae7e361015f117552d682d616ff3afdae5d97614
 EBUILD networkmanager-qt-5.40.0.ebuild 687 BLAKE2B 0a973209ba3928b911a35b1dd17336bf6650bccebd35c6da1d60704625703d6c7507aeb3bbae486601d51293f7b82a0f94cdfa981fa44fb2946d605f04d1f318 SHA512 dfbb706b1ca4dd91ac1fcdc7b6c59775de2e1b85eb3453f5c433106e29729a149c345e36333d5245d860b6078e308b4e234027953837d0b40e73282994673226
-EBUILD networkmanager-qt-5.41.0-r1.ebuild 740 BLAKE2B a2cf62a2bceac1fb2c669cac133409a868a6b121b264d75865e0345d34d4d4ee930cd63b0fccdce6464bff8bf868087e69772fd67b3067df513c5d3ebca84a25 SHA512 cfb9d895d77e88aa8f17f97911e60eab1478fde97b714aacb07a3d5bf6357e8561f335e5485154220ac5f9438da62085a5ab6d5db6fc7191d388f0f666d64ecb
-EBUILD networkmanager-qt-5.41.0.ebuild 689 BLAKE2B a15f2dcbeb52ae4c12ed9b27a4db341fc332969b4be3f3cc6183bf56e77d4eb6d97cedadc418e96d44b4e31eaefd9f8303fdb933f4341161c7f60c02258c8fda SHA512 f40a92f9a0ea91278a18fbbecbe6e62b177f932df333dd5b9c20202d3671ea0b7d0ffca5ede98f9d39a97d514676917686fd15da490f65224d338e46b67b517a
+EBUILD networkmanager-qt-5.41.0-r1.ebuild 740 BLAKE2B 74651e20523a2b6a8c8fe50e17a2bf458d31ac0fa8e21dbc474c02d528c00a8580e63a31aa5120bb2eb7518268c229dd61ea210e2c3fd867d895a44f6d72de76 SHA512 35c46e75f18331bcf63cf03490f81e5e2a4097a8f0cc88ff174997e2931c31c6c331c49d5203484c5991d7d0ae7e361015f117552d682d616ff3afdae5d97614
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.40.0-r1.ebuild
index 9b11c8f8e368..8cd9b7ba3ff0 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.40.0-r1.ebuild
@@ -26,6 +26,8 @@ RDEPEND="${COMMON_DEPEND}
 	!net-libs/libnm-qt:5
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
+
 src_test() {
 	# bug: 625276
 	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild
index 5d77844fc2ec..8cd9b7ba3ff0 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild
@@ -10,8 +10,6 @@ LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="teamd"
 
-PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
-
 COMMON_DEPEND="
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtnetwork)
@@ -28,6 +26,8 @@ RDEPEND="${COMMON_DEPEND}
 	!net-libs/libnm-qt:5
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
+
 src_test() {
 	# bug: 625276
 	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index cf3151518fa3..0c360fd7ed6f 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 97d3d6058580..93f4c43028be 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -6,7 +6,9 @@ DIST mutt-1.9.2.tar.gz 4195627 BLAKE2B 626ddd2535e28d46a50ea8e862573c2956587b9b8
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
 DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
 DIST mutt-gentoo-1.9.2-patches-r0.tar.xz 112224 BLAKE2B 7c5a5e67029e8c2775a1aeb876c5ee87c5616d748b08457364da07eccde5d3baecb328a95ef2fae7755be72b08d553d4beea08ccc751e146ce46694eac0c1f73 SHA512 b2ba382c21fe8d31059dd58760bba1ecd0b8fd256b3ade3d4dc0ea3dfa8c94e6ae9ec7baaf4b7c1c6c29d819fc78e9e781f07964478796e882903c0e9e438342
+DIST mutt-gentoo-1.9.2-patches-r1.tar.xz 113324 BLAKE2B a5ae4ca22001e91de8450086928bc7e3b26a26745d74f2969fb15e1f020037f8caffb92e0990dd9c8d13161afaa99c6cca593f8322f2870e413220447de20b3a SHA512 250323bb7b697ece97846f078f18ae93560f5ea5a8e1cedbc6d30ee21f3b430722e794d7a751ee4f9e673777ff39868c9c1e9dca4d4787b54240df7d981dbb39
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
 EBUILD mutt-1.9.1-r4.ebuild 8631 BLAKE2B 920eacb18c3ac7daece5133a2eb1b7cf6a7a187204bc0eb9996361e8763d39653f4636de258de484c20d6b3060681f598b30cad8e9d4c1d66a9cd0f8d6ce065c SHA512 a73465c57c30ac6373e58d0e9328b8ea1d073d2a5a62227afbcf5757a6904dda54681085e30cc8cbbdaca3a236938dd5aba4b3e90fd09d7b94df7e8cfc09abcb
-EBUILD mutt-1.9.2.ebuild 8647 BLAKE2B 58e02e0410ef1b0e4662783880810e0d395562bd01d2af5d9517cb4113c539299cdbcf7b618d3d5b6a1d4b6e45754214c280833c7ae4604baa4ef426cc31ebbf SHA512 f29317a4bfc20057e8b1d10e5b5703c4c7da5d38a17fc5b1e5311e1f2d08b4c818454d7b5ccb5e618ef7a267cfadbddfcde94f0f8fcc3e2f36a6bb6256362ab3
+EBUILD mutt-1.9.2-r1.ebuild 8879 BLAKE2B 7034bcae3d694ed97dd4e2aca51d282fae04f456a9f7981fd6d035254497948edd394d61e16a77bcd509f3e1105ebe23d536ec5a8d3accd85248d7d61d4401e5 SHA512 602cb6d831da4dc80bb01933fbd6e804f2fe596c7d568b05fb2acdcf1069e2eb7ea17481e6dfa87072036b52d3427b4c03ef147797b7e1d707509f9404b2e56f
+EBUILD mutt-1.9.2.ebuild 8879 BLAKE2B 36c89d417e549315efb7d78426cd5913759d02f2597e120f74d28d2e002138da8214137f523a12ed3f17714a996254b6d158282bd96a2e68dfbfd34521bd59ee SHA512 e2652de977daa9a9efb3e6632acfb8705f79c6a30fb77d0c159f97d68da84882ab9884b252194d8c4b91b6e05075f4b7a9b93acc2261a38314abd1a78710b5b7
 MISC metadata.xml 1866 BLAKE2B 4ce87ce0025fdf35622e7029d1200e0e4ad0cc66dd8bb40e1830d2fbcbc2d2de6e22c46ef86579c50224e17df42efcb349a1df55bb836eb5649110440aba17bc SHA512 1c494d1b5a628417d19d836473da2ba99e1d0f1e6f5a453f03ef84f9c601d2f31f53edf03bd242abfa8cb2a7f84de9385014828b607c1fbd6de38acdba228b82
diff --git a/mail-client/mutt/mutt-1.9.2-r1.ebuild b/mail-client/mutt/mutt-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..de6cc1806929
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.2-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r1"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+REQUIRED_USE="
+	hcache?           ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+	app-misc/mime-types
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	crypt? ( app-crypt/gnupg )
+	pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.9
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' \
+		Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use crypt         && use_enable crypt pgp)
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+		$(use smime         && use_enable smime)
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use !smime && use !smime_classic && echo "--disable-smime")
+
+		$(use gpg           && use_enable gpg gpgme)
+		$(use gpgme         && use_enable gpgme)
+		$(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable notmuch)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable nntp)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn)
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# REQUIRED_USE should have selected only one of these
+	local hcaches=(
+		"berkdb:bdb"
+		"gdbm"
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
+		cp doc/muttbug.man flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+	if use crypt || use gpg || use smime ; then
+		ewarn "Please note that the crypto related USE-flags of mutt have changed."
+		ewarn "To remove some unclarity, the following USE-flags are renamed:"
+		ewarn "(see https://bugs.gentoo.org/637176)"
+		ewarn "  crypt -> pgp_classic"
+		ewarn "  gpg   -> gpgme"
+		ewarn "  smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release.  Please update your package.use"
+		if use gpg && ( use crypt || use smime ) ; then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
+}
diff --git a/mail-client/mutt/mutt-1.9.2.ebuild b/mail-client/mutt/mutt-1.9.2.ebuild
index 1c47717e522b..03eefdb98a49 100644
--- a/mail-client/mutt/mutt-1.9.2.ebuild
+++ b/mail-client/mutt/mutt-1.9.2.ebuild
@@ -271,4 +271,9 @@ pkg_postinst() {
 			ewarn "  only enable gpgme."
 		fi
 	fi
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
 }
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index fc902fd05fab..737566d60bd1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 27887f32bc24..2b274f918caf 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,7 +1,8 @@
+AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
 DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 EBUILD darktable-2.2.5.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556
-EBUILD darktable-2.4.0.ebuild 3935 BLAKE2B 280b4223cac7cd99849ecc4aea7661616290ed8f84017df0fb8db79a75d9e3feded2998c34a43df7a727408cffbb698687e693c03611f159154e400b2d1a146c SHA512 4f18f241bcc825b337f3ee90f5e2fe727ee01be3fc1d308f1b7169b42c6b4650ccc8e7d24844f3b17b179b1d0d3bb2b1a1b0b9a7179b6631687cc6c51762c79d
+EBUILD darktable-2.4.0.ebuild 3995 BLAKE2B 3746489a294b22909bd231d219bfd1cb60c494beca6a9f8ef1b3b22bb660ab98724b14990b4b0a21b9788aafe15476496a7e6a654fbe7df34c3d1407b70467ac SHA512 00c1a43c39695a653a31beded947baffdd33f24b4873642b021a414ba49946a24990870f44644bbb3e6ca3e12451020cc3f4425e499d019aa6616bc0d94dc42c
 EBUILD darktable-9999.ebuild 3296 BLAKE2B 9a1410977c2093469a7324098787189364cf5bdd7b6e67c415dd54b608dc2db6f7bc7efe591f907c66a32600e5d5329022d1bcd539c6a5bdc8c14c5f23c3254f SHA512 2c04ee7ccc6a191bbeb0a75212e027838f6a5f4cdeeeff5ac638cd36cbf10e221d0d0a4ff58344723c8694b01dfde4c2774ba51d54a9c19c61565180fd8d6a62
 MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88
diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index 3f0453270d40..c32deff305a7 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.0.ebuild
@@ -69,6 +69,8 @@ DEPEND="${CDEPEND}
 		>=sys-devel/llvm-4
 	)"
 
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
 S="${WORKDIR}/${P/_/~}"
 
 pkg_pretend() {
diff --git a/media-gfx/darktable/files/darktable-find-opencl-header.patch b/media-gfx/darktable/files/darktable-find-opencl-header.patch
new file mode 100644
index 000000000000..0a692f9341e1
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-find-opencl-header.patch
@@ -0,0 +1,12 @@
+diff -Nur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-12-24 09:09:10.000000000 +0000
++++ b/CMakeLists.txt	2017-12-25 20:42:40.998693994 +0000
+@@ -355,7 +355,7 @@
+       message(STATUS "Found clang compiler - ${CLANG_OPENCL_COMPILER}")
+ 
+       find_path(CLANG_OPENCL_INCLUDE_DIR opencl-c.h
+-        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang
++        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang /usr/lib/clang /usr/lib64/clang
+         PATH_SUFFIXES include ${LLVM_PACKAGE_VERSION}/include
+         NO_DEFAULT_PATH
+       )
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 621ef885b29f..6308b927804a 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,7 +1,8 @@
+AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b
 AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
 DIST fontforge-dist-20160404.tar.gz 20906256 BLAKE2B 11f9a54de2cada7e243349ec0ddeb3f2025f12a9e9323b2bea437009ccd5e34d27ba41752752434c16b1a0b809c9878c23cd074bb59b590b427c599d575f0c45 SHA512 be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
 EBUILD fontforge-20160404.ebuild 2473 BLAKE2B e4984924e48c1ab426f5b2b5e8fd85c227595808b11c91c9f3be9d073879feb6556badab55a95170d9131fdc6831978b945cc7d3df46e412c8546b562b2ffb4c SHA512 b83e786156024e34042835af61205984e6d4c2d03dc20337b96e2228c2969073cdf130dcded5bd8e139a179b059096d62a5a88268d6645830e45932576d61e98
-EBUILD fontforge-20170731-r2.ebuild 2741 BLAKE2B 99f31b2dc59409690276974051b08a4c4fef2ea91a9ae7c2a6f6aa0e41d9bb21ed8c933bbb3605242882f1937b46eb14562c56bef6ca45d4df0c8e4fefccf8ab SHA512 569bc6a3da2c70ac90aea8609e817ff833a044395e8487bb85c5984f07055ca988c82b13b1f646fe80e54b175617c7ba8a82084ad1ccb68cd107802c61e90629
+EBUILD fontforge-20170731-r3.ebuild 2788 BLAKE2B 6ce9f1e0442098710a22d3f5518cddd3857a74ad83f58ae3fffade894a433df753040efff7301167b12c3c9a56633f61e9a0c72b7029ac96938d694e77426251 SHA512 2082ebe5e0dd99ea39b5b59e34d06f3c64d53522d54a7721986b6dc74110595da56124347da883120c9c610d8f45b02330d991baf5d34f96766094e0cb11416b
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/files/20170731-gethex-unaligned.patch b/media-gfx/fontforge/files/20170731-gethex-unaligned.patch
new file mode 100644
index 000000000000..812f7a444721
--- /dev/null
+++ b/media-gfx/fontforge/files/20170731-gethex-unaligned.patch
@@ -0,0 +1,22 @@
+fix unaligned access in gethex()
+
+--- a/fontforge/sfd.c
++++ b/fontforge/sfd.c
+@@ -3393,6 +3393,7 @@
+ static int gethex(FILE *sfd, uint32 *val) {
+     char tokbuf[100]; int ch;
+     char *pt=tokbuf, *end = tokbuf+100-2;
++    uint32 u;
+ 
+     while ( isspace(ch = nlgetc(sfd)));
+     if ( ch=='#' )
+@@ -3416,7 +3417,8 @@
+     }
+     *pt='\0';
+     ungetc(ch,sfd);
+-    *val = strtoul(tokbuf,NULL,16);
++    u = strtoul(tokbuf,NULL,16);
++    memcpy(val, &u, sizeof(u));
+ return( pt!=tokbuf?1:ch==EOF?-1: 0 );
+ }
+ 
diff --git a/media-gfx/fontforge/fontforge-20170731-r2.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
index c8ad245b14d7..ae146eb06471 100644
--- a/media-gfx/fontforge/fontforge-20170731-r2.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild
@@ -65,6 +65,7 @@ S="${WORKDIR}/fontforge-2.0.${PV}"
 PATCHES=(
 	"${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch
 	"${FILESDIR}"/20170731-tilepath.patch
+	"${FILESDIR}"/20170731-gethex-unaligned.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index d301cb516d8b..e16f459bde2a 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,6 +1,3 @@
-AUX maim-3.4.47-no-gengetopt.patch 1221 BLAKE2B 3bd83a697477de97ad224c73189dc766d0d72268bfa2c55d44863d293713dc246f559516850526ebbf7a1cc1f4f644dd3040f7aa8e9e4e47b39d3fb0cac87f31 SHA512 16a4f5f090d5072353144f0c0115cb0d5614206ec1d23b2415277744b3551f0e3c83445c2da96e93e99b49ddae965e368255daa707e1bd039620f5f445d859d8
-DIST maim-3.4.47.tar.gz 46799 BLAKE2B 9678caccc89f2c85a51e5fcad9691ab1ec17ecb88c383611f35f6f4692cac272c51df0e389256260985e155f0317acb583fea49be6d1bcfbebdb0014840ce997 SHA512 4b21f8ad8f9f2f19693d5c489f5e815133e1b8308653c52934cdb8a3d8ae38732733a5ffb5527b44db49f59c3818a9bc83840ced5db71807a68277d0dcc03392
 DIST maim-5.4.63.tar.gz 39666 BLAKE2B 0c472480f231b84c7f772347d6eeca8620947e5494f176dd4513ee41a5de29e9b90eafbec1bb7064e745e24c9b1043a7ccd9627cbab5561f30f6e8a859273e21 SHA512 d84cfe051109c9c4b79f2a006f2d73a0fa9cd40151c9d6996740326766886f8b070bc49029d0d3810fd8743cc63d76c051fc249e53b4e9ff37faf8708c149dfd
-EBUILD maim-3.4.47.ebuild 571 BLAKE2B 9ac21071bdd520486acece4ce02e8c421dc5b93c2adb00388dfb70dffca36321e7e930138b12097cdbf8a604ae830803b9155180517d158b6383ac914a7210d2 SHA512 6eb7fb72a17d8bd8dc8d78bf60aa6153c7d50d9a7325a2235795bba0e05f214dd8fd139af7bcd76a94001092b5e91870491888c6926d9b2f886f18eb6373fc33
 EBUILD maim-5.4.63.ebuild 599 BLAKE2B 23481feda7a67dea9ddfe017db071e07cc39b06bdd1e3c6e6a63bb2f198b0532f7c0a57d7c9f12b7de2fb1fb855cb9051a1695c5dbc64092eaeaae44a15b04d3 SHA512 a889034dd4c81f939c7e0edcb01f1de36b54e68bd8f793b08c935ba3affec3449c7492d418b7e614cf340e0092cd27410f72fa56b914d3d6ed6b9de849d607e6
-MISC metadata.xml 574 BLAKE2B d7d246f0e3152349dd249a691a5af2e0979c4863c9d1e50fcc343292bc3684d18beba9426afb5154d99a909a1ad4d3f0f5babdceb03efc0a37661db6efee6ebf SHA512 db87fa0cbc96b7fe012aa91d294fd28d5e584c24046ee6de415f22e28efd981bd839d4e3cc9019a407eabd184b0b73a0c03ba38d2657674fdafa091752e10f4c
+MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch b/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch
deleted file mode 100644
index 7a1035d3daf2..000000000000
--- a/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe4cd5f..f0eb718 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,19 +65,6 @@ if ( RONN_EXECUTABLE AND GZIP_EXECUTABLE )
-                        WORKING_DIRECTORY man-src VERBATIM )
- endif()
- 
--# Here we generate some of our code if we can. I package it pre-generated
--# so nobody has to go find and install gengetopt if they don't want to.
--find_program( GENGETOPT_EXECUTABLE gengetopt
--              DOC "A tool to generate code to grab command line options." )
--if ( GENGETOPT_EXECUTABLE )
--    message( "-- Regenerating cmdline.in" )
--    execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--    file( RENAME "${CMAKE_SOURCE_DIR}/src/cmdline.h" "${CMAKE_SOURCE_DIR}/src/cmdline.in" )
--else()
--    message( "Warning: Command gengetopt not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" )
--endif()
--
- # By default our src/options.ggo has our cmake versions variables for
- # the 'version ""' line. We replace them here.
- # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic.
diff --git a/media-gfx/maim/maim-3.4.47.ebuild b/media-gfx/maim/maim-3.4.47.ebuild
deleted file mode 100644
index 374899e4f477..000000000000
--- a/media-gfx/maim/maim-3.4.47.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Commandline tool to take screenshots of the desktop"
-HOMEPAGE="https://github.com/naelstrof/maim"
-SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/maim-3.4.47-no-gengetopt.patch" )
-
-DEPEND="
-	media-libs/imlib2[X]
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXfixes"
-RDEPEND="
-	${DEPEND}
-	x11-misc/slop"
diff --git a/media-gfx/maim/metadata.xml b/media-gfx/maim/metadata.xml
index 86992144c590..e340eaffe6a7 100644
--- a/media-gfx/maim/metadata.xml
+++ b/media-gfx/maim/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>palipalo9@googlemail.com</email>
-		<name>Ingolf Wagner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<longdescription>
 		maim (Make Image) is a utility that takes screenshots of your desktop using imlib2.
 	</longdescription>
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index f19d12183897..dfaec5610cd4 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -2,6 +2,8 @@ AUX optipng-0.7.5-estonian.patch 1014 BLAKE2B 3c973120185be858a89c02b1f452e47da5
 AUX optipng-0.7.6-cve-2017-1000229.patch 903 BLAKE2B d193e4c62813e40b653699d17b478838633e43536caa6bca54a7b48ad4290af3aa452b37d3bacbb194bec11aeed47e84b60cab4fd71281d554e72309e376ceb4 SHA512 2bf259c59121e735a6c65137d5819c07057b3b1e43e14793cc4f739b607f6ea4e4788ddf1dee521bd8b623796c901f974e7c925f36ff13adec669dfc6fbf449e
 AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b2052bc9e877ccfa367a039af27071a999deeadc48c418c5b5b5911022c08a212abb96f486dcf3860da7d74ae2a0978f82de9c SHA512 ea3e0e4823b6acb88f06cb56934147c147b98776f501c09a170f05a0b94355dd08539bb2c3ee69d47293028770df6134c3c648d091e14d5362f360961ee9c468
 DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
+DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
 EBUILD optipng-0.7.6-r1.ebuild 1335 BLAKE2B 9d40e9ec7e7d8cd7f96cf82676c48bb32f4eac2eca8c7a7d67eb2419994827ae0dc2b28b02a12265034b98de08100e849d0fba2ba414237165dca3fc096a4f65 SHA512 fde34b5fcd172711ee57f55cd93c8d60eb44086a09974aac5cea7b104a3a7c961a1840a38934aaa0a6182fdc2d8be01372d420af5f30054f298ebd565c0c09f5
 EBUILD optipng-0.7.6-r2.ebuild 1418 BLAKE2B 01607a670df74745d7b553a9893e2f27edea8fccfcec222040bb0e3d6fef6595979e82867f3d01145262f89ecd2246aaa5e7d4224e7f590208626047587814b3 SHA512 55936ab0aa173ba316e322a4a11d036dfa63ff198c8d694cbef1f4acbce6e4b86a65d06f9af336a58f2b61f8346292868aa219a876ae2f022e3924c31aeb72f0
+EBUILD optipng-0.7.7.ebuild 1290 BLAKE2B 9368bfe4ca4a47ca16d9fa2f2fd87f4f0632e1a38f31fcd0a8eb1aca11ad67e5b810f7c2756df799d3bfce6a82540dd5c8b248d25b00ebf4bf6ac03b48cd7106 SHA512 717f73a6d115dec2fea332d108986f9a0772466f36a9ccba1b52114df7d9376fc05a808b3e8c0a5d810ba38ec96d0d5480141e497288dfbbb7d5d61682d92f61
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
new file mode 100644
index 000000000000..3880a888ddf3
--- /dev/null
+++ b/media-gfx/optipng/optipng-0.7.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Compress PNG files without affecting image quality"
+HOMEPAGE="http://optipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	sys-apps/findutils"
+
+DOCS=( AUTHORS.txt README.txt )
+
+src_prepare() {
+	rm -R src/{libpng,zlib} || die
+	find . -type d -name build -exec rm -R {} + || die
+
+	# next release is almost a complete rewrite, so plug this compilation
+	# problem in anticipation of the much (c)leaner(?) rewrite
+	sed -i \
+		-e 's/^#if defined AT_FDCWD/#if (defined(AT_FDCWD) \&\& !(defined(__SVR4) \&\& defined(__sun)))/' \
+		src/optipng/ioutil.c || die
+
+	tc-export CC AR RANLIB
+	export LD=$(tc-getCC)
+
+	eapply_user
+}
+
+src_configure() {
+	./configure \
+		-with-system-libpng \
+		-with-system-zlib \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake -C src/optipng
+}
+
+src_install() {
+	einstalldocs
+
+	dodoc doc/*.txt
+	docinto html
+	dodoc doc/*.html
+	doman src/${PN}/man/${PN}.1
+
+	dobin src/${PN}/${PN}
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index ea9dbea08509..f1f01e6e6d76 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index e089d12fa9fa..c3f2117f6708 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,4 +1,4 @@
 AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
-EBUILD unixcw-3.5.1.ebuild 1879 BLAKE2B 0a9883cf73175d560f6358ed6ac7349fee5c37867b4390bdf9ead841ec2100c251e92e6a327d550884111a3fe19a98f65a25666fbfd4d917941c9d187d19f274 SHA512 8f70b8d3419815b488efa8f9fcaacd4282295dc0a25c5a0c4f3cc088b96612d0de28787299681aff248168b7e35ef9cb294a82655616a6c87e47da37620bbeeb
+EBUILD unixcw-3.5.1.ebuild 1933 BLAKE2B ef050eeaa84e07c3efe3d3a650856105032eec502fab359a3a1132f7e0fddb1b64e5a36b3a70d124a755e4cca48329fca92f290571705d3b612cd5b7189b099f SHA512 4de70c5e3d462764de27cb283edaf8c1179169f63862e3b379ee50f503565bf8f1d621847775394ccf1f74aa4686b322f43c52180816ba5b3caeb2862d289411
 MISC metadata.xml 874 BLAKE2B 3927a605bcb0b3459888fcaa77a528020ed037beeff2b6e750102efc1cad99633cd94f7e6d87093c08133949dc40ea46ad5f1d44a497ef1aeedf2afd77592b29 SHA512 b4040ecf973492b76642e7df2e2fa41b6cf057490a1674e4246479b084e5a3972d109eb203337c0053c2d6924a3b2597ee42684ffb4431c8147e90d5a208247e
diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
index a57629b21d91..1eb06a2ba00d 100644
--- a/media-radio/unixcw/unixcw-3.5.1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1.ebuild
@@ -12,7 +12,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
-IUSE="alsa ncurses pulseaudio suid qt5"
+IUSE="alsa ncurses pulseaudio suid test qt5"
+
+REQUIRED_USE="test? ( || ( alsa pulseaudio ) )"
 
 RDEPEND="ncurses? ( sys-libs/ncurses:= )
 	qt5? ( dev-qt/qtcore:5
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8599f4b880e0..d1aeb3f34f42 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
index bef7c3762822..77b446b09f8b 100644
--- a/media-sound/pamix/Manifest
+++ b/media-sound/pamix/Manifest
@@ -2,5 +2,5 @@ DIST pamix-1.4.1.tar.gz 15900 BLAKE2B 127467ae6cf2d380f78ab2ccd0e990a11ad1747adf
 DIST pamix-1.5.tar.gz 16902 BLAKE2B 4f7612cb870f84110b8cc31a061afecb7c2aeb8d073887cde671bbaf8702db83b8cfe4e7b06e9260c6925c4334c1cb46175612f87d4ed625181179f615b6e954 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938
 EBUILD pamix-1.4.1.ebuild 776 BLAKE2B 8a1be6f76c7b186c6cc51dd7545fd86e8c47af2f465d21a8cbcec5a8216401397ee083dfe445f2eb25aaff85820cb7677f3b9cf90fa4d3eb497dc6f30dcfd438 SHA512 b2c5f9027d1e691b6a3a2f90645666f7df5e7bfaef4f0b8817d603d35c16f1a36e6743c3fc6bdf8d6aac5a7c205b91895e495a37d0daf64e91dd71e4f8a07b72
 EBUILD pamix-1.5.ebuild 775 BLAKE2B 1189c963951039c25bce9b1cebfe01cbefa0f18fc683276be48c5c2cbaf17fd3b709c4a011ecf68434d317896e05b65f0a80eef8182e16dcba48b4799366abb9 SHA512 a550d7a541050ee64b1b391d5b5eda0ec3eab2b780b86066e22696599ea490ba561415915c403e66ec79284eed3133470f7b2aaf70d63d2aac703b136df26976
-EBUILD pamix-9999.ebuild 776 BLAKE2B 8a1be6f76c7b186c6cc51dd7545fd86e8c47af2f465d21a8cbcec5a8216401397ee083dfe445f2eb25aaff85820cb7677f3b9cf90fa4d3eb497dc6f30dcfd438 SHA512 b2c5f9027d1e691b6a3a2f90645666f7df5e7bfaef4f0b8817d603d35c16f1a36e6743c3fc6bdf8d6aac5a7c205b91895e495a37d0daf64e91dd71e4f8a07b72
+EBUILD pamix-9999.ebuild 953 BLAKE2B 6abf863b3890234bd02acaef9df44655225fc586ccfa3dec890651a1ad16322ae1dcec7ea03242f69b181dae85bd6e64fb306e0d57b0169728d6790af6d9b75a SHA512 83498e726fa224d15c66a82f8fc36dc19274621565a89774dd714778f4d55ad8dd3e44db9e67914c390cac29ab5aeae3ec4f31093c6cd1da98211a69bd746661
 MISC metadata.xml 341 BLAKE2B 370b3031b7775e1c96f7d275f0e662594ff091d5d621dd51548af9153ec7a40eb821055573d6b53a742b1ee777b72067c49d900a6dec47b8f7bce09457e89f3b SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
index 05816380caad..acdf22771d05 100644
--- a/media-sound/pamix/pamix-9999.ebuild
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 SCM=""
 [[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit autotools ${SCM}
+inherit cmake-utils ${SCM}
 unset SCM
 
 DESCRIPTION="A PulseAudio NCurses mixer"
@@ -30,9 +30,15 @@ DEPEND="sys-devel/autoconf-archive
 
 src_prepare() {
 	default
-	eautoreconf
+
+	# ugly hackaround for split tinfo ncurses libs
+	sed '/link_libraries.*ncurses/s@\(")\)@" "tinfo\1@' \
+		-i CMakeLists.txt || die
 }
 
 src_configure() {
-	econf $(use_enable unicode)
+	local mycmakeargs=(
+		-DWITH_UNICODE="$(usex unicode)"
+	)
+	cmake-utils_src_configure
 }
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index f0677fc08780..02d8471e7f87 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,3 +1,3 @@
 DIST SuperCollider-3.8.0-Source-linux.tar.bz2 8866545 BLAKE2B cace10861c4d8914d2a9279d72d8684c2914db3802d5922b1254ad96a8f0e7503f912afa3acd79125838d09d407aee5a5ec2e2f89345ff927120f5fcd666b5ca SHA512 305898067cb323682ca3dc65b3f093658192dbad228632d928f2fbd4a635c651f49e2e4f32c338997aafd48a22b739cd80de4296f747c3f1810ddede0aff283a
 EBUILD supercollider-3.8.0.ebuild 2668 BLAKE2B e15d99b01d45ebb834d36452217cc11b70a830662e644b5f1281363bba051379b6499906675cf970006b49fea00211ed9a9a2058c1c0c963c9d92db2e9347069 SHA512 5e59afbce42cef844aca6ecd26d03af4489586acf1d89ddec5da1d10b5cb8b9a4bc0122a4a8cb44aba2468c1f58fb4011fbe9ad052467705184fa56a97235e3c
-MISC metadata.xml 1114 BLAKE2B 7a8a5b5d7a651882c04ec5e013d2c71f952abe1480433f41aca761c37673cb5add124c1bd5fa2bf745d18bdc36cc7ae6c0c802d7ed8d218895e437fb1c8bc745 SHA512 962457bd94fd44a8412bcb38fd248525898e851b68eb0d2344eff99ab4f7c9ccd1684f3496a5b41ba95d774b43920c5fd0a08aef17c105e47671dae5b6b217e0
+MISC metadata.xml 910 BLAKE2B 3e574516ab8078203a112ee835fd37f25026103fcf7ff0425b05115c8b25eb72acc38e72a9b15802a90f05c31d6dcf21e8f4dcb5e7c1c07e7c9f0804101cfc90 SHA512 7afeb0ae7a5b92a5380a641e2cc93168c952680b61cc35c388bfa7163e172d12c6e2d236a5eaa1e9e126bda928e798a4519c8eb7821814cb6c0cca51075251c0
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
index c082d3ea4ddf..c2e47cdb26e0 100644
--- a/media-sound/supercollider/metadata.xml
+++ b/media-sound/supercollider/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>palipalo9@googlemail.com</email>
-		<name>Ingolf Wagner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<longdescription>
 		SuperCollider is a platform for audio synthesis and algorithmic 
 		composition, used by musicians, artists, and researchers 
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 826a483a3013..29f5220178a1 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 21ec833fc161..8349e3840919 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -4,9 +4,9 @@ AUX mythbackend.init-r2 2050 BLAKE2B d3646ebdb703d094c6340226907739f7b84d1fb48b3
 AUX mythbackend.service-28 2689 BLAKE2B 1141975d442d5308700d05710030114cc4c428879eaed030b065a7dc4a0d23f839f26cba0e6b660c938e15faf9e9ac3f5b36a979226068d0989f4b044e73ccee SHA512 945cd721c7114e7c9a334063c6f85de40c2dd8a40271b1755b31881ae2c067b67d34685e1cb2d9b09fdaa9bf58ea2763e4e314b288e53f8bfcef7b6942ce5dd1
 AUX mythfrontend.conf 474 BLAKE2B d81e2e91bb4a8afef746268ec832129ac6b02c27d0e7414a912a04ac2edec69ca59367d24fa8d80d5f6c8d6b0f462cb022d4307070a267e970405a9cf0448d64 SHA512 8b3967f5e7d719fefe50b8868dc1b974c3f6337335e7e65799ddb331abe07df0fadb4cb619758fefeaa0c4d0d1dac6f00e0982736cab5acac993bdaced0051c2
 AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d93673384719cd494abc77a308bbc1c5842965c39540ff6bdfe5fed660594acd9f9e2767fba8fa7c782ba525eb287d33 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3
-AUX mythtv-0.28.1-glibc225.patch 927 BLAKE2B 6afb4f04387170de3b5dc1478fcd788b213869ea06d4d8a3c0374837f10a15b099a779df6d472809155cba56850351d80c4968671ef4873ad91d8fd55a407c77 SHA512 626e1f80ea2ffd5774a3df5919ddb618ee6fc5b5c12133891d3c9cbf0068c5e349508d0f3c90e3ca1e49afa9df92a4243950fa51a0c9b8ca26d9e19e463cfe36
+AUX mythtv-0.28.1-glibc225.patch 927 BLAKE2B 58189108a9c823c559c5ec15caa8792ca18663e9155df5bb60ffc09e5b19cd0e6f37812dabbe0e7ced4c03d179993bd3296dff69bed4d111412b2b85ee6c14a0 SHA512 33f80de1044cd8130dfd56f3ea6478c3667cc1698953244b7427a8ee055ffac2051f0f81dacc193271ddcc705c351f6fad86fc0b107accd1c949f8aaa7275a7b
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-0.28.1.tar.gz 104477892 BLAKE2B bdecfc5723ec3495ab6e49c72caaa5c2dc62c75a11ce7524d3fd5cb8daec82b53b415591b6198eab00322bbbcaff2de7d4f1b7a165d449007f4c3742a69d304b SHA512 67a81858cd19b90f519113b234119ecc248366d8545c862d887755f256cddf04d9ca16a7bf67f63e06f7628730e7dbde2a2099ca8aaeb9061b2e55a5a0b7d5e7
-EBUILD mythtv-0.28.1-r3.ebuild 10080 BLAKE2B 1ccc5ccf7c8b7e9dd9369480c60e6ebf66e95cce9c318b04b2a128657e0cffb4ef675b1ea1b9f4cd482fde8820e413200ed9a1b4d754eff25b04ffda80170688 SHA512 6a5414caf07f24be96a86d399c861d26a05676e365758b4fa148e28ae5c2968f17b03c9a8c2cafb9f13834d79b25d30d9e54c5725e68d8f92f5f31a4393c1959
+EBUILD mythtv-0.28.1-r4.ebuild 10154 BLAKE2B 800d3005c2158028f5b9229aa05d52e68f9987991bfa83f62bf5f09318920dc8d6b03526cf7b44f37092d06fd284cfc8052ec8564e7e1aea50a59766a01c75c7 SHA512 fbc93bd51fb06d9d18c9f9af7296008cf3787f59a36af07c6886f6bcd5b0bc43f4869e8da6e6d8d7aba324c8971f7ade4b5e647ff89ad153841556d3de3276a0
 MISC metadata.xml 2986 BLAKE2B 8bfeb791c20052690820b02f03859a72e1de4ccba6303eee36d05bfee3b04ac204f5dc6ebd24741b39868a0e0b8fcf7875fcfb5aaaf8d855bb06be9a0d03df98 SHA512 a57d539f1f083bb69aaa0e85622862408e5afbc1eb27bfdf13b319b8104909971698ad7f51cc8978b9f5e5e4ab9e9d73b7907c61d65aba7c21867da7bfb36084
diff --git a/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
index 343a808076e6..9e4543e86b16 100644
--- a/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
+++ b/media-tv/mythtv/files/mythtv-0.28.1-glibc225.patch
@@ -13,8 +13,8 @@ On BSD platforms they remain defined in <sys/types.h>
 
 diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
 index 97618adc80..09dd95073d 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
+--- mythtv/libs/libmythtv/videosource.cpp.old
++++ mythtv/libs/libmythtv/videosource.cpp
 @@ -3,7 +3,11 @@
  // Standard UNIX C headers
  #include <unistd.h>
diff --git a/media-tv/mythtv/mythtv-0.28.1-r3.ebuild b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
index eb2f4161dfb1..c030c6623d2f 100644
--- a/media-tv/mythtv/mythtv-0.28.1-r3.ebuild
+++ b/media-tv/mythtv/mythtv-0.28.1-r4.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 # git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
@@ -10,7 +9,7 @@ BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
 MY_P=${P%_p*}
 MY_PV=${PV%_p*}
 
-inherit flag-o-matic multilib eutils python-single-r1 qmake-utils user systemd vcs-snapshot
+inherit flag-o-matic python-single-r1 qmake-utils user readme.gentoo-r1 systemd vcs-snapshot
 
 MYTHTV_BRANCH="fixes/0.28"
 
@@ -23,10 +22,9 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0/${PV}"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec autostart bluray cec crystalhd debug dvd egl fftw +hls \
-ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora \
-vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
-
+IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
+	ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora \
+	vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluray? ( xml )
 	theora? ( vorbis )"
@@ -64,6 +62,9 @@ COMMON="
 		sys-fs/udisks:2
 	)
 	cec? ( dev-libs/libcec )
+	dvb? (
+		virtual/linuxtv-dvb-headers
+	)
 	dvd? (
 		dev-libs/libcdio:=
 		sys-fs/udisks:2
@@ -134,6 +135,23 @@ DEPEND="${COMMON}
 
 S="${WORKDIR}/${P}/mythtv"
 
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+To have this machine operate as recording host for MythTV,
+mythbackend must be running. Run the following:
+rc-update add mythbackend default
+
+Your recordings folder must be owned 'mythtv'. e.g.
+chown -R mythtv /var/lib/mythtv
+
+Want mythfrontend to start automatically?
+Set USE=autostart. Details can be found at:
+https://dev.gentoo.org/~cardoe/mythtv/autostart.html
+
+Note that the systemd unit now restarts by default and logs
+to journald via the console at the notice verbosity.
+"
+
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
 pkg_setup() {
@@ -143,6 +161,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	# Perl bits need to go into vender_perl and not site_perl
 	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
 		-i "${S}"/bindings/perl/Makefile
@@ -155,8 +175,7 @@ src_prepare() {
 
 	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
 
-	epatch "${FILESDIR}/${P}-glibc225.patch"
-	epatch_user
+	eapply "${FILESDIR}/${P}-glibc225.patch"
 }
 
 src_configure() {
@@ -174,7 +193,7 @@ src_configure() {
 	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
 
 	use altivec    || myconf="${myconf} --disable-altivec"
-	myconf="${myconf} --disable-dvb"
+	myconf="${myconf} $(use_enable dvb)"
 	myconf="${myconf} $(use_enable ieee1394 firewire)"
 	myconf="${myconf} $(use_enable lirc)"
 	myconf="${myconf} $(use_enable xvid libxvid)"
@@ -216,7 +235,7 @@ src_configure() {
 	else
 		myconf="${myconf} --compile-type=release"
 		#myconf="${myconf} --enable-debug" does nothing per sphery
-		#myconf="${myconf} --disable-stripping" does nothing per sphery
+		myconf="${myconf} --disable-stripping" # FIXME: does not disable for all files, only for some
 	fi
 
 	# Video
@@ -265,8 +284,9 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
+	emake STRIP="true" INSTALL_ROOT="${D}" install
 	dodoc AUTHORS UPGRADING README
+	readme.gentoo_create_doc
 
 	insinto /usr/share/mythtv/database
 	doins database/*
@@ -331,19 +351,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	elog "To have this machine operate as recording host for MythTV, "
-	elog "mythbackend must be running. Run the following:"
-	elog "rc-update add mythbackend default"
-	elog
-	elog "Your recordings folder must be owned 'mythtv'. e.g."
-	elog "chown -R mythtv /var/lib/mythtv"
-
-	elog "Want mythfrontend to start automatically?"
-	elog "Set USE=autostart. Details can be found at:"
-	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-	elog
-	elog "Note that the systemd unit now restarts by default and logs"
-	elog "to journald via the console at the notice verbosity."
+	readme.gentoo_print_elog
 }
 
 pkg_info() {
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ab6afc897e9f..ad6a294b59fe 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a4acedc9c97c..1f438b29d261 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -16,10 +16,10 @@ AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa9464
 AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
 DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
-EBUILD vlc-2.2.6.ebuild 15519 BLAKE2B cbc55f76288176d91b8e53b188778aa1f50b42942a60aafe9c9fc0278a6da13a04b8acaa0d7dcd76b0f1b54ad23b7048c76f07cca0ccd478659fb94492a6257a SHA512 ba381af8546d8d55b4394dd0db2859146f3fc0c015ac50767f945a38c3abb3034d1ff98b5a0793d4a201e694477ac8d1fd3d092b8274e09170a200a49ff13e94
-EBUILD vlc-2.2.8-r1.ebuild 14501 BLAKE2B f5f57707d97f1fe8be98ddbe60bf5910b52c2d182f1e5c02dfb72692510a1a6993b622fa385e512f717db359e7261601e37931aa516741ceb27d7b9dbd021970 SHA512 8557031c00d21f0fc489f7bdb822278bea2dfae5639b627ecd77750831a3f8fd034897b19dab73db7820030f7e503c6c4d0e7b79ba7080ad78e88ddcae31a07f
-EBUILD vlc-2.2.8.ebuild 14386 BLAKE2B de5df978e7c4aace18de3b8ce16978fdb6ecd1ff067edd5dae85ec59a590910ce552d3be6cbbe913a3b5001085d138c8d66c32bd1f2f0ac8b8ba65d8a630d743 SHA512 ec945449c875fa2ae2d9f720eecab33f5d135b229cb2f86663f7ff831b06f6818e0df3f1b50ed69f5e564a5012679440c670e0f55d5338f88a0afb7939921e63
-EBUILD vlc-2.2.9999.ebuild 14515 BLAKE2B 2b2d0e7b43ee273fca47b6870181adbc270843928d238abf68f29d76e79dea930fb2d8bf7ac21dd8c0b12e853cf09dd065876ac30ed3569ec64def0438bc7d0b SHA512 6d2d4ebd3c2f0a91ab093f3bb28f5a1e4f8e85657aab2db754dccabdd415c4c1fbfeca60fcf32f83381deda918a13d14edefcd07056ade5cc032ce975ec2079f
-EBUILD vlc-3.0.9999.ebuild 13453 BLAKE2B 5569efb9bc45c932eb28af33a9c1378563ab9757083270d38ecf21954e95d3d38503e6a7cbbfc4d0dee75e368f11d2fdeebbbff68ca231303208b2593db9d084 SHA512 e213ad711037f64d70dd3939c4e651e506eaf25d83a2d6a92808e6cb801a8cf2007dc1788db99b2b45b6e1ba8efe56f1cd18b879b0ffcc8979073416985b431d
-EBUILD vlc-9999.ebuild 13446 BLAKE2B c9040e62aee466381b63fb44ec9244b59b9412de70d4b24fc4f1897ee1b12e284811504eeb99dae8104455c534609e07485d9dd720eb0b379ed03d2989e7cdb5 SHA512 1325f825ad62d9197a1d3f2ad3842532c7f6aec1079826e524659b377f651b119bad5524570ce4c9ed3b49c602ac9fc727bd5da65ef77b447d87908cc73aed99
+EBUILD vlc-2.2.6.ebuild 15554 BLAKE2B bb51292251d39edda6e981b3805480396307dc0052cf4124fd74acda3bc48103646b147761aca15093f00afae21264eb27a46b1bab27d208755b47591981d0fc SHA512 56a3383357cf055d4bc1a459b0c395a22afa95d9d3eb2be1ed48d1b485378b9d5d230851b8c65accd9713a712685044f62a5652b1fa79749f678aca190fcc6cb
+EBUILD vlc-2.2.8-r1.ebuild 14488 BLAKE2B 1f8f2b3a002779ccb448dac4c73502e44969606b218ee72c4eda5496b4071fbf5fc42f51bf7255cfbd725e8e14580108b9270f9d0611e8afd689b95a80712aa4 SHA512 91fa17acdb4d0dee07f23fc5d65ce817994fcdb2909bfa259ed38c5cf07e4b6285f475a81948196da5141d2c54ee7f25e0d6d4abc49e91591b9f603459d537c8
+EBUILD vlc-2.2.8.ebuild 14421 BLAKE2B a19e6d304b5758cee4c66d804d3836b171b81d88a4c8c5c2d0864743ae2f539be971ce833f9d8bff056bcfe696e8408fa1d687b1aca7d4b0aa51f0304e80b48d SHA512 4d9232bdaeedded4d2523547c27583c83291909fbda47051991adfd2b5216217873e040059075fd383469d6eeffd0769ca884eead73f44e0b49a5da32fe8804e
+EBUILD vlc-2.2.9999.ebuild 14502 BLAKE2B 0e052bfee82b41f15f2b61da02a1674dda8445520f45c0f0ee2a05d5da1f81dbe9666c5c6efd3eb9a6ef11f798dd736cfc6381ec0d45d5c51bada3905aaf106e SHA512 e2a5009595678aa48bd84328529d4bb8dd4a3e70fd4a5a608ba8b6cede9f2fcbbe209107273b18d627fc1b5fdbb81bd10f3672294c93b8fdf46f9112929c3060
+EBUILD vlc-3.0.9999.ebuild 13488 BLAKE2B 95f5eabafdabc5e45eb0df7e6075d42674b17ca06fa03025d56e6ddc6a192277b3a020e323358024628ec0f70b08e86d506409f2e31e776eeaa19cc6ed24c6eb SHA512 96f80b716829f4b7e3c3b0bf757f31d3797d18b76735c42f332e8019577d3a06c97890d97a2781accc033b56a83212a25a194610c6019ce885251f02be180136
+EBUILD vlc-9999.ebuild 13481 BLAKE2B ab969226645372b0360dc12482c3d19514b7abfe3c27d1460b97a9a4c3b9e2a0c888b984e196c2d314ab27f6c841a1371094870a3b200f0aeb67c14e7ad0ea12 SHA512 5c3b6f746401b6e423af49238025ee509ba40bf567495b3a966fe42e97da07badfcb463e4f89cfeb431d60747d59b9ae493bf94c167864f2e0a567a400f55834
 MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
diff --git a/media-video/vlc/vlc-2.2.6.ebuild b/media-video/vlc/vlc-2.2.6.ebuild
index 9652a5dba1e4..8f50aca222db 100644
--- a/media-video/vlc/vlc-2.2.6.ebuild
+++ b/media-video/vlc/vlc-2.2.6.ebuild
@@ -20,7 +20,7 @@ MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="VLC media player - Video player and streamer"
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
 if [[ ${PV} = *9999 ]] ; then # Live ebuild
 	SRC_URI=""
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index bdc58178d60a..24f97e228184 100644
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -23,14 +23,14 @@ else
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
-DESCRIPTION="VLC media player - Video player and streamer"
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-8" # vlc - vlccore
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
-	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
+	cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2
 	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
 	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
 	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
@@ -85,7 +85,6 @@ RDEPEND="
 	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
 	dbus? ( >=sys-apps/dbus-1.6:0 )
 	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-	directfb? ( dev-libs/DirectFB:0 )
 	dts? ( >=media-libs/libdca-0.0.5:0 )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
 	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
@@ -310,7 +309,6 @@ src_configure() {
 		$(use_enable cddb libcddb) \
 		$(use_enable chromaprint) \
 		$(use_enable dbus) \
-		$(use_enable directfb) \
 		$(use_enable directx) \
 		$(use_enable dc1394) \
 		$(use_enable debug) \
@@ -414,6 +412,7 @@ src_configure() {
 		--disable-cprof \
 		--disable-crystalhd \
 		--disable-decklink \
+		--disable-directfb \
 		--disable-gles1 \
 		--disable-gles2 \
 		--disable-goom \
diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild
index 61ec7e46d584..6896d4729401 100644
--- a/media-video/vlc/vlc-2.2.8.ebuild
+++ b/media-video/vlc/vlc-2.2.8.ebuild
@@ -23,7 +23,7 @@ else
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
-DESCRIPTION="VLC media player - Video player and streamer"
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 513a854d0f39..5d8fafca1886 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -23,14 +23,14 @@ else
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
-DESCRIPTION="VLC media player - Video player and streamer"
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-8" # vlc - vlccore
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
-	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
+	cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2
 	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
 	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
 	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
@@ -85,7 +85,6 @@ RDEPEND="
 	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
 	dbus? ( >=sys-apps/dbus-1.6:0 )
 	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-	directfb? ( dev-libs/DirectFB:0 )
 	dts? ( >=media-libs/libdca-0.0.5:0 )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
 	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
@@ -310,7 +309,6 @@ src_configure() {
 		$(use_enable cddb libcddb) \
 		$(use_enable chromaprint) \
 		$(use_enable dbus) \
-		$(use_enable directfb) \
 		$(use_enable directx) \
 		$(use_enable dc1394) \
 		$(use_enable debug) \
@@ -414,6 +412,7 @@ src_configure() {
 		--disable-cprof \
 		--disable-crystalhd \
 		--disable-decklink \
+		--disable-directfb \
 		--disable-gles1 \
 		--disable-gles2 \
 		--disable-goom \
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 7925c2465e78..044aa2ff014a 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -23,7 +23,7 @@ else
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
-DESCRIPTION="VLC media player - Video player and streamer"
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e67e99283315..86a7661c3f4d 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -23,7 +23,7 @@ else
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
-DESCRIPTION="VLC media player - Video player and streamer"
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
new file mode 100644
index 000000000000..f9d3af7cc19a
--- /dev/null
+++ b/media-video/webcamoid/Manifest
@@ -0,0 +1,3 @@
+DIST webcamoid-8.1.0.tar.gz 10062681 BLAKE2B e9501ace9ba42abdae4be4e9e689329b02796198fe2610ef3a404535d389a6aa7a7e540148548dd63ea6ba78c9b650b30f5497396e49b37d7ab06ca8708ad056 SHA512 6db53ed29288889c05955967d961b53fa0e4171aeed12cd1557829c26bb2e2031804319fcead4c5b888a695cfd84f531a27f992be56c38366076ff2945ec2dbb
+EBUILD webcamoid-8.1.0.ebuild 2150 BLAKE2B 07cccb730dafc0d1f576b38b3fc2896632ef651cc7774281948fc77d61fb31274a210ad8444da1d35acccb61e54f8d1eaa3bcf1624290053bc50cd31e7025797 SHA512 47b736f8fe4671f0bfa75a4b030eeae211a3bd36c69e4914d0db001cf1ba4a5a24c6848a6cb1bb8f47558e6764bb9f2f5cf6c6244e1916213ff2f06ff2dde449
+MISC metadata.xml 784 BLAKE2B ce617d4a9bcbf3f8e4ce651fd673bf3c0015e13bc8814d4b4e97eaa4a6c5428553d4a314054315fd3dc8a6b1362b4a322a4af78745f3c3d2378e2e731bdc9ef9 SHA512 6518965213e9deffdb6163243865c9e37ec0a14b6e83558761ff27ad7984003be1b6c6518d455631cd2af29f663b6e91f60dd061151e63b3a4f5ad73e35df5cf
diff --git a/media-video/webcamoid/metadata.xml b/media-video/webcamoid/metadata.xml
new file mode 100644
index 000000000000..9140e9d45b53
--- /dev/null
+++ b/media-video/webcamoid/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reagentoo@gmail.com</email>
+		<name>Dmitry Baranov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">webcamoid/webcamoid</remote-id>
+	</upstream>
+	<use>
+		<flag name="headers">Install development headers</flag>
+		<flag name="libuvc">Build with libuvc support</flag>
+		<flag name="qtaudio">Enable audio capture/play via <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="v4lutils">Build with V4L-utils support</flag>
+		<flag name="videoeffects">Build video effects</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/webcamoid/webcamoid-8.1.0.ebuild b/media-video/webcamoid/webcamoid-8.1.0.ebuild
new file mode 100644
index 000000000000..50eb5018b024
--- /dev/null
+++ b/media-video/webcamoid/webcamoid-8.1.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ca de el es et fr gl it ja kab ko nl pt ru uk zh_CN zh_TW"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="A full featured webcam capture application"
+HOMEPAGE="https://webcamoid.github.io"
+SRC_URI="https://github.com/webcamoid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE_AVKYS=( alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects )
+IUSE="${IUSE_AVKYS[@]} debug headers libav v4l"
+
+REQUIRED_USE="
+	libav? ( ffmpeg )
+	v4lutils? ( v4l )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
+	)
+	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
+	jack? ( virtual/jack )
+	libuvc? ( media-libs/libuvc )
+	pulseaudio? ( media-sound/pulseaudio )
+	qtaudio? ( dev-qt/qtmultimedia:5 )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	>=sys-kernel/linux-headers-3.6
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	local tsdir="${S}/StandAlone/share/ts"
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "${tsdir}/${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_locale() {
+		sed -i \
+			-e '/.*share\/ts\/'${1}'\.qm.*/d' \
+			StandAlone/translations.qrc || die
+	}
+
+	rm ${tsdir}/*.qm
+
+	l10n_find_plocales_changes "${tsdir}" "" '.ts'
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_locale
+
+	default
+}
+
+src_configure() {
+	local myqmakeargs=(
+		"CONFIG+=debug"
+		"PREFIX=/usr"
+		"BUILDDOCS=0"
+		"INSTALLDEVHEADERS=$(usex headers 1 0)"
+		"LIBDIR=/usr/$(get_libdir)"
+		"NOAVFOUNDATION=1"
+		"NODSHOW=1"
+		"NOVCAMWIN=1"
+		"NOWASAPI=1"
+	)
+
+	use v4l || myqmakeargs+=( "NOV4L2=1" )
+
+	for x in ${IUSE_AVKYS[@]}; do
+		use ${x} || myqmakeargs+=( "NO${x^^}=1" )
+	done
+
+	eqmake5 ${myqmakeargs[@]}
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8891ed5f9ffb..002f3ee6802d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 6145415cfb57..29b12457314e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Dec 2017 00:09:29 +0000
+Sun, 31 Dec 2017 21:39:33 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2554621ac320..3ac0fedc9f6d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 412859 BLAKE2B 29f22611257846c43da3f994e05684673fa1caa957a4b148f39ff19bc84f3682e8490d97c111e7eccbdb376d70136a0d0906ef152ce3abf044f4fb391eb520c4 SHA512 49d32fc5be9c59d40fa5555276aaf748a6274c5421c12e450644629355174f7bb6f7e77103a5571ae8f5e28bcd53505531ac68ed8f7957c3debfc9196bd152cd
-TIMESTAMP 2017-12-30T00:09:33Z
+TIMESTAMP 2017-12-31T21:39:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpG2T1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpJWRlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCZrg//XVkzFGq4vaLz6R4qC5krhvQSGzRKp+/xbezjJYuy4Ps4zbq2LYDihbKS
-NAA822giPJwXVuyb0p0Na1n0/mBd2uP7+8O8DVV3ELhrlPL9Ry8LJOrjZWFikynY
-b2Wym4Ww/z9gONiW3WpV2m5C/h9z4H2QABi16c9X3v2aDgrIIzbtUegrZKCWjOJl
-uwGE6hgtWgIvH/tC+gXk+mUX6LvPZeFhEBYte/rGYlYA0vDAFK0khgjfi40nJGHy
-tOPrwZeITR2fRIDW/SDrpkO/xb7gVYFHUQzYIfsg40AalGFhWbob/c9+5Klr2nFD
-e04cMOrV3UyrS9BrFrdNOV93Xm4IbQ1yBaMwG2aN5JMaY3P+1/QsQkUkzemaMMDf
-zzXLa6ZFHMvoxn9jpoNDrq56G5Hiv9v2/IuaV1Eaot1//m1jO2aBXAVEcacm/xC7
-9GWNQfI6tg4dBi3zduv+Dt7DDxHkqmQPmXZh1Z2lNcXF2ecQHJDSNnRF6HKUV9rA
-UvPmcJeEuC70IBF+BwQXB8A+XZj1nLMSoOVBJJJ/Wh7LpBm6cj/zlNwYZIqvAvZp
-l/IYv2RtU05YLcvHSTdEx97DkMb+9HeohqyP2M7cE30g86slee1JoAvTjj74cG52
-6lpk3V4X2BggK+umreIHAe7LnqSOQSb9EB2ty67yoee6e7ycBEY=
-=1xA7
+klC+sg/8CndGGXHCAYExdhyls6xk/cFXRr2/K6Qkogk+mnSDof1MOQ4pD3S4r+0L
+PUNDVC9iQ2DgomO3XWg73YcVGJLEKLkcSuxqnqRmo7Q3kk6HvhMbiONYeU8oOl9x
+JbmyvP1yM8zZpjGmWRsmUYjLy4RA0y3ifm27GcjTKiRhD2kbvvhgdbkw12mJf9Ml
+7G2PuVF1UjPP6TcWyYVyzx+Evl/bNQHzDFJp+DT4zOSG2mIKgL2BPRtFyFzp7NAm
+K9euhDlDXC+dd/w6QC0IwwupSWBlP13VuCPl3njWZMmgoZayWxaz7gtmKcM4iTzT
+XpliUl+/vjF8PQ0NjeFDUsB2R+5lhX0UBpsyus/HQRrNHdV7OAcl+bfIvLo51gnL
+kP0YQ77Sn9LmWa+rqyynMx4cnukLNWNmQrPLNMbE1baQevUzIB7xdqB8/0NxhNNF
+0j4fsd3Pv2BDOBaEgunQd5vg+Q06MZSFVhZ6P2uQxRMTgxgOb+M/HsCEvWU6tDIf
+GyDryTKQx8SFQhQC6Ke/0CwmH6u+nbPEWIebBQHoj/jx2Ayt+j+xKCMLfdY5ZuhH
+6L0XOvx2ccOuCzJ1CdC5ICHi2WEeKKYn4BHwKt+YzHeSQ+0/ASZo1rGj6+Um5CBe
+tLtuR8zHnVv8mpdlPXSgRYFNnPQ7RciAp8a2ARxm5hM2REDOYEg=
+=MJd9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6145415cfb57..29b12457314e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Dec 2017 00:09:29 +0000
+Sun, 31 Dec 2017 21:39:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a445bae47a11..15b90dc6069a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 55bf644cdf9c..67d0c18dcb78 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-2.4.2.0 b/metadata/md5-cache/app-admin/ansible-2.4.2.0
index 0fc751dc2ddf..66544349ed7b 100644
--- a/metadata/md5-cache/app-admin/ansible-2.4.2.0
+++ b/metadata/md5-cache/app-admin/ansible-2.4.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=6
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.ansible.com/ansible/ansible-2.4.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be7bfb1f224af097cbbfb83ad15edd97
+_md5_=cdc9c27b303f6911b1e949d2d243cb52
diff --git a/metadata/md5-cache/app-admin/yadm-1.12.0 b/metadata/md5-cache/app-admin/yadm-1.12.0
new file mode 100644
index 000000000000..d441da27834b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/yadm-1.12.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=test? ( dev-tcltk/expect dev-util/bats dev-vcs/git )
+DESCRIPTION=A dotfile manager for the config files in your home folder
+EAPI=6
+HOMEPAGE=https://github.com/TheLocehiliosan/yadm/
+IUSE=zsh-completion test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-vcs/git app-crypt/gnupg zsh-completion? ( app-shells/gentoo-zsh-completions )
+SLOT=0
+SRC_URI=https://github.com/TheLocehiliosan/yadm/archive/1.12.0.tar.gz -> yadm-1.12.0.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=67499028640edf8ef15212e3a79f58a0
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 4c7c22874bd9..693365b9c1c6 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/afio-2.5.1-r1 b/metadata/md5-cache/app-arch/afio-2.5.1-r1
index af0afc2d4040..c9edddd9d51f 100644
--- a/metadata/md5-cache/app-arch/afio-2.5.1-r1
+++ b/metadata/md5-cache/app-arch/afio-2.5.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Afio creates cpio-format archives.
 EAPI=6
 HOMEPAGE=http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc sparc x86
 LICENSE=Artistic LGPL-2
 SLOT=0
 SRC_URI=http://members.chello.nl/k.holtman/afio-2.5.1.tgz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=34f1e0f0657d2923369f9bedb46978ff
+_md5_=f1efc7a31503530e477b15ccc125e601
diff --git a/metadata/md5-cache/app-arch/makeself-2.2.0-r2 b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
index 6ba6ea6235f0..603b53f64961 100644
--- a/metadata/md5-cache/app-arch/makeself-2.2.0-r2
+++ b/metadata/md5-cache/app-arch/makeself-2.2.0-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=shell script that generates a self-extractible tar.gz
 EAPI=6
 HOMEPAGE=http://www.megastep.org/makeself/
-KEYWORDS=~amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=6b59c8d6d4b979b86b7135f98ed67a08
+_md5_=627437b6e7502c515d12b421f58a674d
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index dc4f41827177..42321224bb7c 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.4 b/metadata/md5-cache/app-backup/borgbackup-1.1.4
new file mode 100644
index 000000000000..9174469e67db
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=6
+HOMEPAGE=https://borgbackup.readthedocs.io/
+IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.4.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_=279c888c7ce027bc0ea162b0782ecd4e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 0de7cb916efa..3becb4bcefcc 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/xen-4.9.1-r1 b/metadata/md5-cache/app-emulation/xen-4.9.1-r1
new file mode 100644
index 000000000000..ca677405a2d6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.9.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=custom-cflags debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.9.1
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=485062dc2fffb2e71e5fb3df512d51bb
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
new file mode 100644
index 000000000000..89e751cce8a4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=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-kernel/linux-headers-4.11 dev-python/lxml[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(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[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(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[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-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=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-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.9
+SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-10.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=04a4d3b69d613b158030093c78c09cb6
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 5a4d3a87ba2d..96c55cf662db 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.17 b/metadata/md5-cache/app-i18n/ibus-1.5.17
new file mode 100644
index 000000000000..3675cea73a5a
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare test
+DEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( 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(-)] dev-python/pygobject:3[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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) dev-util/intltool virtual/pkgconfig emoji? ( app-i18n/unicode-cldr app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) >=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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
+EAPI=6
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( 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(-)] dev-python/pygobject:3[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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
+REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk introspection ) test? ( gtk ) vala? ( introspection )
+SLOT=0
+SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.17/ibus-1.5.17.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6cb5fe5d3feed7c955f8dc3b61c4d933
diff --git a/metadata/md5-cache/app-i18n/scim-hangul-0.3.2 b/metadata/md5-cache/app-i18n/scim-hangul-0.3.2
deleted file mode 100644
index 60501717382c..000000000000
--- a/metadata/md5-cache/app-i18n/scim-hangul-0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Hangul IMEngine for SCIM ported from imhangul
-EAPI=2
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-hangul-0.3.2.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5ff022396db869482cdb050ca928b556
diff --git a/metadata/md5-cache/app-i18n/scim-hangul-0.4.0 b/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
index 04eff9024ae2..553ef7137633 100644
--- a/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
+++ b/metadata/md5-cache/app-i18n/scim-hangul-0.4.0
@@ -1,13 +1,12 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
+DEFINED_PHASES=configure install postinst
+DEPEND=>=app-i18n/scim-0.99.8 >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=Hangul IMEngine for SCIM ported from imhangul
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.scim-im.org/
 IUSE=nls
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl )
+RDEPEND=>=app-i18n/scim-0.99.8 >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-hangul-0.4.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b3858890e71bd8a9a49b242dc0cdca2e
+_md5_=98a0cd78a792fd33b38b32cdb6b129a8
diff --git a/metadata/md5-cache/app-i18n/scim-sayura-0.3.3 b/metadata/md5-cache/app-i18n/scim-sayura-0.3.3
index d86723997692..01bb7acb4a3d 100644
--- a/metadata/md5-cache/app-i18n/scim-sayura-0.3.3
+++ b/metadata/md5-cache/app-i18n/scim-sayura-0.3.3
@@ -1,7 +1,7 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
 DEPEND=>=app-i18n/scim-0.99.8 virtual/pkgconfig
 DESCRIPTION=Sayura Sinhala input method for SCIM
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.sayura.net/im/
 IUSE=doc
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,4 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-0.99.8
 SLOT=0
 SRC_URI=http://www.sayura.net/im/scim-sayura-0.3.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a19b82068f092c03998cab8d51023eaa
+_md5_=8c68e5a64bc03d197371f046b40b9987
diff --git a/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r2 b/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r2
index eab327aafbd6..368b25a6a2f5 100644
--- a/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r2
+++ b/metadata/md5-cache/app-i18n/scim-uim-0.2.0-r2
@@ -1,12 +1,11 @@
-DEFINED_PHASES=install postinst prepare
+DEFINED_PHASES=configure install postinst
 DEPEND=>=app-i18n/uim-1.5.0 >=app-i18n/scim-1.4.0 virtual/pkgconfig
 DESCRIPTION=An input module for Smart Common Input Method (SCIM) which uses uim as backend
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.scim-im.org/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-i18n/uim-1.5.0 >=app-i18n/scim-1.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/scim/scim-uim-0.2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=722c953d66c3732fb37d2f47dfd3cb91
+_md5_=e5f2027a5b8adeee3760cf701645204a
diff --git a/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1 b/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1
index bfc7783f8ca9..1ebc935e791a 100644
--- a/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1
+++ b/metadata/md5-cache/app-i18n/scim-wijesekera-0.3.3-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=>=app-i18n/scim-0.99.8[-gtk3] 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
 DESCRIPTION=Wijesekara keyboard for Sinhala input using scim
-EAPI=2
+EAPI=6
 HOMEPAGE=http://sinhala.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-i18n/scim-0.99.8[-gtk3]
 SLOT=0
 SRC_URI=http://sinhala.sourceforge.net/files/scim-wijesekera-0.3.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c0dc32854bd9f7d7b89fdf9c9fd1c9f9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=1292bc2519c1ad58543996fde6499e25
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 48f254761eb7..789ddd204233 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r1 b/metadata/md5-cache/app-misc/dvtm-0.15-r1
new file mode 100644
index 000000000000..9744c746e88b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
+DESCRIPTION=Dynamic virtual terminal manager
+EAPI=6
+HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
+IUSE=savedconfig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/ncurses:0=[unicode]
+SLOT=0
+SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=14de22164adb9714fb27fe09046ad864
diff --git a/metadata/md5-cache/app-misc/dvtm-9999 b/metadata/md5-cache/app-misc/dvtm-9999
index 4e4627b1fcde..b86162208fde 100644
--- a/metadata/md5-cache/app-misc/dvtm-9999
+++ b/metadata/md5-cache/app-misc/dvtm-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=sys-libs/ncurses:0=[unicode?] >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Dynamic virtual terminal manager
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
-IUSE=unicode savedconfig
+IUSE=savedconfig
 LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode?]
+RDEPEND=sys-libs/ncurses:0=[unicode]
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=396d1d68e56e4277da056a6fcda75950
+_md5_=d78dec236a0356e54cacb3e6de0d4544
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.1 b/metadata/md5-cache/app-misc/xmind-3.7.6
index 1bbc04c9f1f6..48e0d0852c1d 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.1
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update1-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
+SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update6-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c761966afc81a74e8ac33b63df31361c
+_md5_=c4933b47b2ce2b0e5ee1636214ef5e3b
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index acd05dac96a0..0d7e278d1134 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.5 b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
new file mode 100644
index 000000000000..942e9cdd8acb
--- /dev/null
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst unpack
+DEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 dev-lang/python:2.7 >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw x11-libs/libXinerama sys-apps/findutils >=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Apache OpenOffice productivity suite
+EAPI=5
+HOMEPAGE=https://www.openoffice.org/
+IUSE=gnome java linguas_ast linguas_eu linguas_bg linguas_ca linguas_ca_XV linguas_zh_CN linguas_zh_TW linguas_cs linguas_da linguas_nl linguas_en_GB linguas_fi linguas_fr linguas_gd linguas_gl linguas_de linguas_el linguas_he linguas_hi linguas_hu linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_nb linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sr linguas_sk linguas_sl linguas_es linguas_sv linguas_ta linguas_th linguas_tr linguas_vi
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+PDEPEND=java? ( >=virtual/jre-1.5 )
+RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 dev-lang/python:2.7 >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw x11-libs/libXinerama
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_install-rpm_en-US.tar.gz ) linguas_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ast.tar.gz ) ) linguas_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_eu.tar.gz ) ) linguas_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_bg.tar.gz ) ) linguas_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca.tar.gz ) ) linguas_ca_XV? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) linguas_zh_CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) linguas_zh_TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) linguas_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_cs.tar.gz ) ) linguas_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_da.tar.gz ) ) linguas_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nl.tar.gz ) ) linguas_en_GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) linguas_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fi.tar.gz ) ) linguas_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fr.tar.gz ) ) linguas_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gd.tar.gz ) ) linguas_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gl.tar.gz ) ) linguas_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_de.tar.gz ) ) linguas_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_el.tar.gz ) ) linguas_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_he.tar.gz ) ) linguas_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hi.tar.gz ) ) linguas_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hu.tar.gz ) ) linguas_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_it.tar.gz ) ) linguas_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ja.tar.gz ) ) linguas_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_km.tar.gz ) ) linguas_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ko.tar.gz ) ) linguas_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_lt.tar.gz ) ) linguas_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nb.tar.gz ) ) linguas_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pl.tar.gz ) ) linguas_pt_BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) linguas_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt.tar.gz ) ) linguas_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ru.tar.gz ) ) linguas_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sr.tar.gz ) ) linguas_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sk.tar.gz ) ) linguas_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sl.tar.gz ) ) linguas_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_es.tar.gz ) ) linguas_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sv.tar.gz ) ) linguas_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ta.tar.gz ) ) linguas_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_th.tar.gz ) ) linguas_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_tr.tar.gz ) ) linguas_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_vi.tar.gz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54202d5383c060ca9bf12c4db9b5ea8d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 34be3aa69271..4b2856b56833 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/coolreader-3.1.2.71-r2 b/metadata/md5-cache/app-text/coolreader-3.1.2.71-r3
index c594cfb99401..792a227394f0 100644
--- a/metadata/md5-cache/app-text/coolreader-3.1.2.71-r2
+++ b/metadata/md5-cache/app-text/coolreader-3.1.2.71-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/crengine/
 IUSE=wxwidgets
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
+RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/coolreader-3.1.2.71.tar.bz2
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=77694fcf0aff480954b6a5a6d877c70d
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=edc79bb07bf6aebd7c3bc3d3461a2fc7
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.3 b/metadata/md5-cache/app-text/dvisvgm-2.3
new file mode 100644
index 000000000000..71cac65720c1
--- /dev/null
+++ b/metadata/md5-cache/app-text/dvisvgm-2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
+DESCRIPTION=Converts DVI files to SVG
+EAPI=6
+HOMEPAGE=http://dvisvgm.bplaced.net/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.3/dvisvgm-2.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=10bb3775327eed44602f56bad134d785
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
new file mode 100644
index 000000000000..b1acf03bf10f
--- /dev/null
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -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 configurable HTML Minifier with safety features
+EAPI=6
+HOMEPAGE=https://github.com/mankyd/htmlmin
+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/setuptools[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/h/htmlmin/htmlmin-0.1.12.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_=d8987265fa044da3d537d52a8922ec2f
diff --git a/metadata/md5-cache/app-text/pdf2htmlEX-0.14.6.2 b/metadata/md5-cache/app-text/pdf2htmlEX-0.14.6.2
new file mode 100644
index 000000000000..ff39658b8c52
--- /dev/null
+++ b/metadata/md5-cache/app-text/pdf2htmlEX-0.14.6.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] app-text/poppler-data ~media-gfx/fontforge-20170731 media-libs/freetype x11-libs/cairo[svg] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A precise PDF to HTML converter
+EAPI=6
+HOMEPAGE=http://coolwanglu.github.io/pdf2htmlEX/
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] app-text/poppler-data ~media-gfx/fontforge-20170731 media-libs/freetype x11-libs/cairo[svg]
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/pdf2htmlEX-0.14.6.2.tgz
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c94e56967156f3037f026a308376d30
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.4 b/metadata/md5-cache/app-text/xiphos-4.0.4
deleted file mode 100644
index d454708c642f..000000000000
--- a/metadata/md5-cache/app-text/xiphos-4.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-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-text/sword-1.7.4 >=dev-libs/glib-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(+)] dev-libs/libxml2[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(+)] gnome-base/gconf[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(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:3 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[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/rarian dev-libs/libxslt[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-util/intltool net-libs/biblesync virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=5
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug python_targets_python2_7
-KEYWORDS=amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-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/sword-1.7.4 >=dev-libs/glib-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(+)] dev-libs/libxml2[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(+)] gnome-base/gconf[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(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:3 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/gnomesword/xiphos-4.0.4-20150830.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6ff5765f8c8898692bd5cd4afb22afb
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.4-r1 b/metadata/md5-cache/app-text/xiphos-4.0.4-r1
deleted file mode 100644
index 9affef991000..000000000000
--- a/metadata/md5-cache/app-text/xiphos-4.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-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-text/sword-1.7.4 >=dev-libs/glib-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(+)] dev-libs/libxml2[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(+)] gnome-base/gconf[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(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[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/rarian dev-libs/libxslt[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-util/intltool net-libs/biblesync virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=5
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-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/sword-1.7.4 >=dev-libs/glib-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(+)] dev-libs/libxml2[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(+)] gnome-base/gconf[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(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/gnomesword/xiphos-4.0.4-20150830.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2256ce4ec103d1e61e97f660cf899be5
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 4277c26f946e..1f29487f6113 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/xtrabackup-bin-2.4.9 b/metadata/md5-cache/dev-db/xtrabackup-bin-2.4.9
new file mode 100644
index 000000000000..787c92a55179
--- /dev/null
+++ b/metadata/md5-cache/dev-db/xtrabackup-bin-2.4.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/percona-xtrabackup
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libaio dev-libs/libgcrypt:11/11 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib
+SLOT=0
+SRC_URI=amd64? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.9/binary/tarball/percona-xtrabackup-2.4.9-Linux-x86_64.tar.gz ) x86? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.9/binary/tarball/percona-xtrabackup-2.4.9-Linux-i686.tar.gz )
+_md5_=4ea4b8f75aea7954c725c419dcbe1fff
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f4542c72aead..20f99fa79f64 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016 b/metadata/md5-cache/dev-lang/gnat-gpl-2016
index a51fd1bb24eb..64fce984187e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016
@@ -4,7 +4,7 @@ DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
 IUSE=bootstrap regression-test vanilla altivec debug nopie nossp doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv +nls +nptl +cxx +fortran +openmp +sanitize
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain	72bea31d3ade03fc0e5110c5be08cdf9	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1c35ba153fba63ed53c87ce8b857fcb8
+_md5_=7b28929078bd0245c5e0891bda13b365
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c65eee8b83df..87dae3938225 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.170-r1 b/metadata/md5-cache/dev-libs/elfutils-0.170-r1
index 6a7192d1b904..783152838800 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.170-r1
+++ b/metadata/md5-cache/dev-libs/elfutils-0.170-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=6
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 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-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 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(-)?] 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(-)?] ) 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(-)?] ) !dev-libs/libelf
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.170/elfutils-0.170.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=22bb164dccc3cfd7ecbc5f020799653b
+_md5_=5e65247b3df1e0304ec12515b4409346
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.3 b/metadata/md5-cache/dev-libs/iksemel-1.3
deleted file mode 100644
index 023cf9af6c82..000000000000
--- a/metadata/md5-cache/dev-libs/iksemel-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=gnutls? ( net-libs/gnutls ) gnutls? ( 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
-DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applications
-EAPI=2
-HOMEPAGE=https://github.com/meduketto/iksemel
-IUSE=gnutls
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=gnutls? ( net-libs/gnutls )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://iksemel.googlecode.com/files/iksemel-1.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=27b1528491f5220510e7aaff2d9ca80d
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.4 b/metadata/md5-cache/dev-libs/iksemel-1.4
deleted file mode 100644
index c558bf710660..000000000000
--- a/metadata/md5-cache/dev-libs/iksemel-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( net-libs/gnutls ) ssl? ( 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
-DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applications
-EAPI=2
-HOMEPAGE=https://github.com/meduketto/iksemel
-IUSE=ssl
-KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( net-libs/gnutls )
-SLOT=0
-SRC_URI=https://iksemel.googlecode.com/files/iksemel-1.4.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4ec6790915813f763c5fc1e155ee7d6c
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.4-r1 b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
index 01ca1c7e03c1..fe2cd3f5e77b 100644
--- a/metadata/md5-cache/dev-libs/iksemel-1.4-r1
+++ b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( net-libs/gnutls ) ssl? ( 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
+DEPEND=ssl? ( net-libs/gnutls:= ) ssl? ( 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
 DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applications
 EAPI=6
 HOMEPAGE=https://github.com/meduketto/iksemel
-IUSE=ssl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+IUSE=ssl static-libs
+KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=ssl? ( net-libs/gnutls )
+RDEPEND=ssl? ( net-libs/gnutls:= )
 SLOT=0
 SRC_URI=https://iksemel.googlecode.com/files/iksemel-1.4.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c11d9626c714abd6a7e2e6f52090a370
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=e6dabf9282709f07b762bdf65537a947
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.0 b/metadata/md5-cache/dev-libs/log4cpp-1.0
deleted file mode 100644
index 9a6a87b05eee..000000000000
--- a/metadata/md5-cache/dev-libs/log4cpp-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=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=C++ classes for flexible logging to files, syslog and other destinations
-EAPI=2
-HOMEPAGE=http://log4cpp.sourceforge.net/
-IUSE=doc
-KEYWORDS=amd64 ~arm ppc s390 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8297d9632c1b458b2973e8ac0bf064d2
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1 b/metadata/md5-cache/dev-libs/log4cpp-1.1
index 6c7e290504f8..705723fc271c 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( app-doc/doxygen ) >=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=C++ classes for flexible logging to files, syslog and other destinations
-EAPI=5
+EAPI=6
 HOMEPAGE=http://log4cpp.sourceforge.net/
 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=~amd64 ~arm ~ppc ~s390 ~x86
+KEYWORDS=amd64 ~arm ppc s390 x86
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6832e87159258a9dd340e23bafbd97ba
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=90926059097b1cbb74bc050d04800006
diff --git a/metadata/md5-cache/dev-libs/mdsplib-0.11 b/metadata/md5-cache/dev-libs/mdsplib-0.11
index 8287a3895803..3194ffdc9aa2 100644
--- a/metadata/md5-cache/dev-libs/mdsplib-0.11
+++ b/metadata/md5-cache/dev-libs/mdsplib-0.11
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile configure install
 DESCRIPTION=METAR Decoder Software Package Library
-EAPI=2
+EAPI=6
 HOMEPAGE=http://limulus.net/mdsplib/
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://limulus.net/mdsplib/mdsplib-0.11.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b30c6f9152e4848f94c9e45402c95173
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=dbc181ea3863646b84a622dac37c1f5c
diff --git a/metadata/md5-cache/dev-libs/mm-1.4.2-r2 b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
index c5cdc05b4025..d7eac4f7770b 100644
--- a/metadata/md5-cache/dev-libs/mm-1.4.2-r2
+++ b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst prepare test
+DEFINED_PHASES=configure install prepare test
 DESCRIPTION=Shared Memory Abstraction Library
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/mm/
@@ -6,4 +6,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=mm
 SLOT=1.2
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/mm/mm-1.4.2.tar.gz
-_md5_=bb42c8d85f590f4658f24afe45beb3b5
+_md5_=4e30711d8c435560f3a141c5e6bf9a26
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2k b/metadata/md5-cache/dev-libs/openssl-1.0.2k
deleted file mode 100644
index fca25356c915..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2k
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=5
-HOMEPAGE=http://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2k.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8f2185c5b5d253bbfdc19980b4a97ba1
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2l b/metadata/md5-cache/dev-libs/openssl-1.0.2l
deleted file mode 100644
index 4a2d06714051..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2l
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=5
-HOMEPAGE=http://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2l.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0f08b6745730b86836c4d84f0d5dea08
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2l-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.2l-r1
deleted file mode 100644
index 9ca267608d3c..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2l-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=5
-HOMEPAGE=http://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2l.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2l_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2l_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2l_ectest.c )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1f9b4041c6433b4053c17b29e96433aa
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2m b/metadata/md5-cache/dev-libs/openssl-1.0.2m
deleted file mode 100644
index 420d811cd5c1..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2m
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=5
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2m.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=366a5727ecc1136af6d6c0fd650050e6
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2n b/metadata/md5-cache/dev-libs/openssl-1.0.2n
index bf03ab772f69..0a0180955bf4 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2n
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2n
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=6
 HOMEPAGE=https://www.openssl.org/
 IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2n.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5a507275f7826dceb3d8ce151d92efb8
+_md5_=f6ecf5f13e698b94ae23e57df9875f90
diff --git a/metadata/md5-cache/dev-libs/pslib-0.4.5 b/metadata/md5-cache/dev-libs/pslib-0.4.5
index 7b6c4b2d7912..80710d96a69d 100644
--- a/metadata/md5-cache/dev-libs/pslib-0.4.5
+++ b/metadata/md5-cache/dev-libs/pslib-0.4.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=png? ( >=media-libs/libpng-1.2.43-r2:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) dev-lang/perl >=dev-libs/glib-2 dev-util/intltool dev-perl/XML-Parser >=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
+DEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) dev-lang/perl >=dev-libs/glib-2 dev-util/intltool dev-perl/XML-Parser >=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=pslib is a C-library to create PostScript files on the fly
-EAPI=4
+EAPI=6
 HOMEPAGE=http://pslib.sourceforge.net/
 IUSE=debug jpeg png static-libs tiff
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=png? ( >=media-libs/libpng-1.2.43-r2:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff )
+RDEPEND=png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/pslib/pslib-0.4.5.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3d78f4380ac8e34ff72c2882712bc90b
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=e6206aa6f83d8ccc0e04b5e6c1fcfd1c
diff --git a/metadata/md5-cache/dev-libs/rlog-1.4 b/metadata/md5-cache/dev-libs/rlog-1.4
index 9c35678a9c74..7e98ef6115b3 100644
--- a/metadata/md5-cache/dev-libs/rlog-1.4
+++ b/metadata/md5-cache/dev-libs/rlog-1.4
@@ -1,10 +1,11 @@
 DEFINED_PHASES=install prepare
+DEPEND=>=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 C++ logging library
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.arg0.net/rlog
 KEYWORDS=amd64 ~arm ~ppc sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://rlog.googlecode.com/files/rlog-1.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7adf03d0b80d6a0528a98848879b2087
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=606ed9c34d7396772cfeacc4b0db5722
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-epi-0.54.2 b/metadata/md5-cache/dev-libs/xmlrpc-epi-0.54.2
index 43adf8cc54e1..ca97f0c6b3b3 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-epi-0.54.2
+++ b/metadata/md5-cache/dev-libs/xmlrpc-epi-0.54.2
@@ -1,13 +1,12 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/expat
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/expat:=
 DESCRIPTION=Epinions implementation of XML-RPC protocol in C
-EAPI=2
+EAPI=6
 HOMEPAGE=http://xmlrpc-epi.sourceforge.net/
-IUSE=examples static-libs
+IUSE=static-libs
 KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Epinions
-RDEPEND=dev-libs/expat
+RDEPEND=dev-libs/expat:=
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlrpc-epi/xmlrpc-epi-0.54.2.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8660b24620c6288156455b34730addc7
+_md5_=4d34e5fde4d187da80a0fdb56c6c31da
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index a0e2b4534241..fba09bfe7fed 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.3 b/metadata/md5-cache/dev-lisp/sbcl-1.4.3
new file mode 100644
index 000000000000..9f2f36af722e
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/elfix )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode pax_kernel zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/1.4.3
+SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.3-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=97ffbc6b7ff2bbbab60312948bb6a48b
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.600.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.600.0
new file mode 100644
index 000000000000..ccbfd6c43e88
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.600.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-MockModule >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
+DESCRIPTION=A wrapper that lets you read Zip archive members as if they were files
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Archive-Zip/
+IUSE=test examples
+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 ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=2817f84bda12767577c432995ace15ec
diff --git a/metadata/md5-cache/dev-perl/Audio-Scan-0.990.0 b/metadata/md5-cache/dev-perl/Audio-Scan-0.990.0
new file mode 100644
index 000000000000..e1eac5ca5803
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Audio-Scan-0.990.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Warn ) dev-lang/perl:=
+DESCRIPTION=Fast C metadata and tag reader for all common audio file formats
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Audio-Scan/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-0.99.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=1fccbaacc2ea0c1fca48047d62ba4cbe
diff --git a/metadata/md5-cache/dev-perl/RadiusPerl-0.220.0-r1 b/metadata/md5-cache/dev-perl/Authen-Radius-0.220.0-r1
index ac21dc7e3091..f93d601a96ae 100644
--- a/metadata/md5-cache/dev-perl/RadiusPerl-0.220.0-r1
+++ b/metadata/md5-cache/dev-perl/Authen-Radius-0.220.0-r1
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.12 >=dev-perl/Data
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANOWAR/RadiusPerl-0.22.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=f977af83d9854400339e18e5caa2998c
+_md5_=cf34ab821718230c543c9a67d2ea7fa8
diff --git a/metadata/md5-cache/dev-perl/Authen-Radius-0.260.0 b/metadata/md5-cache/dev-perl/Authen-Radius-0.260.0
new file mode 100644
index 000000000000..517c270d1f1a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Authen-Radius-0.260.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( dev-perl/Test-NoWarnings virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Communicate with a Radius server from Perl
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Authen-Radius/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=Artistic-2
+RDEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.26.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=6e126dfd30ff9ad22671fbd48be14920
diff --git a/metadata/md5-cache/dev-perl/Bio-Graphics-2.400.0 b/metadata/md5-cache/dev-perl/Bio-Graphics-2.400.0
index 8e27623baf69..3e48ec89559b 100644
--- a/metadata/md5-cache/dev-perl/Bio-Graphics-2.400.0
+++ b/metadata/md5-cache/dev-perl/Bio-Graphics-2.400.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/GD-2.300.0 >=dev-perl/Statistics-Descriptive-2.600.0 >=sci-biology/bioperl-1.5.9.1 dev-perl/CGI >=dev-perl/Module-Build-0.420.0 dev-lang/perl:=
+DEPEND=>=dev-perl/GD-2.300.0 dev-perl/CGI || ( >=dev-perl/Bio-Coordinate-1.7.1 <=sci-biology/bioperl-1.6.924 ) >=dev-perl/Statistics-Descriptive-2.600.0 >=sci-biology/bioperl-1.5.9.1 dev-perl/CGI >=dev-perl/Module-Build-0.420.0 dev-lang/perl:=
 DESCRIPTION=Generate images from Bio::Seq objects for visualization purposes
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Bio-Graphics/
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/GD-2.300.0 >=dev-perl/Statistics-Descriptive-2.600.0 >=sci-biology/bioperl-1.5.9.1 dev-perl/CGI dev-lang/perl:=
+RDEPEND=>=dev-perl/GD-2.300.0 dev-perl/CGI || ( >=dev-perl/Bio-Coordinate-1.7.1 <=sci-biology/bioperl-1.6.924 ) >=dev-perl/Statistics-Descriptive-2.600.0 >=sci-biology/bioperl-1.5.9.1 dev-perl/CGI dev-lang/perl:=
 SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/Bio-Graphics-2.40.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=310acfb535a213c33d305dd4e64dc5b7
+_md5_=ec951c09ac60ba617ec6162cce41df85
diff --git a/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0 b/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0
index 6d24bf62b995..c08a1104ef64 100644
--- a/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0
+++ b/metadata/md5-cache/dev-perl/Business-ISSN-1.2.0
@@ -8,5 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.002.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=784678680d0823cacfada54e585f35a1
+_md5_=db863570f1d44fc436778a8cd404586b
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 298a46db8a35..fc34cdc0361d 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.800.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.800.0
new file mode 100644
index 000000000000..2698f1a91f1d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.800.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtual/perl-Module-Load-0.240.0 >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/XML-LibXML-1.850.0 >=dev-perl/XML-Parser-2.310.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl:=
+DESCRIPTION=An implementation of XML-RPC
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/RPC-XML/
+IUSE=test examples
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=|| ( Artistic-2 LGPL-2.1 )
+RDEPEND=>=virtual/perl-File-Spec-0.800.0 >=dev-perl/libwww-perl-5.834.0 >=virtual/perl-Module-Load-0.240.0 >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/XML-LibXML-1.850.0 >=dev-perl/XML-Parser-2.310.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=76875e06b340bfb4f1f2eb8ca595a969
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 0b0a84b97028..38bb3b0e94d7 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.8-r1 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.8-r1
new file mode 100644
index 000000000000..4ab43faf3700
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=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 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=Stripped down version of APC supporting only user cache
+EAPI=6
+HOMEPAGE=https://pecl.php.net/apcu
+IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/apcu-5.1.8.tgz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=13d15dc9970370311c87710caa060cce
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 6751ecd272a0..a2ef834957d2 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/castellan-0.12.0 b/metadata/md5-cache/dev-python/castellan-0.12.0
deleted file mode 100644
index 2321c9837259..000000000000
--- a/metadata/md5-cache/dev-python/castellan-0.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Generic Key Manager interface for OpenStack
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/castellan
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/c/castellan/castellan-0.12.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_=f72869f05ac881e664147b55e696f4bf
diff --git a/metadata/md5-cache/dev-python/castellan-0.12.1 b/metadata/md5-cache/dev-python/castellan-0.12.1
index 22f73e02da56..3b2ff5883698 100644
--- a/metadata/md5-cache/dev-python/castellan-0.12.1
+++ b/metadata/md5-cache/dev-python/castellan-0.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Generic Key Manager interface for OpenStack
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/castellan
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/castellan/castellan-0.12.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_=6f19b97c8d4c7474ef4284ebb7574e9e
+_md5_=f72869f05ac881e664147b55e696f4bf
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1 b/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1
index abf0412edb15..46196d63bdc5 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-1.2.1
@@ -1,5 +1,5 @@
 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(-)]
+DEPEND=app-text/htmlmin dev-python/flask dev-python/setuptools[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(-)]
 DESCRIPTION=Minimize your flask rendered html
 EAPI=6
 HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-1.2.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_=13fb95356aeb9b4358f78e341002d7b9
+_md5_=e6166b84c6533a95bd8a2032c5df80fb
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.3.1 b/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
index cc5cc7a641b1..23caa47e877e 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=python implementation of the JSON-RPC spec (1.0 and 2.0)
 EAPI=6
 HOMEPAGE=https://github.com/tcalmant/jsonrpclib
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~mips ~x86
+KEYWORDS=amd64 ~arm ~mips x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson 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=https://github.com/tcalmant/jsonrpclib/archive/v0.3.1.tar.gz -> jsonrpclib-0.3.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_=d3dcc09a28153770bb4947050e72f334
+_md5_=2ba2a0ce6f12f1499e1764d5a333bf37
diff --git a/metadata/md5-cache/dev-python/oslo-cache-1.25.0 b/metadata/md5-cache/dev-python/oslo-cache-1.25.0
deleted file mode 100644
index e12edf2b0680..000000000000
--- a/metadata/md5-cache/dev-python/oslo-cache-1.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Oslo Caching around dogpile.cache
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.cache/oslo.cache-1.25.0.tar.gz -> oslo-cache-1.25.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94804ba080dedaf756e0830b87490e3f
diff --git a/metadata/md5-cache/dev-python/oslo-cache-1.25.1 b/metadata/md5-cache/dev-python/oslo-cache-1.25.1
index f60e9669789c..83858384bc47 100644
--- a/metadata/md5-cache/dev-python/oslo-cache-1.25.1
+++ b/metadata/md5-cache/dev-python/oslo-cache-1.25.1
@@ -4,11 +4,11 @@ DESCRIPTION=Oslo Caching around dogpile.cache
 EAPI=6
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.cache/oslo.cache-1.25.1.tar.gz -> oslo-cache-1.25.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9994619dae5927008e4c182f8c978453
+_md5_=94804ba080dedaf756e0830b87490e3f
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.22.0 b/metadata/md5-cache/dev-python/oslo-privsep-1.22.0
deleted file mode 100644
index b1f94d89e390..000000000000
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 test? ( >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstackdocstheme-1.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=OpenStack library for privilege separation.
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/oslo.privsep
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.22.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_=9e0d6648370bfaa69ad95c78569cf147
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.22.1 b/metadata/md5-cache/dev-python/oslo-privsep-1.22.1
index 098230e39887..ddd2a9666c69 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.22.1
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.22.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenStack library for privilege separation.
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/oslo.privsep
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.22.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_=7a8b5df612f0d18992b927a992dc4e4a
+_md5_=e3802f03550ac7a9939d34df46d5a14e
diff --git a/metadata/md5-cache/dev-python/oslo-reports-1.17.0 b/metadata/md5-cache/dev-python/oslo-reports-1.17.0
deleted file mode 100644
index 053074c8103b..000000000000
--- a/metadata/md5-cache/dev-python/oslo-reports-1.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=generified reports for openstack
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/oslo.reports
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.17.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_=e7c02e5ef6ba21d75d403b6a86a30465
diff --git a/metadata/md5-cache/dev-python/oslo-reports-1.17.1 b/metadata/md5-cache/dev-python/oslo-reports-1.17.1
index 7651bc407ad0..7d3b35f4331c 100644
--- a/metadata/md5-cache/dev-python/oslo-reports-1.17.1
+++ b/metadata/md5-cache/dev-python/oslo-reports-1.17.1
@@ -4,11 +4,11 @@ DESCRIPTION=generified reports for openstack
 EAPI=6
 HOMEPAGE=http://docs.openstack.org/developer/oslo.reports
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.17.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_=d7ddf059f762db89d1ed6ac7f6404dbb
+_md5_=eb886e87398b5681d22aa8b2547553b8
diff --git a/metadata/md5-cache/dev-python/oslo-reports-1.22.0 b/metadata/md5-cache/dev-python/oslo-reports-1.22.0
deleted file mode 100644
index 6220bb0bf397..000000000000
--- a/metadata/md5-cache/dev-python/oslo-reports-1.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=generified reports for openstack
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/oslo.reports
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.22.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_=7c7ceb8b533bd95a5b866a6d9f716c44
diff --git a/metadata/md5-cache/dev-python/oslo-reports-1.22.1 b/metadata/md5-cache/dev-python/oslo-reports-1.22.1
index bb7bd0fcb68e..5814a3ef5950 100644
--- a/metadata/md5-cache/dev-python/oslo-reports-1.22.1
+++ b/metadata/md5-cache/dev-python/oslo-reports-1.22.1
@@ -4,11 +4,11 @@ DESCRIPTION=generified reports for openstack
 EAPI=6
 HOMEPAGE=http://docs.openstack.org/developer/oslo.reports
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.22.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_=4298b7f2edb7d844751c0e435087aa16
+_md5_=7c7ceb8b533bd95a5b866a6d9f716c44
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.19.0 b/metadata/md5-cache/dev-python/oslo-service-1.19.0
deleted file mode 100644
index c9d8df1ffaba..000000000000
--- a/metadata/md5-cache/dev-python/oslo-service-1.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-4.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/doc8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Library for running OpenStack services
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/oslo.service
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.19.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_=bf059d86ade94988480ab7fd1cafb85d
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.19.1 b/metadata/md5-cache/dev-python/oslo-service-1.19.1
index aa0104b029ea..5e64044e4300 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.19.1
+++ b/metadata/md5-cache/dev-python/oslo-service-1.19.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for running OpenStack services
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/oslo.service
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.19.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_=cb0f710f688bc594dbb67c6f6c5f89c8
+_md5_=bf059d86ade94988480ab7fd1cafb85d
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.25.0 b/metadata/md5-cache/dev-python/oslo-service-1.25.0
deleted file mode 100644
index 1cfa0c071ca2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-service-1.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstackdocstheme-1.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/doc8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Library for running OpenStack services
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/oslo.service
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.25.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_=be26ea28e5a58c5c9d7ff210f63c0c7a
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.25.1 b/metadata/md5-cache/dev-python/oslo-service-1.25.1
index 94bd5170b039..f6febdb06560 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.25.1
+++ b/metadata/md5-cache/dev-python/oslo-service-1.25.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for running OpenStack services
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/oslo.service
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.25.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_=b1f009bf98e63a356993f687136b613f
+_md5_=5d74bf22d0c7a6c039c4ffddea748582
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.0 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.0
deleted file mode 100644
index 4b557f210df0..000000000000
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A library that provides a generic versioned and RPC-friendly object model.
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.26.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_=58a1c899c30122b6f3a64fcab3f566a9
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.1 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.1
index cf0fe64f821a..100c4ccb6d74 100644
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.1
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.26.1
@@ -4,11 +4,11 @@ DESCRIPTION=A library that provides a generic versioned and RPC-friendly object
 EAPI=6
 HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.26.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_=1d762b6c167111a65c062d84ef66a68b
+_md5_=58a1c899c30122b6f3a64fcab3f566a9
diff --git a/metadata/md5-cache/dev-python/oslotest-2.17.1 b/metadata/md5-cache/dev-python/oslotest-2.17.1
index 21be4d4824f4..b81a374af0b5 100644
--- a/metadata/md5-cache/dev-python/oslotest-2.17.1
+++ b/metadata/md5-cache/dev-python/oslotest-2.17.1
@@ -4,11 +4,11 @@ DESCRIPTION=Oslo test framework
 EAPI=5
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/fixtures-3.0.0[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(-)] >=dev-python/subunit-0.0.18[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(-)] >=dev-python/six-1.9.0[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(-)] >=dev-python/testrepository-0.0.18[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(-)] >=dev-python/testtools-1.4.0[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(-)] >=dev-python/mock-2.0[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(-)] >=dev-python/mox3-0.7.0[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(-)] !~dev-python/mox3-0.19.0[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(-)] >=dev-python/os-client-config-1.28.0[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(-)] >=dev-python/debtcollector-1.2.0[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/o/oslotest/oslotest-2.17.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d3586ef9261e027ee01eed430cecfa3
+_md5_=a8acc8722a58641d54633e8121e0915a
diff --git a/metadata/md5-cache/dev-python/pygresql-5.0.4 b/metadata/md5-cache/dev-python/pygresql-5.0.4
index ef2e5790b6e7..14c712897ab0 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.0.4
+++ b/metadata/md5-cache/dev-python/pygresql-5.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Python interface for the PostgreSQL database
 EAPI=6
 HOMEPAGE=http://www.pygresql.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc sparc x86
 LICENSE=POSTGRESQL
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) 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 )
+REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.0.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	postgres	c59d58664169a60e232dd018eae69172	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06246d995f6a1851d04d748afb0f5eed
+_md5_=4393ae02784014dff0075361c51a5f10
diff --git a/metadata/md5-cache/dev-python/python-mistralclient-3.1.3 b/metadata/md5-cache/dev-python/python-mistralclient-3.1.3
deleted file mode 100644
index 1f94864a6c5d..000000000000
--- a/metadata/md5-cache/dev-python/python-mistralclient-3.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Mistral API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-mistralclient
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-mistralclient/python-mistralclient-3.1.3.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_=c406cc7d4531d7d1f584d0e29fac9062
diff --git a/metadata/md5-cache/dev-python/python-mistralclient-3.1.4 b/metadata/md5-cache/dev-python/python-mistralclient-3.1.4
index 82f2ed09f525..fa28cea4f973 100644
--- a/metadata/md5-cache/dev-python/python-mistralclient-3.1.4
+++ b/metadata/md5-cache/dev-python/python-mistralclient-3.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Mistral API
 EAPI=6
 HOMEPAGE=https://github.com/openstack/python-mistralclient
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mistralclient/python-mistralclient-3.1.4.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_=c15c38c0cd4f2d2a1e84aadc091c4fc3
+_md5_=c406cc7d4531d7d1f584d0e29fac9062
diff --git a/metadata/md5-cache/dev-python/python-zunclient-0.4.0 b/metadata/md5-cache/dev-python/python-zunclient-0.4.0
deleted file mode 100644
index 347747786231..000000000000
--- a/metadata/md5-cache/dev-python/python-zunclient-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Zun API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-zunclient
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-openstackclient-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-zunclient/python-zunclient-0.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_=32dcc299bfb2f7323871b313861dbd78
diff --git a/metadata/md5-cache/dev-python/python-zunclient-0.4.1 b/metadata/md5-cache/dev-python/python-zunclient-0.4.1
index 3766e84c94c7..4fa15eb75c99 100644
--- a/metadata/md5-cache/dev-python/python-zunclient-0.4.1
+++ b/metadata/md5-cache/dev-python/python-zunclient-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Zun API
 EAPI=6
 HOMEPAGE=https://github.com/openstack/python-zunclient
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zunclient/python-zunclient-0.4.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_=1017676f8cdd3ac0ace8b0b2923f3aae
+_md5_=292b50771393f26399800b181ad555d2
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ca0312b720f9..44a97d143018 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
index 4165cb6e9798..63dbbf4f3b30 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10
@@ -4,11 +4,11 @@ DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=5
 HOMEPAGE=https://github.com/nex3/rb-inotify
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ffi[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=mirror://rubygems/rb-inotify-0.9.10.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=48e127646558a437b7cda53bcd45067d
+_md5_=b088c9ac8337c3543ba32e407f1cb707
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5e35a3cf555d..d1de2ec6a507 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.15.1 b/metadata/md5-cache/dev-util/bitcoin-tx-0.15.1
new file mode 100644
index 000000000000..6ea740946c41
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] >=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=Command-line Bitcoin transaction tool
+EAPI=6
+HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)]
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=68b29ee4d319894d2552ac8099fb45ac
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.1 b/metadata/md5-cache/dev-util/catalyst-3.0.1
new file mode 100644
index 000000000000..58815ae429c8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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(-)]
+DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache doc kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pydecomp-0.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(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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://gentoo/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.1.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=857106b1b6cf9b332fe9b3f43808203e
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index a69b1db7b5fc..f7c49b9f0447 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 IUSE=ccache doc kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-2
-RDEPEND==dev-python/pydecomp-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) x86-fbsd? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND==dev-python/pydecomp-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48153a5119ca11be985e7359ad0c155e
+_md5_=25cbfe1c068db10041a2c5831776589e
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.1 b/metadata/md5-cache/dev-util/kdevelop-5.2.1
index b02715b68c60..c9a863129e42 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and muc
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=kde-apps/libkomparediff2-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qthelp-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.10.5:5 ) okteta? ( >=kde-apps/okteta-14.12.0:5 ) plasma? ( >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( dev-libs/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.7.1:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) >=kde-apps/kapptemplate-14.12.0:5 >=kde-apps/kio-extras-14.12.0:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-14.12.0:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform !<kde-apps/kapptemplate-16.04.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=test? ( welcomepage )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.1/src/kdevelop-5.2.1.tar.xz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75b90747f94415a2a39101210a519c0e
+_md5_=52e6bc9836a615d63afe28b4d35cef2a
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.2.1 b/metadata/md5-cache/dev-util/kdevelop-php-5.2.1
index c4370f6c5272..e9448ce8bdaa 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=PHP plugin for KDevelop
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 !dev-util/kdevelop-php-docs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.1/src/kdev-php-5.2.1.tar.xz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca8d94cd903ea9686c0ed2f84eecebd9
+_md5_=9971747a09960d82f957f5980ebb8569
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.2.1 b/metadata/md5-cache/dev-util/kdevelop-python-5.2.1
index ae36883796d9..2f78c619938e 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python plugin for KDevelop
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
 IUSE=debug test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=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_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(+)?] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-util/kdevelop:5 dev-python/pycodestyle[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) 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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.1/src/kdev-python-5.2.1.tar.xz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	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_=491f37a8a133bd6499079c9a4675305c
+_md5_=155795e3d3de1102aea1b2758caa3b03
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index efdf1c2b17ce..0f96f826c500 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.15.0 b/metadata/md5-cache/dev-vcs/git-2.16.0_rc0
index 45c3cf41f462..1d3772bc2a36 100644
--- a/metadata/md5-cache/dev-vcs/git-2.15.0
+++ b/metadata/md5-cache/dev-vcs/git-2.16.0_rc0
@@ -4,11 +4,10 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.15.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.15.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.15.0.tar.xz )
+SRC_URI=mirror://kernel/software/scm/git/testing/git-2.16.0.rc0.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.16.0.rc0.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.16.0.rc0.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=20a7644f6b3f786c6e37824e4ef6a3ed
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.4.2 b/metadata/md5-cache/dev-vcs/tortoisehg-4.4.2
new file mode 100644
index 000000000000..e7cbda6bb1e1
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-vcs/mercurial-4.3 <dev-vcs/mercurial-4.5 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) 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(-)]
+DESCRIPTION=Set of graphical tools for Mercurial
+EAPI=6
+HOMEPAGE=https://tortoisehg.bitbucket.io/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-4.3 <dev-vcs/mercurial-4.5 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),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://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.4.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=952fc6cabd4f2103dfec96f61bffb27e
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index c82b1867d25e..9c53c4c9f75f 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/vbam-2.0.0_beta2_p20161211-r1 b/metadata/md5-cache/games-emulation/vbam-2.0.0_beta2_p20161211-r1
index 8c3929b451f7..405f6dbeb329 100644
--- a/metadata/md5-cache/games-emulation/vbam-2.0.0_beta2_p20161211-r1
+++ b/metadata/md5-cache/games-emulation/vbam-2.0.0_beta2_p20161211-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( sdl gtk wxwidgets )
 SLOT=0
 SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/c2165287938aea2306a75f0714744a6d23ba7dab.tar.gz -> vbam-2.0.0_beta2_p20161211.tar.gz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=876ea157fb100e668d6ea7f6e5833932
+_md5_=ebbde48a49f89dacbb6b021854fdd3c4
diff --git a/metadata/md5-cache/games-emulation/vbam-9999 b/metadata/md5-cache/games-emulation/vbam-9999
index 353a6d645d8b..b16f63aa6ff7 100644
--- a/metadata/md5-cache/games-emulation/vbam-9999
+++ b/metadata/md5-cache/games-emulation/vbam-9999
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-
 REQUIRED_USE=|| ( sdl gtk wxwidgets )
 SLOT=0
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d76402fa12fe97e544ba62c8d9b17843
+_md5_=4e768dc0bf819adb2f62389a731d9799
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index dfa89fcbf72e..ec09047714c6 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.03 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.03
new file mode 100644
index 000000000000..be0e09ae00d1
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.03
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2 media-libs/libsndfile media-libs/openal sys-libs/ncurses:5[unicode] virtual/pkgconfig
+DESCRIPTION=A single-player fantasy game
+EAPI=6
+HOMEPAGE=http://www.bay12games.com/dwarves
+IUSE=debug
+KEYWORDS=~amd64 ~x86 -*
+LICENSE=free-noncomm BSD BitstreamVera
+RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_44_03_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_44_03_linux32.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e0fafeb32c01db415046715da64c202f
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index a69274fbcde3..bfe7a8dd8a4c 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1
index c9398ef58150..3a33474f22c9 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1
@@ -1,13 +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.41: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
+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.40: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-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<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.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/networkmanager-qt-5.41.0.tar.xz
+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-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<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.40
+SRC_URI=mirror://kde/stable/frameworks/5.40/networkmanager-qt-5.40.0.tar.xz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41142769b5f674b7ebcfa1db0e1e4508
+_md5_=9d43bc794ee199874203ded1226818bf
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0-r1 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0-r1
index f22c21921984..a8057181f761 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0-r1
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/netwo
 SLOT=5/5.41
 SRC_URI=mirror://kde/stable/frameworks/5.41/networkmanager-qt-5.41.0.tar.xz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a292eed51ac611a2f24ac5db4db4161
+_md5_=9d43bc794ee199874203ded1226818bf
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index c58bcb199b4c..87a069199eee 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/mutt-1.9.2 b/metadata/md5-cache/mail-client/mutt-1.9.2
index 969972663905..82bb55b8c824 100644
--- a/metadata/md5-cache/mail-client/mutt-1.9.2
+++ b/metadata/md5-cache/mail-client/mutt-1.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.2.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.2-patches-r0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=51b2983050c961c3b23afdb8a63a26a4
+_md5_=b357cf315af905b9d9729a3bed497650
diff --git a/metadata/md5-cache/mail-client/mutt-1.9.2-r1 b/metadata/md5-cache/mail-client/mutt-1.9.2-r1
new file mode 100644
index 000000000000..be8a53ac70d8
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mutt-1.9.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=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 small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=http://www.mutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
+SLOT=0
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.2.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.2-patches-r1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=4c24659ca660fe1b9492e305e861a016
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 93d0df0d1e35..d47ff147fa33 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/darktable-2.4.0 b/metadata/md5-cache/media-gfx/darktable-2.4.0
index dfd69c60ee39..d70b709ff88c 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.4.0
+++ b/metadata/md5-cache/media-gfx/darktable-2.4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_sse3
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.4.0/darktable-2.4.0.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.2.0/darktable-usermanual.pdf -> darktable-usermanual-2.2.0.pdf )
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d11ea63ace3955c67bec6ea0d361e135
+_md5_=6acfbcc8f4e980fa0f9ddfed007c27fb
diff --git a/metadata/md5-cache/media-gfx/fontforge-20170731-r2 b/metadata/md5-cache/media-gfx/fontforge-20170731-r3
index 5c30a0b2a09e..0adfb3c067dd 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20170731-r2
+++ b/metadata/md5-cache/media-gfx/fontforge-20170731-r3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20170731/fontforge-dist-20170731.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cbbb39d34031b6cf8f6a6a8dc542a277
+_md5_=df3ed015f686ebebb0a8f9855ae093cd
diff --git a/metadata/md5-cache/media-gfx/maim-3.4.47 b/metadata/md5-cache/media-gfx/maim-3.4.47
deleted file mode 100644
index c9c487baf330..000000000000
--- a/metadata/md5-cache/media-gfx/maim-3.4.47
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Commandline tool to take screenshots of the desktop
-EAPI=6
-HOMEPAGE=https://github.com/naelstrof/maim
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXfixes x11-misc/slop
-SLOT=0
-SRC_URI=https://github.com/naelstrof/maim/archive/v3.4.47.tar.gz -> maim-3.4.47.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90fae0a79a8097331a5e434ebca4577d
diff --git a/metadata/md5-cache/media-gfx/optipng-0.7.7 b/metadata/md5-cache/media-gfx/optipng-0.7.7
new file mode 100644
index 000000000000..35ba8e7c458e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/optipng-0.7.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib media-libs/libpng:0= sys-apps/findutils
+DESCRIPTION=Compress PNG files without affecting image quality
+EAPI=6
+HOMEPAGE=http://optipng.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=sys-libs/zlib media-libs/libpng:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/optipng/optipng-0.7.7.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ed10cc0a05953e35ad9d30a7516f4f31
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index bae74ecac63a..bf1972c83191 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/unixcw-3.5.1 b/metadata/md5-cache/media-radio/unixcw-3.5.1
index 01a2dfe123a9..9c2c42c62b50 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.5.1
+++ b/metadata/md5-cache/media-radio/unixcw-3.5.1
@@ -3,11 +3,12 @@ DEPEND=ncurses? ( sys-libs/ncurses:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev
 DESCRIPTION=A package of programs that fit together to form a morse code tutor program
 EAPI=5
 HOMEPAGE=http://unixcw.sourceforge.net
-IUSE=alsa ncurses pulseaudio suid qt5
+IUSE=alsa ncurses pulseaudio suid test qt5
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=test? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.5.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=651b49f71efd623dda03e4b762b17987
+_md5_=6ccae3195fdbb1b6fb05bb6b6a1c7adf
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5a34ab88fb06..94d177e68d5a 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/pamix-9999 b/metadata/md5-cache/media-sound/pamix-9999
index 59ce9079b4c2..0d1b06cc1853 100644
--- a/metadata/md5-cache/media-sound/pamix-9999
+++ b/metadata/md5-cache/media-sound/pamix-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=sys-devel/autoconf-archive virtual/pkgconfig media-sound/pulseaudio sys-libs/ncurses:0=[unicode?] >=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
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/autoconf-archive virtual/pkgconfig media-sound/pulseaudio sys-libs/ncurses:0=[unicode?] sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A PulseAudio NCurses mixer
 EAPI=6
 HOMEPAGE=https://github.com/patroclos/PAmix
@@ -7,5 +7,5 @@ IUSE=+unicode
 LICENSE=MIT
 RDEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3935bf01e4e1521a7236303f6caab045
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d2deae611431f2c9c37b73a7c96223a7
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 0fee502b2894..9b7988016c52 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/mythtv-0.28.1-r3 b/metadata/md5-cache/media-tv/mythtv-0.28.1-r3
deleted file mode 100644
index 35d69d6bc402..000000000000
--- a/metadata/md5-cache/media-tv/mythtv-0.28.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure info install postinst preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( 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(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-proto/xf86vidmodeproto x11-proto/xineramaproto virtual/pkgconfig
-DESCRIPTION=Homebrew PVR project
-EAPI=5
-HOMEPAGE=https://www.mythtv.org
-IUSE=alsa altivec autostart bluray cec crystalhd debug dvd egl fftw +hls ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( 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(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
-REQUIRED_USE=python_targets_python2_7 bluray? ( xml ) theora? ( vorbis )
-SLOT=0/0.28.1
-SRC_URI=https://github.com/MythTV/mythtv/archive/03f44039848bd09444ff4baa8dc158bd61454079.tar.gz -> mythtv-0.28.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=fb4144acd96df713ab6c5689edb027ec
diff --git a/metadata/md5-cache/media-tv/mythtv-0.28.1-r4 b/metadata/md5-cache/media-tv/mythtv-0.28.1-r4
new file mode 100644
index 000000000000..a483cbf47570
--- /dev/null
+++ b/metadata/md5-cache/media-tv/mythtv-0.28.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure info install postinst preinst prepare setup unpack
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( 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(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-proto/xf86vidmodeproto x11-proto/xineramaproto virtual/pkgconfig
+DESCRIPTION=Homebrew PVR project
+EAPI=6
+HOMEPAGE=https://www.mythtv.org
+IUSE=alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd libass lirc +mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( 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(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
+REQUIRED_USE=python_targets_python2_7 bluray? ( xml ) theora? ( vorbis )
+SLOT=0/0.28.1
+SRC_URI=https://github.com/MythTV/mythtv/archive/03f44039848bd09444ff4baa8dc158bd61454079.tar.gz -> mythtv-0.28.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=f525909375195a256f4defe0f7354def
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 644a7b6dc2f8..03b4ee67a129 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/vlc-2.2.6 b/metadata/md5-cache/media-video/vlc-2.2.6
index 6779283351c2..77840c044dec 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.6
+++ b/metadata/md5-cache/media-video/vlc-2.2.6
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst prepare setup test unpack
 DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= sys-libs/zlib:0 ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( media-libs/speex:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zvbi? ( media-libs/zvbi:0 ) amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=VLC media player - Video player and streamer
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
@@ -11,4 +11,4 @@ REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva
 SLOT=0/5-8
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/2.2.6/vlc-2.2.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=f5127b813b9ee6097d148b89737f9b95
+_md5_=c4da397263ba9eb27a3797237a14a3a4
diff --git a/metadata/md5-cache/media-video/vlc-2.2.8 b/metadata/md5-cache/media-video/vlc-2.2.8
index f8f04f2f7ed5..091817b6d389 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.8
+++ b/metadata/md5-cache/media-video/vlc-2.2.8
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare test
 DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=VLC media player - Video player and streamer
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
@@ -11,4 +11,4 @@ REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva
 SLOT=0/5-8
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4553027fe908514bf1de3f0036a16194
+_md5_=cf54d68d5257347e9d7d1d5f940b9ddc
diff --git a/metadata/md5-cache/media-video/vlc-2.2.8-r1 b/metadata/md5-cache/media-video/vlc-2.2.8-r1
index 6d3e097e011f..9e50c1c92674 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.8-r1
+++ b/metadata/md5-cache/media-video/vlc-2.2.8-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare test
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=VLC media player - Video player and streamer
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
+IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt5? ( X ) sdl? ( X ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5bf3a848a177827e553c5fca38737e29
+_md5_=f37a4b452c0d82abc350b50d4a2e593e
diff --git a/metadata/md5-cache/media-video/vlc-2.2.9999 b/metadata/md5-cache/media-video/vlc-2.2.9999
index 2e014676b54c..1d45f84a4d6c 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.9999
+++ b/metadata/md5-cache/media-video/vlc-2.2.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
-DESCRIPTION=VLC media player - Video player and streamer
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
+IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt5? ( X ) sdl? ( X ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0bce9cfea44ba9c0a978c5c4b1077ea8
+_md5_=cf334e9c234a29942d5ec42847339518
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 0d7224df4ea8..ca50c9be827b 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
 DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
-DESCRIPTION=VLC media player - Video player and streamer
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtua
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b4bded3e8b299263d91c61ae05ec23a5
+_md5_=241edfe3451c082443c6b5030d5d7dea
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 7723ae9c4565..b5b8ab61ff0d 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
 DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
-DESCRIPTION=VLC media player - Video player and streamer
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtua
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a21c1b999b4493a0f9e9823e689ba64f
+_md5_=34f4a74f7fb6e9b033a06f4627ac279e
diff --git a/metadata/md5-cache/media-video/webcamoid-8.1.0 b/metadata/md5-cache/media-video/webcamoid-8.1.0
new file mode 100644
index 000000000000..cc6e198e690d
--- /dev/null
+++ b/metadata/md5-cache/media-video/webcamoid-8.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l ) dev-qt/linguist-tools:5 >=sys-kernel/linux-headers-3.6 virtual/pkgconfig
+DESCRIPTION=A full featured webcam capture application
+EAPI=6
+HOMEPAGE=https://webcamoid.github.io
+IUSE=alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers libav v4l linguas_ca linguas_de linguas_el linguas_es linguas_et linguas_fr linguas_gl linguas_it linguas_ja linguas_kab linguas_ko linguas_nl linguas_pt linguas_ru linguas_uk linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=libav? ( ffmpeg ) v4lutils? ( v4l )
+SLOT=0
+SRC_URI=https://github.com/webcamoid/webcamoid/archive/8.1.0.tar.gz -> webcamoid-8.1.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	2c2e15383ba891d642f51896a7f0ecfe	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=f0e2749892858ad1ff949ade5fe45777
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4b744c9e7fe1..7f075d4061e3 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.13.4 b/metadata/md5-cache/net-analyzer/icinga-1.13.4
deleted file mode 100644
index 343affa2b55d..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga-1.13.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Nagios Fork - Check daemon, CGIs, docs, IDOutils
-EAPI=5
-HOMEPAGE=http://www.icinga.org/
-IUSE=+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web apache2
-KEYWORDS=amd64 ~arm ~hppa x86
-LICENSE=GPL-2
-RDEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) apache2? ( =www-servers/apache-2* )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/icinga/icinga-core/archive/v1.13.4/icinga-1.13.4.tar.gz https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=829d50380b5febb0e5edd6f362030141
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.14.0 b/metadata/md5-cache/net-analyzer/icinga-1.14.0
deleted file mode 100644
index 366037a1827b..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Nagios Fork - Check daemon, CGIs, docs, IDOutils
-EAPI=5
-HOMEPAGE=http://www.icinga.org/
-IUSE=+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web apache2
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) apache2? ( =www-servers/apache-2* )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/icinga/icinga-core/archive/v1.14.0/icinga-1.14.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0a593c3271f9c6dcdf66737b460f80ef
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.14.0-r1 b/metadata/md5-cache/net-analyzer/icinga-1.14.0-r1
deleted file mode 100644
index c47c2f92531a..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga-1.14.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Nagios Fork - Check daemon, CGIs, docs, IDOutils
-EAPI=6
-HOMEPAGE=http://www.icinga.org/
-IUSE=+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web apache2
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) apache2? ( =www-servers/apache-2* )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/icinga/icinga-core/archive/v1.14.0/icinga-1.14.0.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=348f0805b969fc7cbd998d429907ab34
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.14.0-r2 b/metadata/md5-cache/net-analyzer/icinga-1.14.0-r2
deleted file mode 100644
index c47c2f92531a..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga-1.14.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Nagios Fork - Check daemon, CGIs, docs, IDOutils
-EAPI=6
-HOMEPAGE=http://www.icinga.org/
-IUSE=+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web apache2
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) apache2? ( =www-servers/apache-2* )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/icinga/icinga-core/archive/v1.14.0/icinga-1.14.0.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=348f0805b969fc7cbd998d429907ab34
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.14.2 b/metadata/md5-cache/net-analyzer/icinga-1.14.2
index f4e2421fc181..528f64e061e7 100644
--- a/metadata/md5-cache/net-analyzer/icinga-1.14.2
+++ b/metadata/md5-cache/net-analyzer/icinga-1.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=Nagios Fork - Check daemon, CGIs, docs, IDOutils
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
 IUSE=+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web apache2
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl:= ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd ) ) !net-analyzer/nagios-core plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) apache2? ( =www-servers/apache-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/icinga/icinga-core/archive/v1.14.2/icinga-1.14.2.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=079fc12dc67af07a87bdf078dabb9345
+_md5_=1e4db2ac7fcbe4970acad4731b87074a
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.6.10 b/metadata/md5-cache/net-analyzer/smokeping-2.6.10-r1
index 99bd25055c85..86db11b81f4f 100644
--- a/metadata/md5-cache/net-analyzer/smokeping-2.6.10
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.6.10-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/RadiusPerl ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet virtual/pkgconfig
+DEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/Authen-Radius ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet virtual/pkgconfig
 DESCRIPTION=A powerful latency measurement tool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/smokeping/
 IUSE=apache2 curl dig echoping ipv6 ldap radius ssh telnet
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/RadiusPerl ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet
+RDEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/Authen-Radius ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/smokeping/pub/smokeping-2.6.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=51065437e3f232f0e2ffaf4dc6ba89e9
+_md5_=436fe1d25abbda28ab551900e6950e8f
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.6.11 b/metadata/md5-cache/net-analyzer/smokeping-2.6.11-r1
index 7b48fb91aaed..713029b2b5d7 100644
--- a/metadata/md5-cache/net-analyzer/smokeping-2.6.11
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.6.11-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/RadiusPerl ) virtual/pkgconfig
+DEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius ) virtual/pkgconfig
 DESCRIPTION=A powerful latency measurement tool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/smokeping/
 IUSE=apache2 curl dig echoping ipv6 radius
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/RadiusPerl )
+RDEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/smokeping/pub/smokeping-2.6.11.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ad353ac56a23c21c29c0d428af391cf7
+_md5_=0e2af3ffc8673d459f13c280406d6d48
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.6.9 b/metadata/md5-cache/net-analyzer/smokeping-2.6.9-r1
index 3d7855264e1a..b79caaf4b61a 100644
--- a/metadata/md5-cache/net-analyzer/smokeping-2.6.9
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.6.9-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/RadiusPerl ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet virtual/pkgconfig
+DEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/Authen-Radius ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet virtual/pkgconfig
 DESCRIPTION=A powerful latency measurement tool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/smokeping/
 IUSE=apache2 curl dig echoping ipv6 ldap radius ssh telnet
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/RadiusPerl ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet
+RDEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/Authen-Radius ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) || ( dev-perl/CGI-Fast <dev-perl/CGI-4 ) >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/smokeping/pub/smokeping-2.6.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=78f21ceb659f414efa8a48b77b01fb00
+_md5_=4caa88676580730d0f44e8d7116123a6
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index c653c397b386..4e0828f359e5 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.9 b/metadata/md5-cache/net-firewall/shorewall-5.1.10.1-r2
index c06fe20068f5..208765e86c4d 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.9
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.10.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=6
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 <sys-apps/iproute2-4.13.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-core-5.1.9.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-5.1.9.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-5.1.9.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-lite-5.1.9.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-lite-5.1.9.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-init-5.1.9.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-docs-html-5.1.9.tar.bz2 )
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-core-5.1.10.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-5.1.10.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-5.1.10.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-lite-5.1.10.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-lite-5.1.10.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-init-5.1.10.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-docs-html-5.1.10.1.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fb74824f12bcbcf4d1db874c33c72988
+_md5_=af3032021ec52da7b1ae31e1acff306c
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.9-r1 b/metadata/md5-cache/net-firewall/shorewall-5.1.9-r1
index b8130a30d4e9..dba72e42ea45 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.9-r1
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=6
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-4.4.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
 SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-core-5.1.9.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-5.1.9.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-5.1.9.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-lite-5.1.9.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-lite-5.1.9.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-init-5.1.9.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-docs-html-5.1.9.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a3391bfd873e94ef807ae57df58487a4
+_md5_=f32c6952c3dbe0c13476fcaf363e3abb
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 7ef36f4c60ee..81d0ff02d2de 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/enet-1.2.2-r1 b/metadata/md5-cache/net-libs/enet-1.2.2-r1
new file mode 100644
index 000000000000..4ec6a735ea26
--- /dev/null
+++ b/metadata/md5-cache/net-libs/enet-1.2.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=relatively thin, simple and robust network communication layer on top of UDP
+EAPI=6
+HOMEPAGE=http://enet.bespin.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://enet.bespin.org/download/enet-1.2.2.tar.gz
+_md5_=1303e54bb520ee576fa0d296c15b7a07
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.15.1 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.15.1
new file mode 100644
index 000000000000..c0c06eb5a7cb
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] >=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=Bitcoin Core consensus library
+EAPI=6
+HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
+IUSE=+asm knots libressl
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6de0fd75c5125e7456db7df1d1ae1d3f
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.3 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3
new file mode 100644
index 000000000000..ae79bfc38af2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=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=rpcsvc protocol definitions from glibc
+EAPI=6
+HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD
+RDEPEND=!<sys-libs/glibc-2.26
+SLOT=0
+SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.3.tar.gz -> rpcsvc-proto-1.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=9d87b8c0b41109d3054c3e0aa65d2e3e
diff --git a/metadata/md5-cache/net-libs/zeromq-4.2.3 b/metadata/md5-cache/net-libs/zeromq-4.2.3
new file mode 100644
index 000000000000..67ab294a1348
--- /dev/null
+++ b/metadata/md5-cache/net-libs/zeromq-4.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 ) !elibc_Darwin? ( sys-apps/util-linux ) doc? ( app-text/asciidoc app-text/xmlto ) pgm? ( 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
+DESCRIPTION=A brokerless kernel
+EAPI=6
+HOMEPAGE=http://www.zeromq.org/
+IUSE=doc pgm +sodium static-libs test unwind elibc_Darwin
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-3
+RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 )
+SLOT=0/5
+SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.2.3/zeromq-4.2.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ce5c890eb67bb7fed4cda382e06d0c09
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 93b2c03e2201..b04d6899a0b7 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1
new file mode 100644
index 000000000000..601e80e47d54
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) dev-libs/libevent dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] >=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=Command-line JSON-RPC client specifically for interfacing with bitcoind
+EAPI=6
+HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) dev-libs/libevent dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)]
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=8ab736ae6fa21e9da37719b75727edc1
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
new file mode 100644
index 000000000000..c1c139a79f42
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare pretend
+DEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) libevent? ( dev-libs/libevent ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) wallet? ( sys-libs/db:4.8[cxx] ) zeromq? ( net-libs/zeromq ) virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf ) qrcode? ( media-gfx/qrencode ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5 knots? ( gnome-base/librsvg media-gfx/imagemagick[png] ) >=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 >=sys-apps/sed-4
+DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
+EAPI=6
+HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
+IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode +http test +tor upnp +wallet zeromq l10n_sl l10n_en-US l10n_ar l10n_ru l10n_pt-BR l10n_uk l10n_hu l10n_es-UY l10n_nl l10n_nb l10n_ky l10n_gl l10n_es-CO l10n_de l10n_be l10n_hr l10n_es-CL l10n_et l10n_es l10n_hu l10n_el l10n_de l10n_da l10n_zh-TW l10n_pam l10n_ko l10n_pt-PT l10n_ne l10n_ka l10n_es-VE l10n_eo l10n_eu l10n_en l10n_zh-CN l10n_lv l10n_el l10n_sr-Latn l10n_ru l10n_ms l10n_af l10n_nl l10n_et l10n_ro l10n_id l10n_en-AU l10n_es-MX l10n_he l10n_nb l10n_am l10n_th l10n_af l10n_si l10n_fr l10n_cy l10n_bg l10n_sk l10n_kk l10n_ur-PK l10n_fr l10n_fa l10n_es-419 l10n_ca l10n_pt l10n_ms l10n_ja l10n_la l10n_zh-HK l10n_zh l10n_sn l10n_bn l10n_hi l10n_cs l10n_vi l10n_fr-CA l10n_en-GB l10n_tr l10n_my l10n_id l10n_lt l10n_es-DO l10n_ku l10n_es-AR l10n_tr l10n_fa l10n_th l10n_ro l10n_bs l10n_bg l10n_sq l10n_is l10n_ca l10n_te l10n_mn l10n_it l10n_ca-valencia l10n_vi l10n_sr l10n_fi l10n_pl l10n_uz-Cyrl l10n_ta l10n_sv l10n_pl l10n_mk l10n_ja l10n_it l10n_he l10n_es-ES
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) libevent? ( dev-libs/libevent ) >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) wallet? ( sys-libs/db:4.8[cxx] ) zeromq? ( net-libs/zeromq ) virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf ) qrcode? ( media-gfx/qrencode ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 )
+REQUIRED_USE=http? ( libevent ) tor? ( libevent ) libevent? ( http tor ) l10n_am? ( knots ) l10n_pt? ( knots ) l10n_sn? ( knots ) l10n_is? ( knots )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ad244d276595b703ec5431187ab79c5f
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.15.1 b/metadata/md5-cache/net-p2p/bitcoind-0.15.1
new file mode 100644
index 000000000000..bb1dc0b2f732
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) dev-libs/libevent >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) wallet? ( sys-libs/db:4.8[cxx] ) zeromq? ( net-libs/zeromq ) virtual/bitcoin-leveldb >=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 virtual/pkgconfig
+DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
+EAPI=6
+HOMEPAGE=http://bitcoincore.org/ http://bitcoinknots.org/
+IUSE=+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq
+KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) dev-libs/libevent >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] dev-libs/univalue >=dev-libs/boost-1.52.0:=[threads(+)] upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) wallet? ( sys-libs/db:4.8[cxx] ) zeromq? ( net-libs/zeromq ) virtual/bitcoin-leveldb
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/7b57bc998f334775b50ebc8ca5e78ca728db4c58.tar.gz -> bitcoin-v0.15.1.tar.gz http://bitcoinknots.org/files/0.15.x/0.15.1.knots20171111/bitcoin-0.15.1.knots20171111.patches.txz -> bitcoin-0.15.1.knots20171111.patches.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f38aede8c61ebb7c0adef3fffcd85230
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index e86068c13c82..821b21c5a22b 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/tayga-0.9.2-r1 b/metadata/md5-cache/net-proxy/tayga-0.9.2-r1
new file mode 100644
index 000000000000..e85e45b13448
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/tayga-0.9.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=>=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=out-of-kernel stateless NAT64 implementation based on TUN
+EAPI=6
+HOMEPAGE=http://www.litech.org/tayga/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=49fe7f9885bf3c49f447d157d74d5834
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 04c88e788c61..570b57c1af98 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018_beta2 b/metadata/md5-cache/sci-chemistry/gromacs-2018_rc1
index a0be937554db..ae7e7e703183 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018_beta2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018_rc1
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-maco
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2018_beta2
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018-beta2.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018-beta2.tar.gz )
+SLOT=0/2018_rc1
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018-rc1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018-rc1.tar.gz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	77a5a8d3308359caadcdd91688f20093	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=19ce149cec8b7da6545d6175fa517c2f
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 7bb628d51385..6ea8bbbc2c33 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.37.3-r4 b/metadata/md5-cache/sci-mathematics/maxima-5.37.3-r4
deleted file mode 100644
index 6c0d9c28bad7..000000000000
--- a/metadata/md5-cache/sci-mathematics/maxima-5.37.3-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) ) sys-apps/texinfo >=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=Free computer algebra environment based on Macsyma
-EAPI=5
-HOMEPAGE=http://maxima.sourceforge.net/
-IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp linguas_de linguas_es linguas_pt linguas_pt_BR
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2 GPL-2+
-RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/maxima/maxima-5.37.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9753bf704de0750e142d0df009aac192
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.39.0 b/metadata/md5-cache/sci-mathematics/maxima-5.39.0
deleted file mode 100644
index 1037fda48f1e..000000000000
--- a/metadata/md5-cache/sci-mathematics/maxima-5.39.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) ) sys-apps/texinfo >=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=Free computer algebra environment based on Macsyma
-EAPI=5
-HOMEPAGE=http://maxima.sourceforge.net/
-IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp linguas_de linguas_es linguas_pt linguas_pt_BR
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2 GPL-2+
-RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/maxima/maxima-5.39.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=be94353bfd1bea5375f8f9a604303d6e
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.40.0 b/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r1
index 9686c2975426..5d25558f51e4 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.40.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.41.0-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) ) sys-apps/texinfo >=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
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) ) sys-apps/texinfo >=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-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=5
 HOMEPAGE=http://maxima.sourceforge.net/
-IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp linguas_de linguas_es linguas_pt linguas_pt_BR
+IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp l10n_de l10n_es l10n_pt l10n_pt-BR
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/maxima/maxima-5.40.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=49c68b6efe924d788bb59cc15a9b1f3e
+SRC_URI=mirror://sourceforge/maxima/maxima-5.41.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ebe1c8259a0a4080c164ead39e355da
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-17.10.1 b/metadata/md5-cache/sci-mathematics/wxmaxima-17.10.1
index fff55fb4d8b0..8c9225f113a1 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-17.10.1
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-17.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 SLOT=0
 SRC_URI=https://github.com/andrejv/wxmaxima/archive/Version-17.10.1.tar.gz -> wxmaxima-17.10.1.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bda120f2b5a0e3555f844480ce292ff5
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d38c7bd46be9d5f704cdb80937d1d5b
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index fe6fff67d2a4..24b3d4f089af 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.4c b/metadata/md5-cache/sci-visualization/gle-4.2.4c
deleted file mode 100644
index 859b6591b1cb..000000000000
--- a/metadata/md5-cache/sci-visualization/gle-4.2.4c
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) emacs? ( virtual/emacs ) >=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=Graphics Layout Engine
-EAPI=5
-HOMEPAGE=http://glx.sourceforge.net/
-IUSE=X qt4 jpeg png tiff doc emacs vim-syntax
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )
-RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) emacs? ( virtual/emacs ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.4cf-src.tar.gz doc? ( mirror://sourceforge/glx/gle-manual-4.2.2.pdf mirror://sourceforge/glx/GLEusersguide.pdf )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9745d16f1c615d01392f44ae500117ff
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1 b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
new file mode 100644
index 000000000000..e03b9a9b90ca
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) >=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=Graphics Layout Engine
+EAPI=5
+HOMEPAGE=http://glx.sourceforge.net/
+IUSE=X jpeg png tiff doc emacs vim-syntax
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 emacs? ( GPL-2 )
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b508d02e8486982837415bbc696ea47a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ec8556851ffd..36701e3db132 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/collectl-4.3.0 b/metadata/md5-cache/sys-apps/collectl-4.3.0
new file mode 100644
index 000000000000..3da4273f1081
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/collectl-4.3.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
+EAPI=6
+HOMEPAGE=http://collectl.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ia64 ~x86
+LICENSE=GPL-2 Artistic
+RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
+SLOT=0
+SRC_URI=mirror://sourceforge/collectl/collectl-4.3.0.src.tar.gz
+_md5_=e2c661607154a2846864bb897feb786b
diff --git a/metadata/md5-cache/sys-apps/systemd-233-r6 b/metadata/md5-cache/sys-apps/systemd-233-r6
index cd43f93bf774..e1128d0cb6e4 100644
--- a/metadata/md5-cache/sys-apps/systemd-233-r6
+++ b/metadata/md5-cache/sys-apps/systemd-233-r6
@@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-233-patches.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8fda336bc5ac657bbc57fccd362bae51
+_md5_=ef92cad14b3caef91f95b51a68783a5a
diff --git a/metadata/md5-cache/sys-apps/systemd-235-r1 b/metadata/md5-cache/sys-apps/systemd-235-r1
index 13523f9cb697..b39768eb73e2 100644
--- a/metadata/md5-cache/sys-apps/systemd-235-r1
+++ b/metadata/md5-cache/sys-apps/systemd-235-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v235.tar.gz -> systemd-235.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=de402a34432a1368a07d262a6365e441
+_md5_=3c9186249264b228b1ea493eaa3f5f38
diff --git a/metadata/md5-cache/sys-apps/systemd-236-r2 b/metadata/md5-cache/sys-apps/systemd-236-r4
index f200587b4147..33a682b6cf7a 100644
--- a/metadata/md5-cache/sys-apps/systemd-236-r2
+++ b/metadata/md5-cache/sys-apps/systemd-236-r4
@@ -11,6 +11,6 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-0.tar.gz
+SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-1.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=dfa2943ed7cd47bb72995c18b2c84104
+_md5_=b292a2ee3b8fd7346cd31390970b20ae
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index b61ac46d821a..25891de7eac7 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2c09dab9cf83fddc0887f3d266d75f54
+_md5_=8ce0b2c49471d75a6d5cceef946a8313
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index b570c35999ba..f2ad2d798204 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/f3-7.0 b/metadata/md5-cache/sys-block/f3-7.0
new file mode 100644
index 000000000000..e266f70a04ea
--- /dev/null
+++ b/metadata/md5-cache/sys-block/f3-7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=extra? ( sys-block/parted virtual/udev )
+DESCRIPTION=Utilities to detect broken or counterfeit flash storage
+EAPI=6
+HOMEPAGE=http://oss.digirati.com.br/f3/ https://github.com/AltraMayor/f3
+IUSE=extra
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/AltraMayor/f3/archive/v7.0.tar.gz -> f3-7.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=cd83eb7ccee1bc96d8afee885f3c2d52
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 6ef8881a9f8a..ca8e25f3a211 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5-r3 b/metadata/md5-cache/sys-devel/binutils-config-5-r4
index c11ab6f98352..c11ab6f98352 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5-r3
+++ b/metadata/md5-cache/sys-devel/binutils-config-5-r4
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.1 b/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
index f0671af54f07..f0671af54f07 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.1
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
diff --git a/metadata/md5-cache/sys-devel/crossdev-20160602 b/metadata/md5-cache/sys-devel/crossdev-20160602
deleted file mode 100644
index 8febbb1250fd..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20160602
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-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
-SRC_URI=mirror://gentoo/crossdev-20160602.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20160602.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=51872c4df2f9d6bc0041433e00bbf30e
diff --git a/metadata/md5-cache/sys-devel/crossdev-20160602-r1 b/metadata/md5-cache/sys-devel/crossdev-20171230
index 73299cde387b..d987f19fd153 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20160602-r1
+++ b/metadata/md5-cache/sys-devel/crossdev-20171230
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 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
-SRC_URI=mirror://gentoo/crossdev-20160602.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20160602.tar.xz
-_md5_=a3bd27064b61cbd6d1f14781556971a9
+SRC_URI=mirror://gentoo/crossdev-20171230.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20171230.tar.xz
+_md5_=afef57e35a6cd0488e59993ca7977293
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3e506c1f6ff4..715189764605 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.12.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.12.12
index 31a16d58f337..50f624313118 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.12.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.12.12
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.12 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
+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.12.12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz mirror://gentoo/genpatches-4.12-13.base.tar.xz mirror://gentoo/genpatches-4.12-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.12-13.experimental.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9a550bdcc7f809902ac31b1b9b4deb91
+_md5_=d84c96726b00b48c7324d9610f99be6d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.10-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.10-r1
new file mode 100644
index 000000000000..06002363420a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.10-r1
@@ -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.14 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.14.10-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-13.base.tar.xz mirror://gentoo/genpatches-4.14-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-13.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d84c96726b00b48c7324d9610f99be6d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.72 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.72
index 85b0dd37ea26..3fc678cc5fbe 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.72
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.72
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 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
+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.9.72
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-74.base.tar.xz mirror://gentoo/genpatches-4.9-74.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-74.experimental.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=03cdec5a05d1f2c3dcd1f94bb4537c0e
+_md5_=d363e7ff588b493d6d4ba7575241f74d
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.13 b/metadata/md5-cache/sys-kernel/linux-headers-4.13
index 4173e03bc481..fe4a46ef18e1 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.13
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=5
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=crosscompile_opts_headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=46d539cb3b3dc0b25f3ceebe32fc1e57
+_md5_=42d185e1ab43bc9e5330fb990a7343df
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index d7da231a1416..3513166b5738 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r4 b/metadata/md5-cache/sys-libs/glibc-2.26-r5
index a6cc03896e30..06a4f34411fa 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r5
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-5.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	6f221877ee4e2a1566fe5f46ee62ba8f	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6e75a89e48acba9c80827cb7b8879f17
+_md5_=4d40d97b221a6dda2f1eae75b84a1a23
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index d78286ed6239..49afb1355870 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	6f221877ee4e2a1566fe5f46ee62ba8f	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2c1a4910a2a8a8559f1d6f89cd76f601
+_md5_=ad04523b5675e952c7f0022f1a7f7f29
diff --git a/metadata/md5-cache/sys-libs/libomp-4.0.1 b/metadata/md5-cache/sys-libs/libomp-4.0.1
index a558f0f80dbd..24d527915328 100644
--- a/metadata/md5-cache/sys-libs/libomp-4.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-4.0.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=hwloc? ( sys-apps/hwloc: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-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm >=sys-devel/clang-3.9.0 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
@@ -7,8 +7,8 @@ IUSE=hwloc ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] )
-RESTRICT=test
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/openmp-4.0.1.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8473c10fbb539eab7a3ff640273fee8
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d83cb44ec18d5827547cfb55bc903f8
diff --git a/metadata/md5-cache/sys-libs/libomp-5.0.0 b/metadata/md5-cache/sys-libs/libomp-5.0.0
index 7ae25a700ea4..b553b1d7b304 100644
--- a/metadata/md5-cache/sys-libs/libomp-5.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-5.0.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=hwloc? ( sys-apps/hwloc: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-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm >=sys-devel/clang-3.9.0 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
@@ -7,8 +7,8 @@ IUSE=hwloc ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] )
-RESTRICT=test
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.0/openmp-5.0.0.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2fb97467379fedf4b47f6ccbf5717380
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8257d329e20d22ffd9fdbb433e0d3b54
diff --git a/metadata/md5-cache/sys-libs/libomp-5.0.1 b/metadata/md5-cache/sys-libs/libomp-5.0.1
index 33bd18cf122b..9cc29006bb6c 100644
--- a/metadata/md5-cache/sys-libs/libomp-5.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-5.0.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=hwloc? ( sys-apps/hwloc: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-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm >=sys-devel/clang-3.9.0 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
@@ -7,8 +7,8 @@ IUSE=hwloc ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] )
-RESTRICT=test
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.1/openmp-5.0.1.src.tar.xz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2fb97467379fedf4b47f6ccbf5717380
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8257d329e20d22ffd9fdbb433e0d3b54
diff --git a/metadata/md5-cache/sys-libs/libomp-9999 b/metadata/md5-cache/sys-libs/libomp-9999
index 8b3fed4cc102..b05537755437 100644
--- a/metadata/md5-cache/sys-libs/libomp-9999
+++ b/metadata/md5-cache/sys-libs/libomp-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=hwloc? ( sys-apps/hwloc: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-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm >=sys-devel/clang-3.9.0 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
@@ -6,7 +6,7 @@ HOMEPAGE=https://openmp.llvm.org
 IUSE=hwloc ompt 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=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] )
-RESTRICT=test !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50ca8ec76df9f5a0173ec18bc6369bc5
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b3a173383e91c19119a70a0f1c33a5c9
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index e5a2827d9f41..7c2ec38d5808 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/bugzilla-4.4.12-r1 b/metadata/md5-cache/www-apps/bugzilla-4.4.12-r2
index 6108d5b907db..f8d38db51ed6 100644
--- a/metadata/md5-cache/www-apps/bugzilla-4.4.12-r1
+++ b/metadata/md5-cache/www-apps/bugzilla-4.4.12-r2
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.bugzilla.org
 IUSE=modperl extras graphviz mysql postgres sqlite test modperl vhosts
 KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
-RDEPEND=virtual/httpd-cgi >=dev-lang/perl-5.10.1 >=dev-perl/CGI-3.510.0 virtual/perl-Digest-SHA >=dev-perl/DateTime-0.500.0 >=dev-perl/DateTime-TimeZone-0.710.0 >=dev-perl/DBI-1.601.0 >=dev-perl/Template-Toolkit-2.22 >=dev-perl/Email-Send-2.40.0 >=dev-perl/Email-MIME-1.904.0 dev-perl/URI >=dev-perl/List-MoreUtils-0.329.0 dev-perl/Math-Random-ISAAC postgres? ( >=dev-perl/DBD-Pg-1.49.0 ) mysql? ( >=dev-perl/DBD-mysql-4.0.5 ) sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 ) extras? ( >=dev-perl/GD-2.35[png,truetype] >=dev-perl/Chart-2.4.1 dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/XML-Twig >=dev-perl/MIME-tools-5.427.0 dev-perl/libwww-perl >=dev-perl/PatchReader-0.9.6 dev-perl/perl-ldap dev-perl/RadiusPerl dev-perl/Authen-SASL >=dev-perl/SOAP-Lite-0.712.0 dev-perl/JSON-RPC >=dev-perl/JSON-XS-2.0.0 dev-perl/Test-Taint >=dev-perl/HTML-Parser-3.67.0 dev-perl/HTML-Scrubber >=virtual/perl-Encode-2.21.0 dev-perl/Encode-Detect dev-perl/Email-MIME-Attachment-Stripper dev-perl/Email-Reply dev-perl/TheSchwartz dev-perl/Daemon-Generic dev-perl/File-MimeInfo virtual/imagemagick-tools[perl] dev-perl/MIME-tools ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.96.0 ) graphviz? ( media-gfx/graphviz ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
+RDEPEND=virtual/httpd-cgi >=dev-lang/perl-5.10.1 >=dev-perl/CGI-3.510.0 virtual/perl-Digest-SHA >=dev-perl/DateTime-0.500.0 >=dev-perl/DateTime-TimeZone-0.710.0 >=dev-perl/DBI-1.601.0 >=dev-perl/Template-Toolkit-2.22 >=dev-perl/Email-Send-2.40.0 >=dev-perl/Email-MIME-1.904.0 dev-perl/URI >=dev-perl/List-MoreUtils-0.329.0 dev-perl/Math-Random-ISAAC postgres? ( >=dev-perl/DBD-Pg-1.49.0 ) mysql? ( >=dev-perl/DBD-mysql-4.0.5 ) sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 ) extras? ( >=dev-perl/GD-2.35[png,truetype] >=dev-perl/Chart-2.4.1 dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/XML-Twig >=dev-perl/MIME-tools-5.427.0 dev-perl/libwww-perl >=dev-perl/PatchReader-0.9.6 dev-perl/perl-ldap dev-perl/Authen-Radius dev-perl/Authen-SASL >=dev-perl/SOAP-Lite-0.712.0 dev-perl/JSON-RPC >=dev-perl/JSON-XS-2.0.0 dev-perl/Test-Taint >=dev-perl/HTML-Parser-3.67.0 dev-perl/HTML-Scrubber >=virtual/perl-Encode-2.21.0 dev-perl/Encode-Detect dev-perl/Email-MIME-Attachment-Stripper dev-perl/Email-Reply dev-perl/TheSchwartz dev-perl/Daemon-Generic dev-perl/File-MimeInfo virtual/imagemagick-tools[perl] dev-perl/MIME-tools ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.96.0 ) graphviz? ( media-gfx/graphviz ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=4.4.12-r1
+SLOT=4.4.12-r2
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.4.12.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=8acb7dd8d3984918fa924e25afb4c737
+_md5_=d5567297832defb8110c599d63660d90
diff --git a/metadata/md5-cache/www-apps/bugzilla-5.0.3-r1 b/metadata/md5-cache/www-apps/bugzilla-5.0.3-r2
index cc52611e47b6..825744975986 100644
--- a/metadata/md5-cache/www-apps/bugzilla-5.0.3-r1
+++ b/metadata/md5-cache/www-apps/bugzilla-5.0.3-r2
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.bugzilla.org
 IUSE=modperl extras graphviz mysql postgres sqlite test modperl vhosts
 KEYWORDS=amd64 x86
 LICENSE=MPL-2.0
-RDEPEND=virtual/httpd-cgi dev-lang/perl >=dev-perl/CGI-3.510.0 >=dev-perl/DBI-1.614.0 >=dev-perl/TimeDate-2.230.0 >=dev-perl/DateTime-0.750.0 >=dev-perl/DateTime-TimeZone-1.640.0 virtual/perl-Digest-SHA >=dev-perl/Email-MIME-1.904.0 >=dev-perl/Email-Sender-1.300.11 >=dev-perl/File-Slurp-9999.130.0 >=dev-perl/JSON-XS-2.10.0 >=dev-perl/List-MoreUtils-0.320.0 >=dev-perl/Math-Random-ISAAC-1.0.1 >=dev-perl/Template-Toolkit-2.240.0 >=dev-perl/URI-1.550.0 postgres? ( >=dev-perl/DBD-Pg-1.49 ) mysql? ( >=dev-perl/DBD-mysql-4.0.5 ) sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 ) extras? ( >=dev-perl/GD-2.350.0[png,truetype] >=dev-perl/Chart-2.4.1 dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/XML-Twig >=dev-perl/MIME-tools-5.427.0 dev-perl/libwww-perl >=dev-perl/PatchReader-0.9.6 dev-perl/perl-ldap dev-perl/RadiusPerl dev-perl/Authen-SASL >=dev-perl/SOAP-Lite-0.712.0 dev-perl/JSON-RPC >=dev-perl/JSON-XS-2.0.0 dev-perl/Test-Taint >=dev-perl/HTML-Parser-3.670.0 dev-perl/HTML-Scrubber >=virtual/perl-Encode-2.210.0 dev-perl/Encode-Detect dev-perl/Email-MIME-Attachment-Stripper dev-perl/Email-Reply dev-perl/TheSchwartz dev-perl/Daemon-Generic dev-perl/File-MimeInfo virtual/imagemagick-tools[perl] dev-perl/MIME-tools ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.960.0 ) graphviz? ( media-gfx/graphviz ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
+RDEPEND=virtual/httpd-cgi dev-lang/perl >=dev-perl/CGI-3.510.0 >=dev-perl/DBI-1.614.0 >=dev-perl/TimeDate-2.230.0 >=dev-perl/DateTime-0.750.0 >=dev-perl/DateTime-TimeZone-1.640.0 virtual/perl-Digest-SHA >=dev-perl/Email-MIME-1.904.0 >=dev-perl/Email-Sender-1.300.11 >=dev-perl/File-Slurp-9999.130.0 >=dev-perl/JSON-XS-2.10.0 >=dev-perl/List-MoreUtils-0.320.0 >=dev-perl/Math-Random-ISAAC-1.0.1 >=dev-perl/Template-Toolkit-2.240.0 >=dev-perl/URI-1.550.0 postgres? ( >=dev-perl/DBD-Pg-1.49 ) mysql? ( >=dev-perl/DBD-mysql-4.0.5 ) sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 ) extras? ( >=dev-perl/GD-2.350.0[png,truetype] >=dev-perl/Chart-2.4.1 dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/XML-Twig >=dev-perl/MIME-tools-5.427.0 dev-perl/libwww-perl >=dev-perl/PatchReader-0.9.6 dev-perl/perl-ldap dev-perl/Authen-Radius dev-perl/Authen-SASL >=dev-perl/SOAP-Lite-0.712.0 dev-perl/JSON-RPC >=dev-perl/JSON-XS-2.0.0 dev-perl/Test-Taint >=dev-perl/HTML-Parser-3.670.0 dev-perl/HTML-Scrubber >=virtual/perl-Encode-2.210.0 dev-perl/Encode-Detect dev-perl/Email-MIME-Attachment-Stripper dev-perl/Email-Reply dev-perl/TheSchwartz dev-perl/Daemon-Generic dev-perl/File-MimeInfo virtual/imagemagick-tools[perl] dev-perl/MIME-tools ) modperl? ( www-apache/mod_perl:1 >=dev-perl/Apache-SizeLimit-0.960.0 ) graphviz? ( media-gfx/graphviz ) modperl? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=5.0.3-r1
+SLOT=5.0.3-r2
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-5.0.3.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=df8867b0043a3383e0de11e1986b775d
+_md5_=8af3290349f0306c0803265ce8f11c65
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 5b309e5c4acf..2a4d9a2eed3e 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.8 b/metadata/md5-cache/x11-libs/motif-2.3.8
new file mode 100644
index 000000000000..780bdf32bf37
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/motif-2.3.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.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/libXt-1.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(-)?] jpeg? ( >=virtual/jpeg-0-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(-)?] ) png? ( >=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(-)?] ) unicode? ( >=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(-)?] ) xft? ( >=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(-)?] >=x11-libs/libXft-2.3.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(-)?] ) sys-devel/flex || ( dev-util/byacc sys-freebsd/freebsd-ubin ) x11-misc/xbitmaps >=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=The Motif user interface component toolkit
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/motif/ http://motif.ics.com/
+IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+ MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.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/libXt-1.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(-)?] jpeg? ( >=virtual/jpeg-0-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(-)?] ) png? ( >=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(-)?] ) unicode? ( >=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(-)?] ) xft? ( >=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(-)?] >=x11-libs/libXft-2.3.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(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.6-patches-2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6badb430bbbfb97f7680cd28621e04e6
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 7ddbfad9982e..83423f24c4ba 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/slop-4.3.21 b/metadata/md5-cache/x11-misc/slop-4.3.21
deleted file mode 100644
index 32ed9c5a7fe5..000000000000
--- a/metadata/md5-cache/x11-misc/slop-4.3.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= media-libs/imlib2 virtual/opengl x11-libs/libXrandr x11-libs/libXrender ) opengl? ( media-libs/glm ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=An application that queries the user for a selection for printing
-EAPI=6
-HOMEPAGE=https://github.com/naelstrof/slop
-IUSE=opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= media-libs/imlib2 virtual/opengl x11-libs/libXrandr x11-libs/libXrender )
-SLOT=0
-SRC_URI=https://github.com/naelstrof/slop/archive/v4.3.21.tar.gz -> slop-4.3.21.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fee805383e99188a2d47a6a2bc3d5ae1
diff --git a/metadata/md5-cache/x11-misc/slop-6.3.46 b/metadata/md5-cache/x11-misc/slop-6.3.46
index 2d09c6636a07..98be97a0e617 100644
--- a/metadata/md5-cache/x11-misc/slop-6.3.46
+++ b/metadata/md5-cache/x11-misc/slop-6.3.46
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/icu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXrender media-libs/glm sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-libs/icu:= virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXrender media-libs/glm sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=An application that queries the user for a selection for printing
 EAPI=6
 HOMEPAGE=https://github.com/naelstrof/slop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/icu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXrender
+RDEPEND=dev-libs/icu:= virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXrender
 SLOT=0
 SRC_URI=https://github.com/naelstrof/slop/archive/v6.3.46.tar.gz -> slop-6.3.46.tar.gz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=77fb09bd948ad5e65f8b289baa2b38cf
+_md5_=bbb47e842897b461b29695fce91559ae
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a105326370e3..857bf1865b26 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18681 BLAKE2B 4f85adba586bfd437a0328673a50f9ff929b291451a2e78ff32d7e1f6aeac36cbfce721d56e702e4af82ecaf36e51941bee4738c97c7436334b0e3e6e9ae2aab SHA512 cba0a30e14d7bfc769327a97e3bc72f859d18d8b00b3bdc01eaf9cbbd4082a156ae3b4a82bb820804f4255af798ad3bc668cd148a3a069fc90a374cb5f377fe0
-TIMESTAMP 2017-12-30T00:09:33Z
+TIMESTAMP 2017-12-31T21:39:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpG2T1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpJWRlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBFFA//fay4XgwEf/aNgP+suYWDJ5NtaqXamMO59swyDAi0aSBkYOf44uR5LzTW
-9tcfetKzEqmMk71X2HDKewxLs9RflOeJVU3maWmHj+YAYLAJWgxz1L7LZMNW9dvC
-7vE1LGdamSs9vu6B1UeV7esrDVF0HsHctlq0blqyA656f01ZgYK65lbWfd8BTuF1
-YCK1CFCrR6F9i9pwMvKHVQPW5gg+eVbYtXKHqfPryoyb1QyNAC712fTwod01raAi
-76QF72cDFJ1ppkA3U15/fCW/Q1SrUQiDwH/itaGsHz8jd1jEHZ2z2fXsDidSkcWk
-s+AWGf3HBeYsOMGY17HYZMABVXml9MHAuJ7GIEQo4Aj5ogZHg+vgVNHHOIuzYwf9
-K4wkvUbTwdRJvVEpuM0EvS3Jerynavz6gGnY6MS+icnvU2ibtRghW7Xqg7mFODmt
-RuMfndST21MgfklDjjaXs+7SiL92hD+DcwOaLyBofXo6/5FeprROxmSwgBIGlqdL
-QSSjDZKQp/aSZBv8xvy0S7O18H0XieqFaaNOfaKpBagOtZcxi71cAEKGGVdPuIGh
-x0A3w3aI88OqOeCcHvKGAM4dzt8mgYzCHfv1dAj6L9m2FAQd3Hcglis5aNA0EhK2
-DXjOyns04eFK3bm2iC5txlRRNw8zOwQjJVVaRReqCwkhTlkogMY=
-=+1ps
+klCxSg//SXorDvFVsddotPI8wN49JUHBp6vyCXwcmsnOWEaV2T9afu1Zy+dZ+7Rd
+adF6GlVDgbdKrOyUh/MIGGTLHlfZ0WXM1TQMQ8DuFiKqtTvCNOfEiPmjAP+N5L9B
+XhkkY5NTF2WUj2L09QBxoFcW+VWsRjI06NIXrnnrXjsUI1Wsl7LHHw5zSMKIsgwV
+Z/LwgnG4I5LOlXFsHUdtnuhZO2DrkxdR2ZiZ3qqphAXgoP1xwNUdl2r1umNlWmSk
+SjnIthffQ2JegndDywYE2dp8JL94wE6XG/iHCWTlk7w6Z/RZjcRS/jF6JRpOw9fH
+tCBvcVZwG8yrF9ERB6jXVEX36E1kUmisIM/s4WqIWfI1n4tjaOAekZAsVHDlDJmh
+CruGfnDfyp7NCC3t7XnhjWYIOdPnkcvcGRIMhOhtQRRlW7/R2mPMq3X+RE4OYmAR
+wPV+SboltWJ6X/iRDGsoury87NYrRRf97kGovhTQYDenf/pbTNDWQTooc4Sf3aip
+Fx3BtIHCtxTfyQFGeWd5WgH/MzBQeHTrw+DarP0Glg6Xh0i0S6FasRz4IrzvPW9p
+chZ8w8E7TLwAzb+21Lg6cvxaqJKzCRzNNSc+8Ily/Z2FajYrkgfkCcwnn7xHkDFP
+BmVcj555E/zAa9cjCu2ynSeDz/4PLks86JJ9C5Cf9RhXJn/JLVc=
+=uGs6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6145415cfb57..29b12457314e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Dec 2017 00:09:29 +0000
+Sun, 31 Dec 2017 21:39:33 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 35e7caf5a8b1..8cfb88fe801f 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -340,6 +340,10 @@
       <role>Misc stuff, toolchain</role>
     </member>
     <member>
+      <email>floppym@gentoo.org</email>
+      <name>Mike Gilbert</name>
+    </member>
+    <member>
       <email>hwoarang@gentoo.org</email>
       <name>Markos Chandras</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index fff5a2e1362f..6c270289ce9b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Dec 30 00:09:29 UTC 2017
+Sun Dec 31 21:39:33 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2dce1bdab1db..8903cf8720c9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Dec 2017 00:15:01 +0000
+Sun, 31 Dec 2017 21:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e4185b026a38..e4297053d0c1 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-caf7ca4151ab86d6bcaea26f40cde85086fa8507 1514590695 2017-12-29T23:38:15+00:00
+0e95698ff9584aa8045275705c0247a77264d044 1514755589 2017-12-31T21:26:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index cf5591a4ec2f..b732e38be3db 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1514592601 Sat 30 Dec 2017 12:10:01 AM UTC
+1514756401 Sun 31 Dec 2017 09:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 6145415cfb57..29b12457314e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 30 Dec 2017 00:09:29 +0000
+Sun, 31 Dec 2017 21:39:33 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a68bcbbd1be2..78fa41caf058 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index f22d692bcd4a..506714fbc856 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,17 +1,9 @@
-AUX fix-prestripped-binaries-1.7.0.patch 857 BLAKE2B 4d237423dfa24ed74973adf5a24226af82881c4c7d972700258ff2fa3b267b291e62af949a238cbb818221a1530d46e43e02b78769f6f8dd45f81637e417d3e6 SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c
 AUX icinga-apache.conf 465 BLAKE2B 2a74475126eb4dbc3d7a9ccfccc98696c1d69774e99bca9d3ec67d8cb54526f07f215d0ba13e0fbdf6209e3aa8b7a6abcc21d51c93e630b9db1919b3a5b71c41 SHA512 8f08f6938f2c233e230b45afdc634653cd971bf26fab60252f8633f2b1609f724575f256b018b6016852279ff3ddd12341825f0489be3266c3c096fe983e5841
 AUX icinga-conf.d 178 BLAKE2B e65d9d36e6026046912c7cd3be69493aaa5b564d20756fad47b08ce542e7c8d456fc8f5c6f8c15c89e40af9199df85784ba2fe486f4cee8987cca976a87a7c8c SHA512 96411175c488423c61f45fc9c76131a9807a36f08c9f73c6a6fb50e432d951d3e4ab42b456732b48cb009944faff4af472eb76fbefd75fd61978dfc6d199e9cd
 AUX icinga-init.d 1504 BLAKE2B 31dfc99fc9f0d264c35df7a03178ae9465d8b6d2efdd021e02674a09fc6f46efde1e384d25e8bae6f6f3d5181b45d31c1322a1e9a635218f91dce89964e09537 SHA512 fc79b59047981710ae886a08d4b3c84d4fd91c3a8fd0b553056df5703c8b0685e22f9288df9c4f9788ae2e3429935d5f57f39711d1f47bf4723232a78f9082af
 AUX icinga-lighty.conf 465 BLAKE2B fe68f22ac43b2010c50fb47da1219e8e60d5f68ea57eef47e53ce890ab6a441abcf4ee9adf2d9b90105366d42f6f711b129f7851d0ba6c2c3ccbce363d596892 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372
 AUX ido2db-conf.d 35 BLAKE2B ca911fa8d9094fc5507849fdc4787156e0015676ee0e77006093af867120af9783d53f91b90493960acdc2878273fe10730bef36bdcc26c017a4a2d3400cf6cc SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f
 AUX ido2db-init.d 822 BLAKE2B 6affaf5af609a93ee1c12b9ff0b76e3cd4883ab26e58fedd6bff36978873b6347c005d0ba5018e3b0bb40771b1f8eebf259a6f387786154243a0b00b1c8e4b04 SHA512 8593a676389aae540a4fa3e4c7c6f558254da018b13b8dda7a932307645029775659b1258c68fa2178086978c59250be4820b0cc1a3d3c7ded276aa17a3b9b6e
-DIST CVE-2015-8010_1.13.3.patch 177807 BLAKE2B c3832442d2953f28793236cd29c537041fc68e976e593da4793cd55c240de784c5bb3996ff38464097b3af27bb276d21c7538c90d2470d5067a831b1800f2874 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a
-DIST icinga-1.13.4.tar.gz 18741576 BLAKE2B fccc88c8749d405e29961e5a1510bec7f920fc43910be757668392098f4ff19ed9f659de911f97e150eea8bd8cfd7a60b440704bdcd9aba450ba1ea29222d1cf SHA512 245f94facfcbb125ed6be26a2544292b7ce6d59a6d38374b7ef1b24b2ca3deaaff56720542c3747d36ab4998b88b367ca40bbd061491e0770e21505bd7c0a1d6
-DIST icinga-1.14.0.tar.gz 20779347 BLAKE2B 65899e99fdc57563aa1dee6f19572c032c5ab6e2aa7093482bd6d6068b4d066d3630ce9bf1396efcb65592d4f25292149178dac81a2a0b775745f70b7409bcc0 SHA512 f02c60c2bd1d3dff4a5a42f9d3c3362ada421f2cd83362b3cdd05f59b0aafe4f61255b621afed1fbf959415545a94ce6b3124bf2ffac22f0f2bdb8a67e75ad7a
 DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2 SHA512 9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41
-EBUILD icinga-1.13.4.ebuild 7956 BLAKE2B 656e1db2b2d7ae0d1b7ccb2eb931565212732e2530542c1bb81cdc293f79bcc7909cc80964e475e29bd40a93abded0377dd3fcbb01640bbaa1dd846716053459 SHA512 ec0b90e102cc5f0b282731f923c15b259c4581f35eaed8eafd13678f9455754f808004b38c0f03eb723ff61fcffb51750f90163e6c4b2b5c887a286e029c429f
-EBUILD icinga-1.14.0-r1.ebuild 7691 BLAKE2B d8b0cb7ca1d92107adb0a0e34053cb7928e40146df6f6092497c1c73ce3fcbfab53ba856a58b4b61f6fd2c23a1f15023d609e7c92c6209c0916441ce7a520ade SHA512 b3778bcc58c99ff27d3c801a45c57027aa431d9edb8c2b4bb7d7119e1a8a0cbe36218553a5226510d0b9122cd196241230d488caf313ca56fae2475df0f8c21a
-EBUILD icinga-1.14.0-r2.ebuild 7691 BLAKE2B d8b0cb7ca1d92107adb0a0e34053cb7928e40146df6f6092497c1c73ce3fcbfab53ba856a58b4b61f6fd2c23a1f15023d609e7c92c6209c0916441ce7a520ade SHA512 b3778bcc58c99ff27d3c801a45c57027aa431d9edb8c2b4bb7d7119e1a8a0cbe36218553a5226510d0b9122cd196241230d488caf313ca56fae2475df0f8c21a
-EBUILD icinga-1.14.0.ebuild 7920 BLAKE2B d5fe3a133c5733b7116376e4ca7c64ca7c621a6dfea314c6464e40d11004151a647594ca9502dff679236d7783d85465fab5b48efdb833d8421243462065dc42 SHA512 ef73833c299d5dba38c489e77a8faf22356949bc7599f5e6da2d3540921015507410062227d7330a42155b32e3d84cca252b4366fc43e735d39f3c6a3d1111cd
-EBUILD icinga-1.14.2.ebuild 7424 BLAKE2B af376413b94cb33b18eb22bf7a6dac40004d5648ca2790defd3f57596a63edc77f2aa6eedef480be23ce40b82ee798946363e758f2122bcb34b560e440bf2986 SHA512 ade7d28abb51118e08595a8668683743c5c5d0eae394ef09f11dba979cfd791a5d7fe4bcd4e72e1d18a07628b3ec92d33ce79ac9e67b6230e8ecf156d2b91121
+EBUILD icinga-1.14.2.ebuild 7422 BLAKE2B d7229dad9007eb6c95a6ce7151cc43fadc26c9c0e92c3051f78a24793b23888566fc4dacd2376fc53c44a471bcf9d26d005d51a4638220e27adcfb77a879f532 SHA512 b941c0a60848cbab59c2e0147d3cedf72539869fa468e26399bd060429de0241cd2654396e979d34d0f2ed298e1be2bfd75ec5268e5f506cb7ff4657205367cb
 MISC metadata.xml 853 BLAKE2B 6825b192328f944e2389f221e4dbf5fffea45f1cb650866a8240e53c723ae9b40473e092d48003844fd99b65db4e6ddc7747eddbf7239e7cf4ecddfcca375eb8 SHA512 1aad02d84c0e90f4f0f5ed54e326d9a14e77f5146b3ba9293279e009f45900a69e1b2fcc9f54cb02111f05bb2aef0370cda1b4bc4fffa4fc4dd0c2a073e0a92b
diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
deleted file mode 100644
index 256cfc83232f..000000000000
--- a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rupN icinga-1.7.0beta1-orig//base/Makefile.in icinga-1.7.0beta1//base/Makefile.in
---- icinga-1.7.0beta1-orig//base/Makefile.in	2012-05-09 07:10:21.000000000 -0500
-+++ icinga-1.7.0beta1//base/Makefile.in	2012-05-14 14:00:29.666346315 -0500
-@@ -41,7 +41,7 @@ HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
- COMMAND_OPTS=@COMMAND_OPTS@
--STRIP=@STRIP@
-+STRIP=/bin/true
-
- CGIURL=@cgiurl@
- HTMURL=@htmurl@
-diff -rupN icinga-1.7.0beta1-orig//cgi/Makefile.in icinga-1.7.0beta1//cgi/Makefile.in
---- icinga-1.7.0beta1-orig//cgi/Makefile.in	2012-05-09 07:10:21.000000000 -0500
-+++ icinga-1.7.0beta1//cgi/Makefile.in	2012-05-14 14:00:43.285346614 -0500
-@@ -21,7 +21,7 @@ INSTALL=@INSTALL@
- INSTALL_OPTS=@INSTALL_OPTS@
- INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
- COMMAND_OPTS=@COMMAND_OPTS@
--STRIP=@STRIP@
-+STRIP=/bin/true
-
- CGIEXTRAS=@CGIEXTRAS@
diff --git a/net-analyzer/icinga/icinga-1.13.4.ebuild b/net-analyzer/icinga/icinga-1.13.4.ebuild
deleted file mode 100644
index 4f6eef1f43e4..000000000000
--- a/net-analyzer/icinga/icinga-1.13.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch"
-S="${WORKDIR}/${PN}-core-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl:= )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-	epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-
-	# paxmarks
-	if use idoutils ; then
-		pax-mark m usr/sbin/ido2db
-	fi
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild b/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
deleted file mode 100644
index 681ce94efa8d..000000000000
--- a/net-analyzer/icinga/icinga-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz"
-S="${WORKDIR}/${PN}-core-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl:= )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode}
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga
-	newconfd "${FILESDIR}"/icinga-conf.d icinga
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/*
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga
-		cd "${D}"
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers
-#		fowners icinga:icinga /etc/icinga/eventhandlers
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga
-	fowners -R icinga:${webserver} /var/lib/icinga/rw
-
-	fperms 6755 /var/lib/icinga/rw
-
-	# ensure ownership
-	fowners -R root:root /etc/icinga
-	fperms 0750 /etc/icinga
-	fowners -R root:root /usr/sbin
-	fowners -R root:root /usr/$(get_libdir)
-	fowners -R root:root /usr/share/icinga/htdocs
-
-	# paxmarks
-	if use idoutils ; then
-		pax-mark m usr/sbin/ido2db
-	fi
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.14.0-r2.ebuild b/net-analyzer/icinga/icinga-1.14.0-r2.ebuild
deleted file mode 100644
index 681ce94efa8d..000000000000
--- a/net-analyzer/icinga/icinga-1.14.0-r2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz"
-S="${WORKDIR}/${PN}-core-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl:= )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-	eapply_user
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode}
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga
-	newconfd "${FILESDIR}"/icinga-conf.d icinga
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/*
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga
-		cd "${D}"
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers
-#		fowners icinga:icinga /etc/icinga/eventhandlers
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga
-	fowners -R icinga:${webserver} /var/lib/icinga/rw
-
-	fperms 6755 /var/lib/icinga/rw
-
-	# ensure ownership
-	fowners -R root:root /etc/icinga
-	fperms 0750 /etc/icinga
-	fowners -R root:root /usr/sbin
-	fowners -R root:root /usr/$(get_libdir)
-	fowners -R root:root /usr/share/icinga/htdocs
-
-	# paxmarks
-	if use idoutils ; then
-		pax-mark m usr/sbin/ido2db
-	fi
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.14.0.ebuild b/net-analyzer/icinga/icinga-1.14.0.ebuild
deleted file mode 100644
index f05bc0bec4ac..000000000000
--- a/net-analyzer/icinga/icinga-1.14.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-#MY_PV=$(delete_version_separator 3)
-#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-#S=${WORKDIR}/${PN}-${MY_PV}
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch"
-S="${WORKDIR}/${PN}-core-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl:= )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )"
-RESTRICT="test"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--libdir=/usr/$(get_libdir)
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga
-	--with-temp-file=/tmp/icinga/icinga.tmp"
-
-	if use idoutils ; then
-		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
-		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
-		--with-ido-sockfile=/var/lib/icinga/ido.sock
-		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
-	fi
-
-	if use eventhandler ; then
-		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
-	fi
-
-	if use plugins ; then
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-
-	if use contrib ; then
-		emake DESTDIR="${D}" -C contrib install || die
-	fi
-
-	if use eventhandler ; then
-		emake DESTDIR="${D}" install-eventhandlers || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-		fowners -R root:root /usr/$(get_libdir)/icinga || die
-		cd "${D}" || die
-		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	fi
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-
-	# paxmarks
-	if use idoutils ; then
-		pax-mark m usr/sbin/ido2db
-	fi
-}
-
-pkg_postinst() {
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add a line like"
-				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
-				elog
-				elog "Icinga web service needs user authentication. If you"
-				elog "use the base configuration, you need a password file"
-				elog "with a password for user \"icingaadmin\""
-				elog "You can create this file by executing:"
-				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
-				elog
-				elog "you may want to also add apache to the icinga group"
-				elog "to allow it access to the AuthUserFile"
-				elog
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-	elog
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	if [ -d "${ROOT}"/var/icinga ] ; then
-		ewarn
-		ewarn "/var/icinga was moved to /var/lib/icinga"
-		ewarn "please move the files if this was an upgrade"
-		if use idoutils ; then
-			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
-			ewarn "it accesses"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		fi
-		ewarn
-		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
-		ewarn "remove /var/icinga afterwards to make this warning disappear"
-	fi
-}
diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild b/net-analyzer/icinga/icinga-1.14.2.ebuild
index c7931ece03d9..d9d4e9fb3652 100644
--- a/net-analyzer/icinga/icinga-1.14.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-core-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
 DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
 	perl? ( dev-lang/perl:= )
diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index fe0b36d94668..6367cb53d83a 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -7,7 +7,7 @@ AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab41
 DIST smokeping-2.6.10.tar.gz 415383 BLAKE2B 7a502eddeb634404e379df67470595cf85512d64a5e137f6d7c344ceb606f99275016e1044ec820b2e9217e1d1b567164b636186bfe54e91249d585ef75c646a SHA512 e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13
 DIST smokeping-2.6.11.tar.gz 417338 BLAKE2B e1ff2fc05fd8d39f42e1cc89831aa36ef0522716d1768dba9bdedf09f6c64cc2b35f30c3b727959dd93ed8922235729a27c85acceb1e1c3ec9c5f60e21455ab9 SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
-EBUILD smokeping-2.6.10.ebuild 4097 BLAKE2B 364dee328025df0590b64c6897f2890f54164a51f39ad2a57875eab15e2c691c6dc43433818940499ec38dad69d5f156923f1f5cde72818dd50af722ca5ee8c1 SHA512 558151d2d8df9aa4b7c6a6d9f808d161980d79f821dda20c5c8b712af0a1b4e19bd42222a728f96a2b8bf09f00dd47bbc6b03036a39d86df886c58d4a3b71293
-EBUILD smokeping-2.6.11.ebuild 4083 BLAKE2B 641805392b63d8d049924bc19fdf3a14f481beaabb7d39ecee27c0458087f96c4cf747e1a2d1681d343c6884fa61a297ec4408f401f687613a418b24a634a64b SHA512 b4273d70038f29fc2bd6b9a6a15b94d5662dd5b2a541748077ddbd61672efe1fc27de72ad9c60f2529ba0eb7fb1c6ff43679e5513a205a8e0e1569140ad84a1d
-EBUILD smokeping-2.6.9.ebuild 4192 BLAKE2B af8cbe719e4ba88e8db3ac43c159d00e93ddefedab2612716d69580573582a4a7e5fd77810c6deaefe43132799e97a0604d3199ad15a71b973d3468af44f0e2a SHA512 a001ba30d3eeaed299f28b139573fa4eff0a170500beedb0782a94e5bd970b5421162ed7476ceec407b3e19ce7210e3d8af0d01dff2a98cd1f02c59e8ce7b402
+EBUILD smokeping-2.6.10-r1.ebuild 4100 BLAKE2B 8b2b8b8dfcb1e992adfb84c6f38d07f1bd6886db16e9a67195e38798a7e6c5d5fe7a6e564a79cfc80ea90ce9bfe42071871f4fb62deedbd4820ef357517cad68 SHA512 6d2a2b5fd8756ee62dfdc6093083b6374da60679f0ce63af585506962b979a7108d336f363b550ee65cda08d3c132cc910ca62271a178ad38cada05a313ba7ea
+EBUILD smokeping-2.6.11-r1.ebuild 4086 BLAKE2B 4a73ecb65aec7f39cdc66ece0fe2071591354e83baddf59188ddae4c6521262366238dffc43d0a2e4c533d512065e97a044385b689eaaa8673fb580b663ef277 SHA512 2cbea948678f9c31a2b315137bfbdcd573918dd3bf66defb7fb0c3d52c107cd09876e017dc75b42d4eacf8b8eccc72c31ed6ac9a64a6a156e49e4c4a7c648515
+EBUILD smokeping-2.6.9-r1.ebuild 4195 BLAKE2B 814e0156f457b0a331e1d661d75ce0aa39d38585400f7da8b215880881591c72bc712ff441c85a523d097303e257703c4a6a8d47aa5d02d554c4ec614e29ad68 SHA512 3349666be7eb8693b0158235fd8b9f55f9394abfa49f78bc88de739075d5a57a2ad393264025de0c252fab0d3d0ed2752a85149590f078d7f2d2bb51c487f608
 MISC metadata.xml 609 BLAKE2B 80a690cf6d514c95f27e370c0417cdc1787a0e149e7791bdd3684b195d2cf6ada9543d1001fd5353a00e05a01c62272b73e09ec838d9ea927b4c3bcbb274ab15 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727
diff --git a/net-analyzer/smokeping/smokeping-2.6.10.ebuild b/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
index cc533d1bb997..698506161260 100644
--- a/net-analyzer/smokeping/smokeping-2.6.10.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	echoping? ( >=net-analyzer/echoping-6.0.2 )
 	ipv6? ( >=dev-perl/Socket6-0.20 )
 	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/RadiusPerl )
+	radius? ( dev-perl/Authen-Radius )
 	ssh? ( dev-perl/Net-OpenSSH )
 	telnet? ( dev-perl/Net-Telnet )
 	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
diff --git a/net-analyzer/smokeping/smokeping-2.6.11.ebuild b/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
index 6a253fbb7b73..a5f7c689ef10 100644
--- a/net-analyzer/smokeping/smokeping-2.6.11.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	dig? ( net-dns/bind-tools )
 	echoping? ( >=net-analyzer/echoping-6.0.2 )
 	ipv6? ( >=dev-perl/Socket6-0.20 )
-	radius? ( dev-perl/RadiusPerl )
+	radius? ( dev-perl/Authen-Radius )
 "
 
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/smokeping/smokeping-2.6.9.ebuild b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
index 096133b50eab..c5e0b1b312c0 100644
--- a/net-analyzer/smokeping/smokeping-2.6.9.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	echoping? ( >=net-analyzer/echoping-6.0.2 )
 	ipv6? ( >=dev-perl/Socket6-0.20 )
 	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/RadiusPerl )
+	radius? ( dev-perl/Authen-Radius )
 	ssh? ( dev-perl/Net-OpenSSH )
 	telnet? ( dev-perl/Net-Telnet )
 	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index cc729fe4c4e9..05b1063beec4 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 22581fc4ac31..d78e8f19cf48 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,3 +1,4 @@
+AUX shorewall-5.1.10.1-fix-find.patch 674 BLAKE2B 4bb05ba775c0fdde4ceed50b381cfad29e51f54fbc10927a6b11088ee4c02825959206750ab6d099f9444bbd306c10f932a86389e8c7a9d2ad21172a55410e53 SHA512 d2e985e84bd0122aaed1e6a955c53344794ec1458ff4d97e138a355aa9549f7ae60d9ab556c0ffbedd5078a523a8e38267c51dab6eda2f25b1285d3231826080
 AUX shorewall-add-iproute2-4.13.0+-support.patch 889 BLAKE2B 45a9b0fbaffbf284f943c627b8b5bfb5e820f8c132ec5dd08247f17a325303e72afb28eeae0a6d5bf72d45f88d8eef5894321135da572dfaeefd41a37507cb94 SHA512 821dc1104671f1f5781ee597c1f5c5bff6a77935255be5329064a82b8d645f17dad106e505290620809c6ae1ba25239e667640eda9a003616ebc7b0f422210f3
 AUX shorewall-init-01_remove-ipset-functionality-r1.patch 799 BLAKE2B 5cbf0835d291464eca10356fcfe1de13bc90cf0e3b9869d0daf8e3ad3864a44939774179047cbf5e192f0e294d8e8765c6d7b60a02178c9c149cbda4d3342b83 SHA512 c8686cb9345abd1036a8fdc6cbdaacc21a69df9dc536393a65675a2ae19c9cfb71d71cc66a9776135ad923414bde783f01dfa69600d1cfaafd618fcea65c8dcf
 AUX shorewall-init.confd 152 BLAKE2B b670db8a1da8e37c9d0f856c27ceb9644ec7baebf82e8d053c02a6f133df15a04087340ac430c8dddc57295332834c3e8e1c6fcb994e96e7224452a5a039d1c4 SHA512 105393c3cbdd1820066e41ed941b6a79cafde3196eb723c06ca984fc663370d6902757467339b6b4ebfb8d00167b9f85311b6842dadc564029313eb36f1a389b
@@ -27,7 +28,7 @@ DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d4
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975
+EBUILD shorewall-5.1.10.1-r2.ebuild 16190 BLAKE2B 5953e5fbfaacd1bc2bb37e2c83564fc173f292ad3912731ad4b9fcab8db0d6676d8dcbc9d19ab9698d471a36536ef09f219e5f1cf9053ed2cc1bae046f154b53 SHA512 b9af71fab802e904062cd2f28c04511f95541de81679314766a4b6ebb06c3a8236f39988846603129da1656c2be2343549b9c88dd0962ce9e84e4bedf0d732f8
 EBUILD shorewall-5.1.10.1.ebuild 16138 BLAKE2B 773362be92a5387b429438909a85900c0b0c44860149693ff3e1bc5b0262585160b309166b0e1fce6ef66f577e0ebfbfd9190c7745cadf9c2d541a0ae9729ded SHA512 0eed0236de6f7a2f336e052cbfd7c57a95687520df51b580557bc5ba11aabd5d6dd8ac23809950ec76dcce24e78922d254f52187df5d82bd4e70c6af020a9893
-EBUILD shorewall-5.1.9-r1.ebuild 16200 BLAKE2B a931f89d20368834293d50faa37f38d4224146f9ab11d247f6be5d85fab6bf258e60f5aedbaa28f5245a9ece5d4a3bdb0634ad7d90a32e203980417ceee70bf1 SHA512 9f3e31d7991a3960f8cfff37eb10b791c8f8f2fc260be12f7dc57a032ee16ef20fd618e905268f59d716b5aa132557d4d210bbbb3dccb34b042012deb959e1bc
-EBUILD shorewall-5.1.9.ebuild 16131 BLAKE2B 66da436b07968eb3cc2f17e7b18b30d1bf345c00d5df68f33ef0bba04d1ea99b08ad3b1b9269ec2967ef63ede1df8fbf5f6c6bd36dc848f0a66f87b2926d3d6f SHA512 4b7290fde74bb035b8c4b2e9b4d7865b3c45eba0f9814f2f046fa482a3d89606fdb42faeadbfe8cb3b39dd85a95171a1e05f6db2432def12e076784dcd93e8e3
+EBUILD shorewall-5.1.9-r1.ebuild 16199 BLAKE2B 99451766a294d056ba5c0a0ea807584c241e187abe425c7d42473a8fd92a743c68cb1bb6aec6fc9df1551ec35a3aa25a45f17fd86a5ca98c63ad982ed4a19617 SHA512 2282ce7bd8962f0733fe1e2d2c0696b40c29abf0519f058fec6d87b0cce2ff164a1658935aa59f4f22c04095e1cb70dd19800d1518f0b390f3d5de8c24d675c4
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch
new file mode 100644
index 000000000000..2850d12297f0
--- /dev/null
+++ b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch
@@ -0,0 +1,21 @@
+commit 4e5b98d3d928579bc3530893ceaf166337ea8e22
+Author: Tom Eastep <teastep@shorewall.net>
+Date:   Fri Dec 29 15:32:05 2017 -0800
+
+    Only search files in each CONFIG_PATH directory - no recursion
+    
+    Signed-off-by: Tom Eastep <teastep@shorewall.net>
+
+diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
+index 6f220aa3d..95eafdf65 100644
+--- a/shorewall-5.1.10.1/lib.cli-std
++++ b/shorewall-5.1.10.1/lib.cli-std
+@@ -386,7 +386,7 @@ uptodate() {
+     IFS=':'
+ 
+     for dir in $g_shorewalldir $CONFIG_PATH; do
+-	if [ -n "$(find ${dir} -newer $1)" ]; then
++	if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then
+ 	    IFS="$ifs"
+ 	    return 1;
+ 	fi
diff --git a/net-firewall/shorewall/shorewall-5.1.9.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild
index 3f5247ae95c5..ffef283075da 100644
--- a/net-firewall/shorewall/shorewall-5.1.9.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 SRC_URI="
@@ -94,7 +94,7 @@ DEPEND=""
 
 RDEPEND="
 	>=net-firewall/iptables-1.4.20
-	<sys-apps/iproute2-4.13.0[-minimal]
+	>=sys-apps/iproute2-3.8.0[-minimal]
 	>=sys-devel/bc-1.06.95
 	ipv4? (
 		>=dev-lang/perl-5.16
@@ -164,6 +164,7 @@ src_prepare() {
 	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
 	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
 	eend 0
+	eapply "${FILESDIR}"/${PN}-5.1.10.1-fix-find.patch
 
 	# shorewall
 	if use ipv4; then
diff --git a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
index 22419c59ec5f..f6ef8b56e58f 100644
--- a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f41397a06160..95403efee584 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 55e266c65902..ddcb26353145 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,6 +1,7 @@
 DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d
 DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df
 DIST enet-1.3.7.tar.gz 522150 BLAKE2B 8a2efee0aec375dc4f9e3594c81ce7d6b8ba846ac75ed9e9e03175db39c6b1bce6ad62782d4bb5a0fc0dfdf4574d6e8c52b45cf2a84d72aaca16fc40787fb111 SHA512 b715347d94d8c5361033002e366f2cd7b8dd263faf7e84bd3d120de770f85025749fed4325c08f12d27875a112fb534a0464f8776bea6c3df2f048b57e5623f0
+EBUILD enet-1.2.2-r1.ebuild 475 BLAKE2B 48f3a59fa1a150c46323b3744aa9920e06211842e32cc652854a2827e4e2d56610d50050147bebcfe24db08b706da2d649e063db157e8e39d17b4f1bbbcd21de SHA512 b98ce3a416cc76050dcb6a34f7096ee4347ff02b0e6c1e2b93a91a3d8a1b5bc031cf6f709a893d5dcf76c3297764778c5901c9c8e48bf901b02264436ea7ff76
 EBUILD enet-1.2.2.ebuild 514 BLAKE2B bd75eb838ff34568ad3b31cdd6c46617b518acc68533ef1221910e0b410d648818a19d2fd2d66c24bbbc4da1507b811e13278fb3d93cee7e5d91c22e6657a321 SHA512 31e3c60c7374bb2c0b150b82484b04bcd5ddc1ac1d45749acec2e520489ddd9f485939153b6c6272e408db86eed89eb8e91654344636007d5ca5f892c396a0fa
 EBUILD enet-1.3.13.ebuild 534 BLAKE2B fec01d1aa98b343cf7627f7eadb07ec29e750e74b83b0796a43d5088ee094a4cb47749c2b92a8ed804bb2e0658612413214d61b302e73cf751df5aa42196f3c7 SHA512 7ac184be6f2044d08ffcc7ec58596711d1aaf4fb406b8896eb0dd05a62ccec33bdf157ced6992d5d5683d6f87af3b0a1d1a6d81f72af9739c4201e15feca5429
 EBUILD enet-1.3.7.ebuild 680 BLAKE2B e261b7f92064353aeabb521b2e444d4f2b1fbc937ae2b3d66ccd0b4322f8b3094ed0faa780c9945e37372f5bda4dd41723948873fb67853ad382c79ad0388a88 SHA512 65280725be46ef84c6ffc5035352fbb37e3038a5abd39b294ee8b05d155393bf11711ab8e947d91dba2ab90b540de884c3d2857983578a5bd9e6145a4bcba858
diff --git a/net-libs/enet/enet-1.2.2-r1.ebuild b/net-libs/enet/enet-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..574384dac15f
--- /dev/null
+++ b/net-libs/enet/enet-1.2.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+HOMEPAGE="http://enet.bespin.org/"
+SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static)
+}
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 4ab44bce2628..d5750a7cab67 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,8 +1,11 @@
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD libbitcoinconsensus-0.13.1.ebuild 608 BLAKE2B 6f6cfdf482edc19ba4708664d0a161514c13c205d0ba5f9ddfcf8492e9ab5b734ccc73ced89d196cac82cfa314dbff14900648d461886d972d0c18d3b240f110 SHA512 20581062b5cc1dd73e8334aa127b750f2b73e38544076ab77c5f9d9659d186f4d46b4e0ecf31317d16893dfef89e194eaef310e108d76115e3d8b359edb3339f
 EBUILD libbitcoinconsensus-0.13.2.ebuild 608 BLAKE2B 5536ce019cd28b55129ac466012f0d3463cc081389ce3497fda010e46a9c0ffa586a0c9f00fd80ce81463f3a77d6ad6dccf1b4959f1e8f8ac5ed1ec8b158a0b6 SHA512 62b1de1e117af3f66721df34519a40f3347e51914f0f3deab203225d684a4056e0db09a1e2c8acdcaf97b492018d6ab726f9e2b6e0b87b3200d203df9ea66348
+EBUILD libbitcoinconsensus-0.15.1.ebuild 2387 BLAKE2B 41805a2aeae89849833054571267ad0c90d20cf25570cc60e70fe2ca15abce2a482cdbe6be3b10ff8a9c682b6dcb27c844dc0628b9855440464961d46d203f7d SHA512 6912c3598f2516d583f4569bb66fcf30c8ab12e097393a3d5ee6d37ff6f890c4a002b349e0d616303bc87481b93352898327d54a288de5197af82e10bb74da77
 EBUILD libbitcoinconsensus-9999.ebuild 512 BLAKE2B 5a1bc9f59c902cee3357f913334564e8e91808d7d19abb88ee1f1ae2d44b785be975f18643223a2a619acefc704a073ada3e308d2bb5385109e9f2d5bbc1cefb SHA512 4c8b7bdfdded19b7907ad5f8dcd5541ab15c585381604d619a20f3ad1fd7672936b1d25951406613490c5a11e880c5f866d45d250a72625e865aa08370a365fb
-MISC metadata.xml 454 BLAKE2B bab3faf6cb2af717f0c21cdd1183733c968823e206934a07e7afe99487d352d56048c854e624c7328344977e960420bdd8256df08cbb1601a47b9f04428f2fd5 SHA512 e666cfd44fff4e75dc6af1b49a81b88233ad5c48ad213dcc4b359ded3ad3752bdf73e89d647357cf71eaba8e67256acdc4c9b1f284f273477e25f2c228ff2a83
+MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
new file mode 100644
index 000000000000..d83c3297cadf
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="+asm knots libressl"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm experimental-asm)
+		--without-qtdbus
+		--without-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 54ddf8fd823f..946f87b1e8e0 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -9,7 +9,12 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="asm">Enable assembly for optimization</flag>
+		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 2a1bdb88793b..2b7c0bad1a4f 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,4 +1,6 @@
 DIST rpcsvc-proto-1.2.tar.gz 59883 BLAKE2B 178f9f9fced73dc2e4b587f1bd7924c2811f0b96b5efc048e9a6d3cb4abd32a2c34ff0f5b01576f3dc51f07ca6a06266cd7a055f278f7b205cbb9e30563015e4 SHA512 59e6ac2c3e551daef584878e8ae8fc2da7cb80a04c20f96de561abc972fcfac1fbb57a5ee0dbe7bf5288a1527c9b87fc3f73a259b30393982a9a642cf4b4deb4
+DIST rpcsvc-proto-1.3.tar.gz 59202 BLAKE2B 88c74806419e097b20fc41bb63ff66401a6c21a2b7100474e55f1b6452a32d669e879248f00349604237e996167b21b9173158e69876f0db3a1394fb922df7af SHA512 5880ea39a750ee1f69dcedfe32afd617e695ee5328d6386977bbd11babb7bd18d8cb50c2d5f8daf35650aa8a94a4f6dda1171c1159917bb596108b1057c5a158
 EBUILD rpcsvc-proto-0.ebuild 495 BLAKE2B c5df8759ec767be4305c031aed71246536b2ea8b9256c7667358e27921d1f421e5b462ace83fa383b7e0e54c634b79e3706f05fb77ecc74336fc78eb2e7f5b25 SHA512 3103a561491eb5afe0b35ea513765297edf42b24c24e24130eccef2af36fb85d066ba648a9938fbf744e0c0be3958040892cc66476a80959ab69dbfdac88850b
 EBUILD rpcsvc-proto-1.2-r1.ebuild 649 BLAKE2B d95ca842ad48c1fb83a4003cea99ae44312d7e6cb59f777a67dbca0585809a218230f86f2b1237c704bc9805ab36677374b3bbb6f202f4db5178c628faaee668 SHA512 9901e68bd3672ce6689f055d4d79cc73cbf4352c7bb4e1d901450a6ba47f63c0dfe16681a003069a631d31f56b91ed7cc156d3f54a0b1e39b6bb592d180da96d
+EBUILD rpcsvc-proto-1.3.ebuild 641 BLAKE2B 384f51cfdca049ba988fbed43765e64232a54d7c3341419a24a0e5df8723cdcb24f5adb4a2c744ef5666c1bba493b6b061bd1986fecd88390e2c83d5120c11ec SHA512 ca768b98578bf6c7b7c6127ac6ac9c33ba8c6c7a28672a9231a085ab78a02fc4745e3c54c54e5584c8903f1a922fcc7ab28b0a9ff8ba304d2fffbacd9ff9024a
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.ebuild
new file mode 100644
index 000000000000..56b2e7ba095e
--- /dev/null
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+ BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<sys-libs/glibc-2.26"
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_install(){
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED}"/usr/include/rpcsvc/rquota.{x,h} || die
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 96d9f57170aa..a25323411941 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -10,6 +10,7 @@ DIST zeromq-4.1.6.tar.gz 799771 BLAKE2B 91ecc39122199846bfe0d9ea49c2acc076d0f827
 DIST zeromq-4.2.0.tar.gz 1046254 BLAKE2B d14bad19861cef7bfd58f571118e5dce89afecf1b80c05c6089f7669b702c38a93825e736e73988cae3f2ce90ab4a3fc28dc34b5ca2e6ff0a12707eb238bc05e SHA512 3b6f0a1869fb1663ea40b3c3aa088b81399a35c051e4ade2b30bbac60bfceefe6b4403248a4635fb31d33767c1e478342f61c47b0ffdb4501419c13590ebeb96
 DIST zeromq-4.2.1.tar.gz 1243428 BLAKE2B 2112f127d5e9624861adad455e77c21b17db09123adbe6473e86575a63ca1c21634078cce9af13e9ea1cc24e68658ae56172d98f24478161c14c5be56a922739 SHA512 6ef52edff930be34451e81bd21a7e23f08e135c8e10e006d0a6146e7fa4171e9dcf9065f77c33cb0c0db4c16cff4a50cab2a9d612e306490a02bc6a4a913ba6a
 DIST zeromq-4.2.2.tar.gz 1236437 BLAKE2B 7104f8ad28cc00f1ba6d6cb5dbb9aa466971c73a513e206eee77db293f4e4845106910d539363dc0c21de7e83885056453a530c941c38e19c5ec1fa836e1bca0 SHA512 d78813a61ce3311a1f8c230f7da0f5aedc97ef4b792afb6d398c5710da239348c0c7a67bdfeb38a7ab0282af498f1ed173649aff4add1bc35f0ef1b66f965443
+DIST zeromq-4.2.3.tar.gz 1326780 BLAKE2B f76ff6461e5a180221b1fff471e795a457fe4f26ec1ca725438aff4e240be7da80e42b2aea49845b5712e1d63590f64bc681f9a793bcf4d32fe0ee08bcab482c SHA512 8ac588a7a4db9d65586dd7b501999edac151e1d03056c1014d7ded6cd4bcf5bb4f81252b47d89d60c3ad7d527685218992bf5853b4656c0702e0f64c2d77712b
 EBUILD zeromq-2.2.0.ebuild 1309 BLAKE2B bba1deacc16911ea6b6d3e9ffaf877942e2a4483b222220ed12f7ebd4e8848ffbe8f277c818e7cb706ecaaccb07741f3c38a1414935e88f8451f5e931dee837b SHA512 175a18d212a1966dceb29be017c1a018e5aa032c2cc176bd328b64106ae39287fc188a28c0e4242d9627f9957c7302c830749f0e396cb030ee30e929400e1b2e
 EBUILD zeromq-3.2.3.ebuild 1520 BLAKE2B 81d008fa3fab31485ee72e5669479f7a730b14c2f20af29dd51e9bda168ee4dba9057a43214addec88f6b6c5960899898351b234f352464854a63a79b0d0fbe7 SHA512 1bb6da7c444a4377fe716d6a0702d12b2e23128418cd38820d2093da7bf0b14d9a3d7e85b17e283ec49bdedf5f5214d6723b23869d431c8fff82b816d3499fc4
 EBUILD zeromq-3.2.5.ebuild 1463 BLAKE2B 029a0f442cc651fa2fdd77d2917906062e851b7e1fea9f65cd6b247772a1eb33324ee95a753838c449eec47816d8d558bc0834418ecba14d48c9e6710632319f SHA512 1f0eaf965e38c837b94618b4d8c5308f11eef575d7e9c5cdace67768a11783c706b8a946df75a61554be45d480b6be282b8dd64c81f4db60c5cd658238a472fa
@@ -20,4 +21,5 @@ EBUILD zeromq-4.2.1.ebuild 1209 BLAKE2B 88a85bc62cedded0176d93e46d231cea694faf27
 EBUILD zeromq-4.2.2-r1.ebuild 1380 BLAKE2B 30394e0c22a77aeae94d990f688ab2fc13663be68bcd8ae10e48ceb7316a75a5b1fa15528f5e92f02e9315e8ca536ae591d08671754b0bc6577fdf8bddb4082e SHA512 5ce25d3196c4be51420af99b4590d54c79b687d74a3b64ee44b1322bbce829e3e04b99ea5cb840f1f991f36cc12f9080806aa91666ba183372dee6963442b7d9
 EBUILD zeromq-4.2.2-r2.ebuild 1517 BLAKE2B 8ccd7d358bf0a16e310c642e058111aea44c46aec9ef37427d1bf3fcf32711e134a51ae7840ab1e3768250e26577f7d634d69604642fd7479b0c72481d0a9984 SHA512 205efb9467010f2ca545d019daeda7af8fc9031cee054caebe3d987c711cab2812e82a5adb584b7a646eed17af785bac407da13677f2685d5f680b1f09a54070
 EBUILD zeromq-4.2.2.ebuild 1217 BLAKE2B 9de51f8af0843322ca7aead2aca32e7b6b862b0299e62ab2678d2893740ccc964db6e1be93554469af84f9f97502b9bdfb36f61c4075d32d2fa2c5f571b5b350 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c
+EBUILD zeromq-4.2.3.ebuild 1394 BLAKE2B a653ff89292e2fec534a5c98dd2d5c1d47f9bcc686dbc02a9ecfb8ce897a6686331cdd1f0cda531eb274e139a6dca7573154bec3e6da520dca02a317e1ac75fa SHA512 8a6a134f28df471fbc625eabedf217abbc2176e8954aceb68d09cf85fc76a286803740eab445f3494d5ccb039d8504e34525f0d3e20d53bccbbe57d8b6b9c6e9
 MISC metadata.xml 1349 BLAKE2B 18a6db436dc83ddf5fbd62fedd61cbf98893970d536f176d61fad63aa2c04030b3d6f8fe2cae1edaff8bc918be07aad7370bd87ff6df0a838d7a4b94618dd1c8 SHA512 420989e7e605b7bcd1ee608d7e0ac06c563d3e37d01629963d7b6182eb3c187ca9667676ec73f267e15e35809d9552bc0d4407958d74d790381a3e45e1814296
diff --git a/net-libs/zeromq/zeromq-4.2.3.ebuild b/net-libs/zeromq/zeromq-4.2.3.ebuild
new file mode 100644
index 000000000000..cdef847f86e4
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.2.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
+
+RDEPEND="
+	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+	sodium? ( dev-libs/libsodium:= )
+	pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+	!elibc_Darwin? ( sys-apps/util-linux )
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	pgm? ( virtual/pkgconfig )"
+
+PATCHES=()
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable unwind libunwind)
+		$(use_with sodium libsodium)
+		$(use_with pgm)
+		$(use_with doc docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Restricting to one job because multiple tests are using the same port.
+	# Upstream knows the problem and says it doesn't support parallel test
+	# execution, see ${S}/INSTALL.
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}"usr/lib* -name '*.la' -delete || die
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c3d724e29e39..54f7ec1b28bb 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index d997820fd0d0..dcbb1bcbe0b1 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -4,7 +4,6 @@ AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4b
 AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77
 AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48
 AUX freerdp-ffmpeg29.patch 1778 BLAKE2B a34acaa93eb59c01623151989ef8dd97e0aecc394219249d33ab6815b295e105a5d7db4baeca44a4a43f53665919a65466f9423b002e40648b02aaf6c1ea879b SHA512 c58acc5ddab34fe664d38649b7271ad793430cb1c9ad8e6b78f1924a8b70e1b8d76c426fb633cf6dd97fe3277664649fd7254e2e4377330c64234d23f1b26fd1
-AUX freerdp-libressl.patch 5386 BLAKE2B c2c160bdf4dd8f27415dfef179ff9131b4db22bec2a1fb26d90785d9f02332700c6299aa512b8a42cdf49f6627624c522f89eaaf337bf95a5f9fdc74230b4eab SHA512 9ee540047e4d8e61904eace6f41dcc8ec36089b6e34f6df152529a1f505014aa9cec163e46478938af38b173498d254d5b738183c2d463d445524903be6b6645
 DIST FreeRDP-2.0.0-rc0.tar.gz 6486529 BLAKE2B 6d9bf0e88c925f2184f87696b78a374c5fb24ecb3014515e077825805191fcb2e58b930ef4eccb797d496d142024357ca7562426e990a65cd3c54c58de3cc525 SHA512 d3eb0d5d23aa2a4d0277414f13a984d40aba051102c5af1e5ade975cdb469ef3549b145cd4339415fc33f056044929cfac71884512ea77a1e718d70d5b21b9dd
 DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca70ece3496c1ba00766b04369fffde8d86ad446345f0eab0fea4641708b7f985f95ea4a6001107163ee60e35822a955 SHA512 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182
 DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8
diff --git a/net-misc/freerdp/files/freerdp-libressl.patch b/net-misc/freerdp/files/freerdp-libressl.patch
deleted file mode 100644
index cbb79bcc1d31..000000000000
--- a/net-misc/freerdp/files/freerdp-libressl.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 70ab61c8e6083080093fc42e8e7172969864e2bd Mon Sep 17 00:00:00 2001
-From: Aric Belsito <lluixhi@gmail.com>
-Date: Sun, 19 Mar 2017 13:58:24 -0700
-Subject: [PATCH] Support LibreSSL
-
-Broken by the addition of OpenSSL 1.1.0 support.
----
- libfreerdp/crypto/opensslcompat.c | 4 ++--
- libfreerdp/crypto/opensslcompat.h | 4 ++--
- libfreerdp/crypto/tls.c           | 8 ++++----
- winpr/libwinpr/crypto/hash.c      | 8 ++++----
- winpr/libwinpr/utils/ssl.c        | 2 +-
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/libfreerdp/crypto/opensslcompat.c b/libfreerdp/crypto/opensslcompat.c
-index bb5aff7..701902d 100644
---- a/libfreerdp/crypto/opensslcompat.c
-+++ b/libfreerdp/crypto/opensslcompat.c
-@@ -19,7 +19,7 @@
- 
- #include "opensslcompat.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- BIO_METHOD* BIO_meth_new(int type, const char* name)
- {
-@@ -41,4 +41,4 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM
- 		*d = r->d;
- }
- 
--#endif /* OPENSSL < 1.1.0 */
-+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
-diff --git a/libfreerdp/crypto/opensslcompat.h b/libfreerdp/crypto/opensslcompat.h
-index a599863..b42d32f 100644
---- a/libfreerdp/crypto/opensslcompat.h
-+++ b/libfreerdp/crypto/opensslcompat.h
-@@ -30,7 +30,7 @@
- 
- #include <openssl/opensslv.h>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #include <openssl/bio.h>
- #include <openssl/rsa.h>
-@@ -59,7 +59,7 @@
- BIO_METHOD* BIO_meth_new(int type, const char* name);
- void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d);
- 
--#endif /* OPENSSL < 1.1.0 */
-+#endif /* OPENSSL < 1.1.0 || LIBRESSL */
- #endif /* WITH_OPENSSL */
- 
- #endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 1071a2e..c415763 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -323,7 +323,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- 		case BIO_CTRL_PUSH:
- 			if (next_bio && (next_bio != ssl_rbio))
- 			{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 				SSL_set_bio(tls->ssl, next_bio, next_bio);
- 				CRYPTO_add(&(bio->next_bio->references), 1, CRYPTO_LOCK_BIO);
- #else
-@@ -346,7 +346,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- 				if (ssl_rbio != ssl_wbio)
- 					BIO_free_all(ssl_wbio);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 				if (next_bio)
- 					CRYPTO_add(&(bio->next_bio->references), -1, CRYPTO_LOCK_BIO);
- 				tls->ssl->wbio = tls->ssl->rbio = NULL;
-@@ -384,7 +384,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
- 					BIO_push(ssl_rbio, next_bio);
- 
- 				BIO_set_next(bio, ssl_rbio);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 				CRYPTO_add(&(ssl_rbio->references), 1, CRYPTO_LOCK_BIO);
- #else
- 				BIO_up_ref(ssl_rbio);
-@@ -1021,7 +1021,7 @@ BOOL tls_send_alert(rdpTls* tls)
-  *        SSL struct is opaqe now
-  */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
- 	{
- 		/**
-diff --git a/winpr/libwinpr/crypto/hash.c b/winpr/libwinpr/crypto/hash.c
-index 949d687..27eb434 100644
---- a/winpr/libwinpr/crypto/hash.c
-+++ b/winpr/libwinpr/crypto/hash.c
-@@ -146,7 +146,7 @@ WINPR_HMAC_CTX* winpr_HMAC_New(void)
- 
- #if defined(WITH_OPENSSL)
- 	HMAC_CTX* hmac = NULL;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	if (!(hmac = (HMAC_CTX*) calloc(1, sizeof(HMAC_CTX))))
- 		return NULL;
- 	HMAC_CTX_init(hmac);
-@@ -267,7 +267,7 @@ void winpr_HMAC_Free(WINPR_HMAC_CTX* ctx)
- 	HMAC_CTX* hmac = (HMAC_CTX*) ctx;
- 	if (hmac)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		HMAC_CTX_cleanup(hmac);
- 		free(hmac);
- #else
-@@ -317,7 +317,7 @@ WINPR_DIGEST_CTX* winpr_Digest_New(void)
- 
- #if defined(WITH_OPENSSL)
- 	EVP_MD_CTX* mdctx;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 	mdctx = EVP_MD_CTX_create();
- #else
- 	mdctx = EVP_MD_CTX_new();
-@@ -406,7 +406,7 @@ void winpr_Digest_Free(WINPR_DIGEST_CTX* ctx)
- 	EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx;
- 	if (mdctx)
- 	{
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 		EVP_MD_CTX_destroy(mdctx);
- #else
- 		EVP_MD_CTX_free(mdctx);
-diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c
-index 2f8100f..5fd6ac6 100644
---- a/winpr/libwinpr/utils/ssl.c
-+++ b/winpr/libwinpr/utils/ssl.c
-@@ -45,7 +45,7 @@ static BOOL g_winpr_openssl_initialized_by_winpr = FALSE;
-  * set locking callbacks to use OpenSSL in a multi-threaded environment.
-  */
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- 
- #define WINPR_OPENSSL_LOCKING_REQUIRED 1
- 
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 17e1053fa343..01c4b2f61a5c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 2cde86bb8cdf..8a2c28e86058 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,11 +1,14 @@
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD bitcoin-cli-0.13.0.ebuild 845 BLAKE2B 4b8c3ed24ff36bcedd3ac20074844e9704bd77a8d21d33f973836ef32dc2127ac8aec56321a28edb8db1857acbb239c909360b436669743ccb9a85002f685ba6 SHA512 6e506aca05ad2dc9e4218117911c82130815bdf559b8c66a906be161187e4d3f8f4a51d3eafe3ecfad91e32a18e6363ad1b16701bece15776998bda4106c40ba
 EBUILD bitcoin-cli-0.13.1.ebuild 842 BLAKE2B 423aadcd0b341bd0c54a08a08fef112d6a33a8b432e3ca444b6a9e3d06fa38637dd42d6d17a2a36149a3597f38bc2ab63bf00268f382ab9cc86842554a86ab2b SHA512 f9d27641b2c952c5de81e950e8c8ce279ae60cdfd13d0ae28bf01ddc1011b597551f353b3bbdc33f0f1e50f4db8cac11b40422833d916a559558ebcda9b9d432
 EBUILD bitcoin-cli-0.13.2.ebuild 846 BLAKE2B 688ea6c2ae9b01e2e538eaa183f3c9b88a3217acf341d9bc12b65caa99efa0d45257b75345253a3c9f646137799f7ab2f2220598257ef852da33be7f98bd759e SHA512 d4274818fef2a1ccc78813be7ecee1aa2fc490b9d13126cbfbf352b2d45520d40e2493e42f49ce28a8d4f0d0951d6d6aa671e156a811d608fd5f150a5de0219a
+EBUILD bitcoin-cli-0.15.1.ebuild 2443 BLAKE2B 1fafb537902d0d76d92ca4dd1feaaf8cf9d291f871a92b2826cd2bd7d4f1ce5197c60a65e3a58a943aafaa8f2c64eb11c725752f78457d83248b786715bf2f44 SHA512 5b5323387d760589b909ab620829e6f1ef5d812344049cf86f6692c37674db0c63d956bfea105249c4c115811c3b85a9007b78f08ad917ecd7bfe4494fcc21f6
 EBUILD bitcoin-cli-9999.ebuild 479 BLAKE2B 29cfd04cc2ecfece1fbbcaf4439c183540bbb60895aa6a820ed2a7a022d8c9fa18bff7cc1bd056882263c27486803d105641646c0e0a4fe975932f3a534c3f21 SHA512 fdae52acd4307be54a7de8523a3cec9e8917e7ec11f9e1cbe876d5407c17db1d4ec9a4d35e864817d0dd3242ba7b9afbd6a7751995441dc82981807c03108141
-MISC metadata.xml 615 BLAKE2B 4db8ef430b47bad4dc20d6876c6356be3ed9cad2b528abf3351bfd6a5794147dd919dcd587a4dc1fd16b970f45e0faeac5edc2f2330d7090011fd557b6d133eb SHA512 040c29a3e1c5221656295920117d05b5d098c445b77efdd39a7e6c3877c663622b98eddbd485e0b6599281ca2a5939035328ffcb7ac1a2cd3d3d1e6324f6b638
+MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
new file mode 100644
index 000000000000..a63af598ca66
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="knots libressl"
+
+DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitcoind"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libevent
+	dev-libs/univalue
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-experimental-asm
+		--without-qtdbus
+		--with-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/bitcoin-cli.bash-completion ${PN}
+}
diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml
index 3747c3a5a6e9..6f3a3a4dd7b3 100644
--- a/net-p2p/bitcoin-cli/metadata.xml
+++ b/net-p2p/bitcoin-cli/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index f3e84fdcc3fe..f1df7a866645 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -2,11 +2,14 @@ AUX 0.13.2-libressl.patch 1761 BLAKE2B 76aa634056d293f6e175c9c272cc46dc2d0dfb1c8
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD bitcoin-qt-0.13.0.ebuild 3357 BLAKE2B 059d39373790811281935c9c334ecbbce1482b151671fcf38ee725b5015d0a3e40b2b308441b516854e2a8e0de322a3dd0246058186f27fcfe7b7a6167a6caa3 SHA512 e497fedd35c0f5fd8658b0d66e02eb7ef465a5243c41623094905e63f58e2d3c553313602242d67a9b3c1810f588c6aae7cdc0aafa98ee7a48248e1f960c7b1b
 EBUILD bitcoin-qt-0.13.1-r1.ebuild 3439 BLAKE2B e515048dcd52c352a363c8aa6eb17373e95fc0f238ea7d11c482f1571fbb1cedd232a52985f2111508b87fb94a0561710187cca3056c3bc6696402b2337282df SHA512 3532a46a44b4cd323968b1ca3984c752b89ea4f728003ccd709218bcc55a8f9aa9efdfcda2de8dd82f5047833aa9c4bffa182f8b56f0af85802da6dea5085b1b
 EBUILD bitcoin-qt-0.13.2.ebuild 3513 BLAKE2B 2cd862f6138b273d3db66ecafaaa43e2984dc05a6826d39b81c45d9982f33c65f00b26912c4161f383576aa9aad7b41dc003b1f22343b4cdd250568285efdd64 SHA512 067c72153669280b7d62f908cc911df53e86e14c165fd3a3af5a93f3e496cf2f334e534bffa1e07be9af466db1b5e82bb8a5c892fd9317e88228205e5a22f5bf
+EBUILD bitcoin-qt-0.15.1.ebuild 7090 BLAKE2B 5042ca2f8225671ff830f6d978567b209981cf74af3f79e3a1eaa4fce18efc739604a9e13fc875800f71602970d827de1bf30c9aef3c701122c8bd47f29470b6 SHA512 2f3ff434ebb82f91031b700d08a7ce432019c714ae56f07b16dd0b05aded01ee47b5f64408975fd22ff79955e1152b147471d876d50328e8ec8dae04b0fb6706
 EBUILD bitcoin-qt-9999.ebuild 2667 BLAKE2B a9851055483c650843afb8f6d5447688826d11ba879a19e3e2777259578b07bc8527bebb558cbc5210ca21c528d09cd679525460b5ed88e78f4d2dd94fefa5ef SHA512 8ffecdcf0425ac4339235a2f90068128e8415583bf6ba903d86af36bee48a268f6cc952229c17be120f303c57c8f9b12208112d2a0533917fd5b6fc58905744f
-MISC metadata.xml 1422 BLAKE2B 72865e9a41f50c63d52d46933a981a7eea19428029b7858c958d51e489d19c18a56a2f7eb68f5fa5bd735e25214d09cda59bf9f87de8cf7a2e82ee2bfe5e1e69 SHA512 7a42aaaedd65478095e92a93a55e1f121d161cb60ebbd74c3288df89eefd81f307664da5d35469f0937d8e1afd238968d4489a144e357ae78f2a155c837dc2b6
+MISC metadata.xml 1615 BLAKE2B 76b79cea9c4faa4a557ca1c4507a1bdd8519c8c3ef64933241091f50de7c3d2110d45ffea8fa7431eb4eabe822d9e12e368ffa3d43b79e7e2cec7fb1c3ed5589 SHA512 99ef056b83c0f58dc1c6c50b73e5411ca0f4813df025ca268acf3f68720b1cc5d145e319183237e36b834bdf120ecc9c0bcef00996fc04a6c8d329f8a870b47a
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
new file mode 100644
index 000000000000..64339edd7ca2
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode +http test +tor upnp +wallet zeromq"
+LANGS="af af:af_ZA am ar be:be_BY bg bg:bg_BG bn bs ca ca@valencia ca:ca_ES cs cy da de de:de_DE el el:el_GR en en_AU en_GB en_US eo es es_419 es_AR es_CL es_CO es_DO es_ES es_MX es_UY es_VE et et:et_EE eu:eu_ES fa fa:fa_IR fi fr fr_CA fr:fr_FR gl he he:he_IL hi:hi_IN hr hu hu:hu_HU id id:id_ID is it it:it_IT ja ja:ja_JP ka kk:kk_KZ ko:ko_KR ku:ku_IQ ky la lt lv:lv_LV mk:mk_MK mn ms ms:ms_MY my nb nb:nb_NO ne nl nl:nl_NL pam pl pl:pl_PL pt pt_BR pt_PT ro ro:ro_RO ru ru:ru_RU si sk sl:sl_SI sn sq sr sr-Latn:sr@latin sv ta te th th:th_TH tr tr:tr_TR uk ur_PK uz@Cyrl vi vi:vi_VN zh zh_CN zh_HK zh_TW"
+KNOTS_LANGS="am hu_HU is ms pl_PL pt sn"
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	libevent? ( dev-libs/libevent )
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+	dev-libs/univalue
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916 )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] )
+	zeromq? ( net-libs/zeromq )
+	virtual/bitcoin-leveldb
+	bip70? ( dev-libs/protobuf )
+	qrcode? (
+		media-gfx/qrencode
+	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dbus? (
+		dev-qt/qtdbus:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	knots? (
+		gnome-base/librsvg
+		media-gfx/imagemagick[png]
+	)
+"
+REQUIRED_USE="
+	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
+"
+
+declare -A LANG2USE USE2LANGS
+bitcoin_langs_prep() {
+	local lang l10n
+	for lang in ${LANGS}; do
+		l10n="${lang/:*/}"
+		l10n="${l10n/[@_]/-}"
+		lang="${lang/*:/}"
+		LANG2USE["${lang}"]="${l10n}"
+		USE2LANGS["${l10n}"]+=" ${lang}"
+	done
+}
+bitcoin_langs_prep
+
+bitcoin_lang2use() {
+	local l
+	for l; do
+		echo l10n_${LANG2USE["${l}"]}
+	done
+}
+
+IUSE+=" $(bitcoin_lang2use ${!LANG2USE[@]})"
+
+bitcoin_lang_requireduse() {
+	local lang l10n knots_exclusive
+	for l10n in ${!USE2LANGS[@]}; do
+		for lang in ${USE2LANGS["${l10n}"]}; do
+			if ! has $lang $KNOTS_LANGS; then
+				continue 2
+			fi
+		done
+		echo "l10n_${l10n}? ( knots )"
+	done
+}
+REQUIRED_USE+=" $(bitcoin_lang_requireduse)"
+
+DOCS=( doc/bips.md doc/files.md doc/release-notes.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+	if use bitcoin_policy_rbf; then
+		einfo "Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order."
+	else
+		einfo "Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones."
+	fi
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
+
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	sed -i 's/^\(Icon=\).*$/\1bitcoin-qt/;s/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die
+
+	local filt= yeslang= nolang= lan ts x
+
+	for lan in $LANGS; do
+		lan="${lan/*:/}"
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			if has $lan $KNOTS_LANGS && ! use knots; then
+				# Expected
+				continue
+			fi
+			die "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in src/qt/locale/*.ts
+	do
+		x="${ts/*bitcoin_/}"
+		x="${x/.ts/}"
+		if ! use "$(bitcoin_lang2use "$x")"; then
+			nolang="$nolang $x"
+			rm "$ts" || die
+			filt="$filt\\|$x"
+		else
+			yeslang="$yeslang $x"
+		fi
+	done
+	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm experimental-asm)
+		$(use_enable bip70)
+		$(use_with dbus qtdbus)
+		$(use_with libevent)
+		$(use_with qrcode qrencode)
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-gui=qt5
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--disable-ccache
+		--disable-static
+		--with-system-leveldb
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /usr/share/pixmaps
+	if use knots; then
+		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
+	else
+		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	fi
+	insinto /usr/share/applications
+	doins "contrib/debian/bitcoin-qt.desktop"
+
+	use libevent && dodoc doc/REST-interface.md doc/tor.md
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/bitcoind.bash-completion ${PN}
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+		dosym "../kde4/services/bitcoin-qt.protocol" "/usr/share/kservices5/bitcoin-qt.protocol"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	update_caches
+
+	if use tor; then
+		einfo "To have ${PN} automatically use Tor when it's running, be sure your 'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup correctly, and add your that user to the 'tor' user group"
+	fi
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index a396da394df7..60c0dfd8151f 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -10,6 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="asm">Enable assembly for optimization</flag>
+		<flag name="bip70">Enable support for the BIP70 payment protocol</flag>
 		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
 		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
 		<flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
@@ -24,5 +26,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 7e030192fcd4..4113319595dd 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,14 +1,19 @@
 AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f
+AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service 869 BLAKE2B 65628a2c6effef34e4cf8fd10bc50b02bbfa8c49e486266bab8e9b7be19a57969d75e6ce6ff82dc2e2f3ddae29fceee9e61a076cbf5ac6666d772514c88c2093 SHA512 d0e23b98bc9109e7e4d8a6459f73d1f9a06a3da71593613e22c5d0f31a8ad7473242b07690c6f22f35358ed869ffa7160d0daa65937462442bfc9028794321ea
+AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD bitcoind-0.13.0.ebuild 1922 BLAKE2B 4dbcdb8ace05ce867da8cce4f74f561639376ddc9a2b70d057af2766b7e7f2f2e3f1a11594e4c9d204ce4bbaf287175912dc3353cf0e20aadf3c30ed2cda6912 SHA512 231f04e06fe2a9820f66147ba971c96901f506bb74878006c36bb5f459a41387fbd5df328f36c447235af8f81a28e62ab6280a4eeea88bf7261c57d3f2660549
 EBUILD bitcoind-0.13.1.ebuild 1919 BLAKE2B edbfe9ccb5f7d3f5526f531b51ff117bbb85f3b7bdf651badc7fcacbc5ba29e8ffb2f4ffff1f56f015fd0a5383b74f811e91dc6a214264f431edc25527548efd SHA512 da9c7226dcc905263be4f82330217e8680e5917b7d15620d89ecd0e13e6328fa4d5c8a282950e9824d3c0c6d6e1677c5baaf3c87515aa7c6515afa2d4e921098
 EBUILD bitcoind-0.13.2.ebuild 1924 BLAKE2B 5c1ce54380441d7e082772510f6b03d2c8983566ee662af7601e9abf0cfd5c981f183be12a9d87e0b0daf0b07943f3c1c18ff1d079f2ffe00c3912068e3a37a2 SHA512 cfdff039da31701c29cdefc2f66c47a3715468c4e5da90d2bfb30bca8d4ec778b498b671df2a28820f4017a32e0f5d8f4d5b78174c0e7bcf92cfbbbc48d5238b
+EBUILD bitcoind-0.15.1.ebuild 4928 BLAKE2B ca4aab401dae803f3e841e07262d876e729723b30df973e3673cf1381b73eabb43e2238beae940c6d34538b229d9cbe5802d7ce393178d94ac79970f5ed39a97 SHA512 059ee69a975fd402e2c4fcca43bcd9fc9488db63f376950a45627082e4bc648cae31b96c5e8dded00f40a4c77daf563f7b6d14dac0953fe7ae76d5362d612d37
 EBUILD bitcoind-9999.ebuild 1725 BLAKE2B 198ce5db702463c5e584744457c167a9e527e2b2b4a2d7cf816c698f5ed28d1b7520b874ba9f1510e16197b9331c80836481426a98852bb2df559799f21c5334 SHA512 29aeb113c439794d2b5f3854cb473136ec2389da0ffd4ea67a01a31f515a6bfde924c252913c003c0123babcf362fe2cb287387ad4823e27c0a28e15c7dfb064
-MISC metadata.xml 1099 BLAKE2B 7bf0d05a908f5e2cb716c7109e5b942fcd68b737f1f8ee0f694d446aa6944cd9c86506932c9388b9730d490b5b1c67381bd37d21e1d297fa6ecc75b622a689cf SHA512 84c60530afee3534c3057b259ef54767442765023ec1fb1d20430b6f07bd07947f40a582897a1c09d57f1290fb97955c3b188993f12fbe5421a39cb62015608a
+MISC metadata.xml 1218 BLAKE2B e01b34ede70163c5a9793bd1d2109ec21b9aaed014d22e4c1f8d16800d6ffe65e37a67c6697ae04fa64e6a540d034a553e332866dd3e0f086a4dd90c527d48f7 SHA512 02bf23ba23c56f439491c168f8801e1d325aff4f98113b9be486a2e6289135f0fa650c135af4a2967cc634a6a85a15f145d1ea6e05e959c4e4f6a5ddbac1399e
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
new file mode 100644
index 000000000000..3ada285926eb
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd user
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libevent
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+	dev-libs/univalue
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916 )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] )
+	zeromq? ( net-libs/zeromq )
+	virtual/bitcoin-leveldb
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/files.md doc/reduce-traffic.md doc/release-notes.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+	if use bitcoin_policy_rbf; then
+		einfo "Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order."
+	else
+		einfo "Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones."
+	fi
+}
+
+pkg_setup() {
+	enewgroup bitcoin
+	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	sed -i 's/runscript/openrc-run/' contrib/init/${PN}.openrc || die
+
+	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
+
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm experimental-asm)
+		--without-qtdbus
+		--with-libevent
+		--without-qrencode
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-daemon
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-leveldb
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_newunit "${FILESDIR}/bitcoind.service-r1" "bitcoind.service"
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	dodoc doc/REST-interface.md doc/tor.md
+	doman "${FILESDIR}/bitcoin.conf.5"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos,tidy_datadir.sh}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+	einfo "To have ${PN} automatically use Tor when it's running, be sure your 'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup correctly, and:"
+	einfo "- if using the init script: add the 'bitcoin' user to the 'tor' user group"
+	einfo" - if running bitcoind directly: add that user to the 'tor' user group"
+}
diff --git a/net-p2p/bitcoind/files/bitcoin.conf.5 b/net-p2p/bitcoind/files/bitcoin.conf.5
new file mode 100644
index 000000000000..839dc26c1aa5
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoin.conf.5
@@ -0,0 +1,19 @@
+.TH BITCOIN.CONF "5" "February 2016" "bitcoin.conf 0.12"
+.SH NAME
+bitcoin.conf \- bitcoin configuration file
+.SH SYNOPSIS
+All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
+.TP
+The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to bitcoind(1) for a up to date list of valid options.
+.TP
+The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
+.SH LOCATION
+bitcoin.conf should be located in $HOME/.bitcoin
+
+.SH "SEE ALSO"
+bitcoind(1)
+.SH AUTHOR
+This manual page was written by Micah Anderson <micah@debian.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
+
diff --git a/net-p2p/bitcoind/files/bitcoind.service-r1 b/net-p2p/bitcoind/files/bitcoind.service-r1
new file mode 100644
index 000000000000..ee113d7615c2
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind.service-r1
@@ -0,0 +1,25 @@
+# It is not recommended to modify this file in-place, because it will
+# be overwritten during package upgrades. If you want to add further
+# options or overwrite existing ones then use
+# $ systemctl edit bitcoind.service
+# See "man systemd.service" for details.
+
+# Note that almost all daemon options could be specified in
+# /etc/bitcoin/bitcoin.conf
+
+[Unit]
+Description=Bitcoin daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/bitcoind -daemon -conf=/etc/bitcoin/bitcoin.conf -pid=/run/bitcoind/bitcoind.pid
+# Creates /run/bitcoind owned by bitcoin
+RuntimeDirectory=bitcoind
+User=bitcoin
+Type=forking
+PIDFile=/run/bitcoind/bitcoind.pid
+Restart=on-failure
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 57acfffa65ef..45a60634af6e 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="asm">Enable assembly for optimization</flag>
 		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
 		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
@@ -20,5 +21,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ea8210d056de..7294ee959534 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/tayga/Manifest b/net-proxy/tayga/Manifest
index 3b0f54cc39bb..4d6ecb6ece4a 100644
--- a/net-proxy/tayga/Manifest
+++ b/net-proxy/tayga/Manifest
@@ -1,3 +1,4 @@
 DIST tayga-0.9.2.tar.bz2 86022 BLAKE2B 9658960e0a8a4a419851a50f131a7dfb0790d0d188ad95ed5078033bd3a19180964a072dc177616b3451bc23dfa2b998058d73cc6aacfbb4b59c0b9173764440 SHA512 a7a81cccb7c3e32f00f142b1bac598b732dd748772b307561239d695418ada5302182d487e51d1cf95ed736c0180c01db2f33409d0b9343d6587b76cbb3bc573
+EBUILD tayga-0.9.2-r1.ebuild 485 BLAKE2B b73bb0e08ec4fd6512860b1c2e8913719e80e9a8a529b94fec3f1b9d25d51d73966db216d2be580b7858d61e17e3ea0a65a4c5b9d269118317bb17ca941e09b5 SHA512 0508c46d574164b61ee877a40e771b44654448b07bc16e99fb80336991a97a86f7696a9d6dc313a5897173f6bcb5b6deff133ea1a7f9d1a0e4806c1584f0b663
 EBUILD tayga-0.9.2.ebuild 530 BLAKE2B 9b17a6f13236e223f1c0c65b52553475fcdd4c21351b5d1097e2b8c656b0f3c160abc2ad47c1859dcfe955e5775f0ded51b65bd84eb217571fbf4afe9c745b6c SHA512 7c2924671bc8fc7cfe808a68ae3da2348bf70130e1718e52e8a21c709ec20b6c940b7f1604575922288aa5f8ff9b9f81cf742cad9c3de8ad37934721d2fd4226
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-proxy/tayga/tayga-0.9.2-r1.ebuild b/net-proxy/tayga/tayga-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..09f91c9a57d7
--- /dev/null
+++ b/net-proxy/tayga/tayga-0.9.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="out-of-kernel stateless NAT64 implementation based on TUN"
+HOMEPAGE="http://www.litech.org/tayga/"
+SRC_URI="http://www.litech.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e '/^CFLAGS/d' \
+		-i configure.ac || die "sed failed"
+	eautoreconf
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 847cfe4960c8..f30990df8fcb 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index db0dbd61abb8..323319778323 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -42,10 +42,6 @@ dev-vcs/git pcre-jit
 # Stack protector code is not ported to alpha (and may not ever be)
 >=sys-devel/gcc-6 ssp
 
-# Tobias Klausmann <klausman@gentoo.org> (08 May 2017)
-# USE=test requires valgrind, which will never be ported to alpha
-app-misc/jq test
-
 # Tobias Klausmann <klausman@gentoo.org> (02 Mar 2017)
 # libilbc has not been ported to alpha and likely never will be.
 media-video/ffmpeg libilbc
@@ -211,7 +207,6 @@ net-misc/networkmanager teamd
 # See bug #533420.
 media-libs/clutter egl wayland
 media-libs/clutter-gtk wayland
-x11-wm/mutter kms
 
 # Mark Wright <gienah@gentoo.org> (14-23 Dec 2014)
 # test dependencies need keywording
@@ -282,7 +277,7 @@ media-libs/gst-plugins-base ivorbis
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Jan 2013)
 # remove mask when net-libs/libqmi is keyworded here
-net-misc/modemmanager qmi qmi-newest
+net-misc/modemmanager qmi
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (22 Jan 2013)
 # remove mask if/when media-gfx/argyllcms is keywored here.
@@ -339,10 +334,6 @@ app-text/asciidoc test
 # missing keywords on dependencies
 media-video/x264-encoder ffmpegsource
 
-# Robin H. Johnson <robbat2@gentoo.org> (03 Sep 2011)
-# Remove this for your arch after you keyword dev-utils/google-perftools (bug #381737)
-dev-libs/libmemcached tcmalloc
-
 # Alexey Shvetsov <alexxy@gentoo.org> (31 Aug 2011)
 # Mask numa use flag per bug #381313
 sys-apps/hwloc numa
diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask
index c261c8874218..fd25171f245b 100644
--- a/profiles/arch/alpha/package.use.stable.mask
+++ b/profiles/arch/alpha/package.use.stable.mask
@@ -34,7 +34,5 @@ media-plugins/gst-plugins-meta modplug
 x11-libs/gksu gnome
 
 # sufficiently recent wayland is not stable yet, bug #559062
-~dev-libs/efl-1.15.2 wayland
 ~dev-libs/efl-1.17.0 wayland
-~media-libs/elementary-1.15.2 wayland
 ~media-libs/elementary-1.17.0 wayland
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 908d4dc805ba..28367f93de21 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -121,9 +121,6 @@ vpopmail
 # We don't have any virtual/mpi (bug 111807)
 mpi
 
-# masks required for asterisk
-zaptel
-
 # Modular X: mask non-alpha cards
 video_cards_apm
 video_cards_ark
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 7b8725a372dc..ae5ea45d3d0e 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -17,7 +17,6 @@ mail-client/novell-groupwise-client
 # Mask packages that rely on amd64 multilib
 =app-editors/emacs-18*
 >=app-i18n/atokx3-3.0.0
-<games-roguelike/dwarf-fortress-0.43.0
 app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
@@ -27,13 +26,11 @@ app-emulation/playonlinux
 app-emulation/q4wine
 app-emulation/winetricks
 app-office/ooextras
-app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
 dev-lang/icc
 dev-lang/idb
 dev-lang/ifc
-dev-perl/Archive-Rar
 dev-util/android-ndk
 dev-util/android-sdk-update-manager
 dev-util/android-studio
@@ -134,7 +131,6 @@ games-strategy/heroes3-demo
 games-strategy/majesty-demo
 games-strategy/smac
 games-strategy/spaz
-media-fonts/acroread-asianfonts
 media-sound/aucdtect
 media-sound/ventrilo-server-bin
 media-video/binkplayer
@@ -150,7 +146,6 @@ sci-chemistry/mars
 sci-electronics/eagle
 sci-libs/ipp
 sys-libs/lib-compat-loki
-www-plugins/nspluginwrapper
 
 
 # AMD64 Team; <amd64@gentoo.org>
diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
index 9a86a0600bfd..02c2012b8fbe 100644
--- a/profiles/arch/amd64/no-multilib/use.mask
+++ b/profiles/arch/amd64/no-multilib/use.mask
@@ -15,10 +15,6 @@ hvm
 # Mask multilib, since we cannot use it.
 multilib
 
-# 2009/05/11 Doug Goldstein <cardoe@gentoo.org>
-# Mask 32bit since this will always require emulation packages
-32bit
-
 # Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
 # Mask the multilib flags back for non-multilib profile.
 abi_x86_32
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index d9c2ea4cc852..d10aad5027be 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -171,10 +171,6 @@ dev-python/pypy-bin cpu_flags_x86_sse2
 dev-python/pypy3 cpu_flags_x86_sse2
 dev-python/pypy3-bin cpu_flags_x86_sse2
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
-# chromium, mono work on this arch (masked in base)
-gnome-extra/zeitgeist-datasources -chromium
-
 # Christoph Junghans <junghans@gentoo.org> (26 Dec 2012)
 # cuda works on x86/amd64 (masked in base)
 sci-chemistry/gromacs -mkl
@@ -203,9 +199,7 @@ app-arch/zpaq -jit
 # Arun Raghavan <ford_prefect@gentoo.org> (29 Mar 2012)
 # webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
 # added.
-# Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
-# Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
-media-sound/pulseaudio -webrtc-aec -xen
+media-sound/pulseaudio -webrtc-aec
 
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Feb 2012)
 # Masked in base profile, supported on this arch
@@ -229,17 +223,13 @@ dev-qt/qtwebkit -jit
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
 
 # Alexey Shvetsov <alexxy@gentoo.org> (1 Jul 2011)
-# Use mask infiniband for stable corosync and glusterfs
-=sys-cluster/glusterfs-3.1.2 infiniband
+# Use mask infiniband for stable corosync
 =sys-cluster/corosync-1.3.0 infiniband
 
 # Tim Harder <radhermit@gentoo.org> (13 Feb 2011)
 # Masked in base, unmask for amd64/x86
 >=media-video/mplayer-1.0_rc4_p20101219 -bluray
 
-# doomsday doesn't work on amd64 so mask off things that pull it in.
-games-fps/doom-data doomsday
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (28 Nov 2010)
 # sys-devel/llvm is keyworded on amd64
 media-libs/mesa -llvm
@@ -276,10 +266,6 @@ app-text/enchant -zemberek
 # assembler-section
 
 # Oct 23th 2006; blubb@gentoo.org
-# the asm is 64bit save, but it doesn't compile anyway
-games-emulation/visualboyadvance cpu_flags_x86_mmx
-
-# Oct 23th 2006; blubb@gentoo.org
 # upstream forces sse2 for amd64; mmx flag does nothing
 app-crypt/johntheripper cpu_flags_x86_mmx
 
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 355a58f95d05..caf8d15af3f0 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -163,11 +163,6 @@
 
 # SECTION: Unavailable/Broken
 
-# 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
-# FIXME. Unknown mask reason. Has effect on qpopper
-# and tpop3d.
-drac
-
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures on which they aren't available
 video_cards_i740
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 7cb096901796..9e54db30b171 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
+# Moved from use.mask since they are flags local to one package.
+dev-cpp/xsd ace
+games-fps/doom-data doomsday
+media-tv/tvheadend hdhomerun
+
 # Michał Górny <mgorny@gentoo.org> (21 Dec 2017)
 # clang is not currently supported on Gentoo ARM profiles.
 sys-devel/llvm clang lldb
@@ -246,7 +252,6 @@ app-i18n/scim-anthy kasumi
 # See bug #533420.
 media-libs/clutter egl wayland
 media-libs/clutter-gtk wayland
-x11-wm/mutter kms
 
 # Markus Meier <maekke@gentoo.org> (29 Nov 2014)
 # Unkeyworded deps, bug #518742
@@ -293,10 +298,6 @@ lxqt-base/lxqt-meta lximage
 # Unkeyworded deps, bug #509082
 mail-filter/opendkim opendbx
 
-# Markus Meier <maekke@gentoo.org> (04 May 2014)
-# Unkeyworded deps, bug #507896
-dev-qt/qt-mobility messaging
-
 # S. Suominen <ssuominen@g.o> (17 Apr 2014)
 # First GTK+-3.x version of EasyTAG!
 # Keyword as reqiuired, ~arch is enough for now:
@@ -353,8 +354,7 @@ dev-python/ipython nbconvert
 
 # Sergey Popov <pinkbyte@gentoo.org> (06 Sep 2013)
 # sci-libs/hdf does not build properly on arm
-# sci-libs/plplot not keyworded
-dev-perl/PDL	hdf plplot
+dev-perl/PDL hdf
 
 # Michael Weber <xmw@gentoo.org> (23 Aug 2013)
 # Unkeyworded deps
@@ -385,10 +385,6 @@ sci-libs/linux-gpib firmware
 # unkeyworded deps for dev-python/ipython
 dev-python/ipython mongodb
 
-# Agostino Sarubbo <ago@gentoo.org> (05 May 2013)
-# dev-util/google-perftools is not keyworded for arm
->=dev-libs/libmemcached-0.50 tcmalloc
-
 # Christoph Junghans <junghans@gentoo.org> (29 Apr 2013)
 # MKL not available on this arch
 media-gfx/povray mkl
@@ -419,7 +415,6 @@ dev-libs/beecrypt java
 dev-libs/cyrus-sasl java
 dev-tex/tex4ht java
 dev-vcs/subversion java
-=media-gfx/graphviz-2.26.3-r4 java
 =media-libs/libcaca-0.99_beta18-r2 java
 media-libs/libjpeg-turbo java
 net-dns/libidn java
@@ -508,10 +503,6 @@ net-misc/mediatomb lastfm
 # Needs kde-frameworks/kwallet and kde-frameworks/kdelibs stable
 dev-vcs/subversion kwallet
 
-# Markus Meier <maekke@gentoo.org> (27 Sep 2009)
-# mask media-gfx/imagemagick[autotrace] as autotrace is not keyworded
-media-gfx/imagemagick autotrace
-
 # Jim Ramsay <lack@gentoo.org> (5 Nov 2008)
 # app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
 app-admin/gkrellm ntlm
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 46cb1d2d0b5a..bf23c16f576b 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -70,8 +70,6 @@ sys-fs/dmraid dietlibc klibc
 # Christoph Junghans <junghans@gentoo.org> (27 Nov 2016)
 # no stable mpi on arm yet, but maybe in the future
 <=app-crypt/johntheripper-1.7.9-r6 mpi
-<=dev-libs/boost-1.56.0-r1 mpi
-<=dev-util/valgrind-3.10.1 mpi
 <=sci-chemistry/gromacs-5.0.4 mpi
 <=sci-libs/fftw-3.3.4 mpi
 
@@ -115,7 +113,6 @@ www-client/qupzilla kwallet
 # Mask due Gnome3 not going to be stabilized on this arch
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
-media-gfx/gimp webkit
 net-libs/libproxy webkit
 >=net-libs/webkit-gtk-2.4 geoloc
 >=x11-libs/gtk+-3.12.2 cloudprint
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 0dd47a8a9a7b..d7cca566c0d9 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -13,10 +13,6 @@
 # Dependencies not keyworded
 ayatana
 
-# Mike Frysinger <vapier@gentoo.org> (25 Feb 2013)
-# doomsday ebuild is not available on this architecture
-doomsday
-
 # Andrey Grozin <grozin@gentoo.org> (16 May 2014)
 # gcl keyworded ~arm, bug #509842
 -gcl
@@ -50,7 +46,6 @@ openexr
 gimp
 
 # No hardware to test by the team
-hdhomerun
 ios
 ipod
 
@@ -63,7 +58,6 @@ R
 octave
 tracker
 xindy
-lyx
 lasi
 hardened
 pdfannotextractor
@@ -94,7 +88,6 @@ upnp
 devil
 gts
 anthy
-ace
 
 # Unmask ARM-only video-cards
 -video_cards_exynos
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 467fdecd9a40..1ab096ba87af 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -50,7 +50,6 @@ app-emulation/qemu qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64
 
 # Alexis Ballier <aballier@gentoo.org> (10 Jul 2017)
 # pull webkit-gtk:2 which we would like to avoid
-x11-libs/wxGTK:2.8 webkit
 x11-libs/wxGTK:3.0 webkit
 
 # Alexis Ballier <aballier@gentoo.org> (10 Jul 2017)
@@ -245,10 +244,6 @@ sci-libs/linux-gpib firmware
 # unkeyworded deps for dev-python/ipython
 dev-python/ipython mongodb
 
-# Agostino Sarubbo <ago@gentoo.org> (05 May 2013)
-# dev-util/google-perftools is not keyworded for arm
->=dev-libs/libmemcached-0.50 tcmalloc
-
 # Christoph Junghans <junghans@gentoo.org> (29 Apr 2013)
 # MKL not available on this arch
 media-gfx/povray mkl
@@ -285,10 +280,6 @@ gnome-extra/sushi office
 dev-util/dbus-test-runner test
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# remove mask when app-text/yelp-tools is keyworded here
->=gnome-extra/zenity-3.6 test
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
 # remove mask when >=app-editors/gedit-3.6 is keyworded here
 dev-util/devhelp gedit
 
@@ -370,10 +361,6 @@ net-misc/mediatomb lastfm
 # Needs kde-frameworks/kwallet and kde-frameworks/kdelibs stable
 dev-vcs/subversion kwallet
 
-# Markus Meier <maekke@gentoo.org> (27 Sep 2009)
-# mask media-gfx/imagemagick[autotrace] as autotrace is not keyworded
-media-gfx/imagemagick autotrace
-
 # Jim Ramsay <lack@gentoo.org> (5 Nov 2008)
 # app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
 app-admin/gkrellm ntlm
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 7fd741d487c9..264cdc30ed9a 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,9 +26,6 @@
 -neon
 -armvfp
 
-# doomsday ebuild is not available on this architecture
-doomsday
-
 # Mart Raudsepp <leio@gentoo.org> (17 Feb 2017)
 # x11-misc/colord not tested on arm64 yet
 colord
@@ -101,7 +98,6 @@ R
 octave
 tracker
 xindy
-lyx
 mpi
 lasi
 schroedinger
@@ -166,7 +162,6 @@ aacplus
 devil
 gts
 anthy
-ace
 R
 sdl
 vim-syntax
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index d7f99a91d918..f0f2056ea815 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
+# Moved from use.mask since it is a flag local to one package:
+# Joseph Jezak <josejx@gentoo.org> (11 Mar 2007)
+# Only for x86 and amd64 (in pbbuttonsd)
+app-laptop/pbbuttonsd macbook
+
 # Amy Liffey <amynka@gentoo.org> (19 Sep 2017)
 # Requires [cuda] which is masked in most of the profiles.
 media-libs/opencv contrib_xfeatures2d
@@ -136,7 +142,7 @@ app-editors/gvim luajit racket
 # Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013)
 # Doesn't work on most profiles. Easier to mask here and
 # unmask in particular profiles
-sys-apps/hwloc gl opencl
+sys-apps/hwloc gl
 
 # Christoph Junghans <junghans@gentoo.org> (26 Dec 2012)
 # mkl only works on x86/amd64
@@ -161,9 +167,7 @@ app-arch/zpaq jit
 # Arun Raghavan <ford_prefect@gentoo.org> (28 Mar 2012)
 # webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
 # added.
-# Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
-# Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
-media-sound/pulseaudio webrtc-aec xen
+media-sound/pulseaudio webrtc-aec
 
 # Christoph Junghans <junghans@gentoo.org> (04 Feb 2012)
 # mips only use flags
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 9d0fd9f32e4c..2ef9288fb862 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -172,10 +172,6 @@ input_devices_wacom
 lcd_devices_svga
 lcd_devices_luise
 
-# Joseph Jezak <josejx@gentoo.org> (11 Mar 2007)
-# Only for x86 and amd64 (in pbbuttonsd)
-macbook
-
 # George Shapovalov <george@gentoo.org> (8 Apr 2007)
 # Ada is supported only on x86, amd64 and ppc at present
 ada
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 529847a438ba..dfe5c53bfeb3 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -46,10 +46,6 @@ dev-vcs/git pcre-jit
 # no point in pursuing it right now.
 app-shells/bash-completion test
 
-# Jeroen Roovers <jer@gentoo.org> (26 Feb 2017)
-# app-crypt/libsecret is not keyworded for HPPA
-dev-vcs/git libsecret
-
 # Jeroen Roovers <jer@gentoo.org> (4 Feb 2017)
 # media-libs/libilbc has not been ported to HPPA
 # media-libs/zimg triggers a toolchain issue (bug #597152)
@@ -218,7 +214,6 @@ net-im/pidgin gstreamer
 x11-misc/xscreensaver gdm new-login
 x11-libs/wxGTK gstreamer
 net-p2p/mldonkey guionly gtk
-dev-vcs/git gtk
 net-im/pidgin eds
 
 # Jeroen Roovers <jer@gentoo.org> (15 Apr 2008)
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 04596b5baade..b95b21044ba6 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -121,10 +121,6 @@ thunar
 # Webkit does not work on HPPA right now.
 webkit
 
-# Jeroen Roovers <jer@gentoo.org> (25 Oct 2010)
-# FFI does not work: "Unknown cpu type" (bug #337956)
-ffi
-
 # Jeroen Roovers <jer@gentoo.org> (20 Jul 2010)
 # Mask USE=gnome entirely (bug #324511)
 glade
@@ -239,7 +235,6 @@ video_cards_tdfx
 video_cards_tga
 video_cards_trident
 video_cards_tseng
-video_cards_v4l
 video_cards_vesa
 video_cards_voodoo
 
@@ -301,6 +296,3 @@ djbfft
 # media-sound/beep-media-player and remove if
 bmp
 3dfx
-
-# Adding h323 to mask. For more information see bug #115798
-h323
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 698bc72406fe..e63ab33040a5 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -246,10 +246,6 @@ dev-haskell/dataenc test
 # Keywords pending, bug #476710
 >=gnome-base/gnome-extra-apps-3.8 games
 
-# Dirkjan Ochtman <djc@gentoo.org> (3 May 2013)
-# depends on net-libs/polarssl
->=net-vpn/openvpn-2.3.1 polarssl
-
 # Julian Ospald <hasufell@gentoo.org> (31 Mar 2013)
 # depends on mono/monodevelop
 >=net-irc/hexchat-2.9.4-r1 theme-manager
@@ -261,7 +257,7 @@ media-video/libav hardcoded-tables
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Jan 2013)
 # remove mask when net-libs/libqmi is keyworded here
-net-misc/modemmanager qmi qmi-newest
+net-misc/modemmanager qmi
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (22 Jan 2013)
 # remove mask if/when media-gfx/argyllcms is keywored here.
@@ -298,10 +294,6 @@ sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_ope
 # jit not supported on ia64
 dev-libs/libpcre jit
 
-# Robin H. Johnson <robbat2@gentoo.org> (03 Sep 2011)
-# Remove this for your arch after you keyword dev-utils/google-perftools (bug #381737
-dev-libs/libmemcached tcmalloc
-
 # Tomáš Chvátal <scarabeus@gentoo.org> (4 Apr 2011)
 # Needs sci-libs/umfpack keyworded. Bug #361947.
 media-libs/gegl umfpack
diff --git a/profiles/arch/ia64/package.use.stable.mask b/profiles/arch/ia64/package.use.stable.mask
index be3a4b92f9d2..fe21a5cab99e 100644
--- a/profiles/arch/ia64/package.use.stable.mask
+++ b/profiles/arch/ia64/package.use.stable.mask
@@ -32,7 +32,5 @@ gnome-base/gvfs google
 x11-libs/gksu gnome
 
 # sufficiently recent wayland is not stable yet, bug #559062
-~dev-libs/efl-1.15.2 wayland
 ~dev-libs/efl-1.17.0 wayland
-~media-libs/elementary-1.15.2 wayland
 ~media-libs/elementary-1.17.0 wayland
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 5f1f66f276b0..b9620bee2155 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -81,7 +81,6 @@ bs2b
 tokyocabinet
 schroedinger
 ots
-eclipse
 vaapi
 librtmp
 rtmp
@@ -114,10 +113,6 @@ ocamlopt
 # Needs to be tested
 video_cards_nouveau
 
-# Matt Turner <mattst88@gmail.com> (06 May 2011)
-# media-sound/mumble not keyworded on ppc
-mumble
-
 # Samuli Suominen <ssuominen@gentoo.org> (02 Dec 2009)
 # This will need media-sound/musepack-tools
 musepack
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 646567111d56..d23e1f9824c6 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -56,7 +56,6 @@ emf
 R
 octave
 bluetooth
-autotrace
 lqr
 policykit
 bash-completion
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index f4c0b3d09e4d..0dc3cf8e9c60 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
+# Moved from use.mask since they are flags local to one package.
+sys-kernel/mips-sources -ip27 -ip28 -ip30
+
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
 media-libs/mesa vulkan
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 4c36200c18f0..60ea7770845a 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -316,9 +316,6 @@ ocamlopt
 fluidsynth
 
 # Mips USE flags
--ip27
--ip28
--ip30
 -fixed-point
 -loongson2f
 
diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask
index 865264b9a0e7..fe63e3027e62 100644
--- a/profiles/arch/nios2/package.use.mask
+++ b/profiles/arch/nios2/package.use.mask
@@ -68,10 +68,6 @@ sci-libs/linux-gpib firmware
 # unkeyworded deps for dev-python/ipython
 dev-python/ipython mongodb
 
-# Agostino Sarubbo <ago@gentoo.org> (05 May 2013)
-# dev-util/google-perftools is not keyworded for arm
->=dev-libs/libmemcached-0.50 tcmalloc
-
 # Christoph Junghans <junghans@gentoo.org> (29 Apr 2013)
 # MKL not available on this arch
 media-gfx/povray mkl
@@ -108,10 +104,6 @@ gnome-extra/sushi office
 dev-util/dbus-test-runner test
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# remove mask when app-text/yelp-tools is keyworded here
->=gnome-extra/zenity-3.6 test
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
 # remove mask when >=app-editors/gedit-3.6 is keyworded here
 dev-util/devhelp gedit
 
@@ -193,10 +185,6 @@ net-misc/mediatomb lastfm
 # Needs kde-frameworks/kwallet and kde-frameworks/kdelibs stable
 dev-vcs/subversion kwallet
 
-# Markus Meier <maekke@gentoo.org> (27 Sep 2009)
-# mask media-gfx/imagemagick[autotrace] as autotrace is not keyworded
-media-gfx/imagemagick autotrace
-
 # Jim Ramsay <lack@gentoo.org> (5 Nov 2008)
 # app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
 app-admin/gkrellm ntlm
diff --git a/profiles/arch/nios2/use.mask b/profiles/arch/nios2/use.mask
index 56c18b88e6b6..49cf1085a054 100644
--- a/profiles/arch/nios2/use.mask
+++ b/profiles/arch/nios2/use.mask
@@ -1,9 +1,6 @@
 # Unmask the flag which corresponds to ARCH.
 -nios2
 
-# doomsday ebuild is not available on this architecture
-doomsday
-
 # Markus Meier <maekke@gentoo.org> (22 Aug 2010)
 # net-wireless/wimax not tested
 wimax
@@ -51,7 +48,6 @@ R
 octave
 tracker
 xindy
-lyx
 mpi
 lasi
 schroedinger
@@ -121,7 +117,6 @@ aacplus
 devil
 gts
 anthy
-ace
 icu
 gtk
 qt4
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 585577535da5..c2540acd7a43 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -71,10 +71,6 @@ games-emulation/dosbox glide
 dev-db/mysql -numa
 dev-db/percona-server -numa
 
-# Pacho Ramos <pacho@gentoo.org> (21 Aug 2016)
-# gnat-gpl is being removed, bug #514074
-mail-client/alpine topal
-
 # Davide Pesavento <pesa@gentoo.org> (28 Jul 2016)
 # The corresponding Qt5 modules are not keyworded on ppc, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
@@ -248,7 +244,7 @@ sci-libs/gdal spatialite
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Jan 2013)
 # remove mask when net-libs/libqmi is keyworded here
-net-misc/modemmanager qmi qmi-newest
+net-misc/modemmanager qmi
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (22 Jan 2013)
 # remove mask if/when media-gfx/argyllcms is keywored here.
@@ -302,10 +298,6 @@ sys-fs/dmraid dietlibc
 # missing keywords on dependencies
 media-video/x264-encoder ffmpegsource
 
-# Robin H. Johnson <robbat2@gentoo.org> (03 Sep 2011)
-# Remove this for your arch after you keyword dev-utils/google-perftools (bug #381737
-dev-libs/libmemcached tcmalloc
-
 # Kacper Kowalik <xarthisius@gentoo.org> (10 Aug 2011)
 # mask cuda dep for opencv bug 365451
 media-libs/opencv cuda
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 524ae4fe94db..6de1a3b185de 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -52,7 +52,6 @@ sci-astronomy/stellarium sound
 # Requires unkeyworded dev-qt/qtwebkit:5, which is a PITA to maintain on
 # minor arches and has been declared deprecated by upstream. So we'd like
 # to avoid keywording it, unless requested by users.
-app-office/texmaker qt5
 dev-qt/designer webkit
 net-irc/quassel webkit
 kde-plasma/libksysguard detailedmemory
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 103d0fd04661..fe360a180a49 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -28,12 +28,10 @@ sci-libs/plplot ocaml
 
 # Pacho Ramos <pacho@gentoo.org> (02 Jul 2014)
 # Mask due Gnome3 not going to be stabilized on this arch
-app-misc/gramps webkit
 dev-java/swt webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
 gnome-base/gvfs google
 mail-client/balsa webkit
-media-gfx/gimp webkit
 >=net-libs/webkit-gtk-2.4 geoloc
 net-libs/libproxy webkit
 >=x11-libs/gtk+-3.12.2 cloudprint
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index aef8e03adea8..d4d81618ef5b 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -9,10 +9,6 @@ app-misc/geoclue skyhook
 # unmask galera for dev-db/mariadb
 >=dev-db/mariadb-10.1.0 -galera
 
-# Agostino Sarubbo <ago@gentoo.org> (31 Jan 2012)
-# Mask because requires a lot of unstable depends not ready for the stabilization
-gnome-extra/nm-applet bluetooth
-
 # Brent Baude <ranger@gentoo.org> (06 Jan 2010)
 # masking toolame for mplayer bug 280281
 media-video/mplayer toolame
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 53f2a4be72cb..8761fea48606 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -62,10 +62,6 @@ dev-qt/qtwebkit webchannel
 # missing keywords
 media-sound/audacity midi soundtouch
 
-# Justin Lecher <jlec@gentoo.org> (16 June 2015)
-# Pending bug upstream, #550818
-=app-office/scribus-1.5.0-r1 osg
-
 # Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
 # dev-lang/luajit lack ppc64 keyword, bug #551540
 dev-libs/libpeas jit
@@ -117,10 +113,6 @@ x11-misc/rss-glx quesoglc
 net-libs/libproxy webkit
 
 # Brent Baude <ranger@gentoo.org> (11 June 2008)
-# Masking webkit from gimp do to lame ppc64 toolchain and TOC
->=media-gfx/gimp-2.6.4 webkit
-
-# Brent Baude <ranger@gentoo.org> (11 June 2008)
 # Masking out passwdqc from pambase since passwdqc
 sys-auth/pambase passwdqc
 
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index c2ccf649a5f5..5d95716ccf84 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -57,7 +57,6 @@ acpi
 lm_sensors
 rar
 hdf
-fmod
 xvmc
 # cg is only provided by nvidia's binary only cg toolkit
 cg
@@ -138,10 +137,6 @@ ios
 # and it's also masked in arch/powerpc/ppc64/32ul/package.mask
 lirc
 
-# Matt Turner <mattst88@gmail.com> (06 May 2011)
-# media-sound/mumble not keyworded on ppc
-mumble
-
 # Kacper Kowalik <xarthisius@gentoo.org> (26 Jul 2011)
 # ppc keywords were dropped for dev-libs/prelude
 prelude
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index b6646e46cae8..8f5932e1bc1d 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -16,12 +16,10 @@ pbins
 R
 octave
 xindy
-lyx
 lasi
 kde
 mpi
 fuse
-autotrace
 lqr
 libproxy
 tokyocabinet
@@ -111,7 +109,6 @@ video_cards_i128
 video_cards_i740
 video_cards_mach64
 video_cards_mga
-video_cards_modesetting
 video_cards_neomagic
 video_cards_nouveau
 video_cards_nv
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index 8e4f9a430f22..a56758c02046 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -27,7 +27,6 @@ R
 octave
 tracker
 xindy
-lyx
 mpi
 lasi
 lensfun
@@ -66,7 +65,6 @@ timidity
 fluidsynth
 mms
 sid
-autotrace
 lqr
 musepack
 authdaemond
@@ -126,7 +124,6 @@ dri
 
 # nspr isnt ported to SuperH which means no seamonkey/firefox/etc...
 nsplugin
-firefox
 nss
 seamonkey
 
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 52e139cb6344..7768b74c66b7 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -205,7 +205,6 @@ net-misc/networkmanager teamd
 # See bug #533420.
 media-libs/clutter egl wayland
 media-libs/clutter-gtk wayland
-x11-wm/mutter kms
 
 # Mark Wright <gienah@gentoo.org> (14-23 Dec 2014, 1 Apr 2015)
 # test dependencies need keywording
@@ -277,7 +276,7 @@ media-sound/rhythmbox upnp-av
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Jan 2013)
 # remove mask when net-libs/libqmi is keyworded here
-net-misc/modemmanager qmi qmi-newest
+net-misc/modemmanager qmi
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (22 Jan 2013)
 # remove mask if/when media-gfx/argyllcms is keywored here.
@@ -330,10 +329,6 @@ app-text/asciidoc test
 # missing keywords on dependencies
 media-video/x264-encoder ffmpegsource
 
-# Robin H. Johnson <robbat2@gentoo.org> (03 Sep 2011)
-# Remove this for your arch after you keyword dev-utils/google-perftools (bug #381737
-dev-libs/libmemcached tcmalloc
-
 # Alexey Shvetsov <alexxy@gentoo.org> (31 Aug 2011)
 # Mask numa use flag per bug #381313
 sys-apps/hwloc numa
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index bb6686b73f96..0847fca20b17 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -32,14 +32,6 @@ app-admin/augeas test
 app-text/texlive context l10n_ja
 sys-block/thin-provisioning-tools test
 
-# Gilles Dartiguelongue <eva@gentoo.org> (13 Nov 2016)
-# Remove when stabilized, see bug #538828
-<=x11-base/xorg-drivers-1.17 input_devices_libinput
-
-# Gilles Dartiguelongue <eva@gentoo.org> (13 Nov 2016)
-# Dependency not stable on this arch, bug #542570 and bug #538828.
-xfce-base/xfce4-settings libinput
-
 # Davide Pesavento <pesa@gentoo.org> (18 Oct 2015)
 # Requires dev-python/PyQt4, which is not stable on sparc
 media-sound/pulseaudio equalizer
@@ -61,7 +53,5 @@ x11-libs/gksu gnome
 x11-wm/icewm gnome
 
 # sufficiently recent wayland is not stable yet, bug #559062
-~dev-libs/efl-1.15.2 wayland
 ~dev-libs/efl-1.17.0 wayland
-~media-libs/elementary-1.15.2 wayland
 ~media-libs/elementary-1.17.0 wayland
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 8100810af367..c8a865df12f5 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -43,7 +43,6 @@ nagios-game
 
 # Samuli Suominen <ssuominen@gentoo.org> (07 May 2012)
 # Missing keywording in www-client/firefox wrt #360427
-firefox
 mozilla
 thunderbird
 
@@ -84,10 +83,6 @@ romio
 dar32
 dar64
 
-# 2006/09/05 - Tupone Alfredo <tupone@gentoo.org>
-# doomsday ebuild is not available on this architecture
-doomsday
-
 # Needs java
 pdfannotextractor
 
@@ -162,10 +157,6 @@ frei0r
 prelude
 redis
 
-# Asterisk use flag masking
-zaptel
-
-
 # USE-flags from differents origins
 brltty
 directfb
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
deleted file mode 100644
index 79ce81f9e1df..000000000000
--- a/profiles/arch/x86/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Mike Gilbert <floppym@gentoo.org> (05 Nov 2016)
-# seccomp-related regression on x86.
-# https://bugs.gentoo.org/598992
-=sys-apps/systemd-232
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 95f0481da04f..6445d420d6af 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,11 @@
 
 # This file requires >=portage-2.1.1
 
+# Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
+# Moved from use.mask since it is a flag local to one package:
+# pbbuttonsd and macbook for KDE and pbuttonsd it
+app-laptop/pbbuttonsd -macbook
+
 # Hans de Graaff <graaff@gentoo.org> (8 Dec 2017)
 # Test dependencies are no longer keyworded due to dropped Rails
 # keyword.
@@ -175,9 +180,7 @@ app-arch/zpaq -jit
 # Arun Raghavan <ford_prefect@gentoo.org> (29 Mar 2012)
 # webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
 # added.
-# Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
-# Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
-media-sound/pulseaudio -webrtc-aec -xen
+media-sound/pulseaudio -webrtc-aec
 
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Feb 2012)
 # Masked in base profile, supported on this arch
@@ -215,8 +218,7 @@ www-client/links -suid
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
 
 # Alexey Shvetsov <alexxy@gentoo.org> (1 Jul 2011)
-# Use mask infiniband for stable corosync and glusterfs
-=sys-cluster/glusterfs-3.1.2 infiniband
+# Use mask infiniband for stable corosync
 =sys-cluster/corosync-1.3.0 infiniband
 
 # Tim Harder <radhermit@gentoo.org> (13 Feb 2011)
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 2b5cfa782935..58f2fc383b66 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -92,10 +92,6 @@
 # Add support for Ruby Enterprise Edition targets where rubyee is available
 # -ruby_targets_ree18
 
-# pbbuttonsd and macbook for KDE and pbuttonsd it
-#-pbbuttonsd
--macbook
-
 # Unmask x86 instruction sets
 -lilo
 -mpx
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index eac52509172d..bd862234ef26 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -30,10 +30,6 @@ dev-lang/python threads
 # Workaround until resolved upstream (bug #586840)
 >=dev-games/simgear-2016.2.1 dns
 
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (20 Aug 2016)
-# Chromium GYP build is no longer supported - always use GN.
->=www-client/chromium-54 gn
-
 # Lars Wendler <polynomial-c@gentoo.org> (11 Sep 2015)
 # Package fails to build with dbus USE flag being disabled (bug #560208)
 =x11-wm/afterstep-2.2.12 dbus
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 15745796e61f..0acb4082c1e5 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -49,8 +49,7 @@ net-analyzer/linkchecker X
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
 # USE=qt4 depends on masked dev-qt/qtwebkit:4, bug #620754
-# USE=geocad depends on masked <sci-libs/opencascade-6.8.0
-sci-physics/root geocad qt4
+sci-physics/root qt4
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
 # Depends on masked dev-qt/qtwebkit:4, bug #620684
@@ -72,10 +71,6 @@ dev-python/pyside:0 webkit
 # Potentially destructive. Use it only if you know what you're doing.
 sys-libs/glibc vanilla
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (6 Sep 2017)
-# This should really go away now.
->=sys-libs/glibc-2.26 rpc
-
 # Michael Orlitzky <mjo@gentoo.org> (24 Aug 2017)
 # This is a security risk if not used carefully, bug 628596.
 net-analyzer/nrpe command-args
@@ -208,12 +203,10 @@ sys-boot/grub:2 test
 # Ulrich Müller <ulm@gentoo.org> (4 Feb 2017)
 # Uses old and vulnerable net-libs/webkit-gtk:3, bug #584156.
 app-editors/emacs:25 xwidgets
-app-editors/emacs-vcs:25 xwidgets
 
 # Ian Stakenvicius (25 Jan 2017)
 # rust on mozilla packages is experimental
 www-client/firefox rust
-www-client/seamonkey rust
 mail-client/thunderbird rust
 
 # Lars Wendler <polynomial-c@gentoo.org> (19 Jan 2017)
@@ -239,12 +232,10 @@ net-proxy/haproxy wurfl
 # Not rely on monodevelop, bug #596656
 # dev-dotnet/zeitgeist-sharp is going to be removed, bug #582894
 net-irc/hexchat theme-manager
-gnome-extra/zeitgeist-datasources mono tomboy
 
 # Pacho Ramos <pacho@gentoo.org> (27 Nov 2016)
 # Avoid the usage of dead net-dialup/capi4k-utils
 app-emulation/crossover-bin capi
-net-libs/opal capi
 
 # Ettore Di Giacinto <mudler@gentoo.org> (10 Nov 2016)
 # Dependency has no stable keyword
@@ -266,8 +257,6 @@ app-editors/emacs-vcs cairo
 # Brian Evans <grknight@gentoo.org> (22 Aug 2016)
 # Depends on masked, end-of-life php versions
 <=dev-libs/ossp-uuid-1.6.2-r4 php
-=dev-libs/xapian-bindings-1.2.22 php
-=www-servers/uwsgi-2.0.9 php
 
 # Gilles Dartiguelongue <eva@gentoo.org> (21 Aug 2016)
 # Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
@@ -281,13 +270,6 @@ dev-ml/cairo-ocaml svg
 # gnutls is broken for years
 >=net-libs/gsoap-2.8.0 gnutls
 
-# Brian Dolbec <dolsen@gentoo.org> (9 Aug 2016)
-# Mask doc use flag due to needed sphinx pkg update
-~dev-util/buildbot-0.9.0_p1 doc
-~dev-util/buildbot-0.9.1 doc
-~dev-util/buildbot-0.9.2 doc
-~dev-util/buildbot-0.9.3 doc
-
 # Michał Górny <mgorny@gentoo.org> (05 Jul 2016)
 # Mask system-clang support as it requires llvm-3.4 that is subject
 # to security bug cleanup, #585102.
@@ -375,14 +357,8 @@ sys-auth/consolekit cgroups
 # Manuel Rüger <mrueg@gentoo.org> (03 Sep 2015)
 # Mask USE=ruby for packages that solely rely on the soon to be deprecated
 # ruby 1.9
-# See bug #547828
-<app-mobilephone/obexftp-0.24 ruby
 # See bug #541648
 <dev-libs/Ice-3.6 ruby
-# See bug #547832
-sci-libs/gdal ruby
-# See bug #547834
-<sys-apps/paludis-2.4.0 ruby
 
 # James Le Cuirot <chewi@gentoo.org> (18 Aug 2015)
 # gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by
@@ -463,10 +439,6 @@ dev-db/percona-server embedded
 # Mask pixman USE flag of dev-libs/efl for future removal, bug 501074
 dev-libs/efl pixman
 
-# Zac Medico <zmedico@gentoo.org> (06 Jun 2014)
-# Needs hardmasked lua-5.2
-www-servers/mongoose lua
-
 # Manuel Rüger <mrueg@gentoo.org> (05 Jun 2014)
 # Fails to build with net-libs/libotr-4.0.0
 net-im/climm otr
@@ -485,14 +457,6 @@ net-analyzer/metasploit development test
 # Tracked in Gentoo bug #509602.
 dev-java/jboss-logging doc
 
-# Markos Chandras <hwoarang@gentoo.org> (20 Apr 2014)
-# Fails to build with recent polarssl (>=1.3). Bug #503604
-media-video/rtmpdump polarssl
-
-# Julian Ospald <hasufell@gentoo.org> (06 Apr 2014)
-# broken wrt #501582
-<net-vpn/openvpn-9999 polarssl
-
 # Manuel Rüger <mrueg@gentoo.org> (07 Mar 2014)
 # Mask ruby18-only compatible flags
 # Bugs: 483104, 483102
@@ -565,11 +529,6 @@ media-libs/avidemux-core system-ffmpeg
 # Change to <10
 <net-misc/teamviewer-10 system-wine
 
-# Alexis Ballier <aballier@gentoo.org> (15 Feb 2013)
-# Needs a huge patch to build against recent releases of FFmpeg/libav.
-# Mask it until upstream fixes it. Bug #417869
-<media-sound/audacity-2.1.0 ffmpeg
-
 # Jory A. Pratt <anarchy@gentoo.org> (15 Dec 2012)
 # PGO is known to be busted with most configurations
 www-client/firefox pgo
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b6cde8be40c7..972361178c67 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -137,10 +137,6 @@ dev-lang/python-exec -python_targets_python3_6
 # bug #539212
 app-emulation/vice ffmpeg
 
-# Pacho Ramos <pacho@gentoo.org> (13 May 2015)
-# texinfo-5 cannot be stabilized yet
-=dev-lang/gnat-gcc-4.6* doc
-
 # Jeroen Roovers <jer@gentoo.org> (26 Apr 2015)
 # mongodb support is nice, but dev-libs/mongo-c-driver upstream is not ready
 # yet (bug #542210)
@@ -170,7 +166,7 @@ media-libs/opencv vtk
 
 # Mikle Kolyada <zlogene@gentoo.org> (16 Aug 2014)
 # Not yet stabilized dependency, need more testing
->=dev-perl/PDL-2.4.11 pdl2 pgplot plplot
+>=dev-perl/PDL-2.4.11 pdl2 pgplot
 
 # Samuli Suominen <ssuominen@gentoo.org> (01 Aug 2014)
 # Optional (not required by anything in gentoo-x86) and fragile (based on
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 16f1aefe03c2..e034a906c110 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -12,7 +12,6 @@ input_devices_aiptek
 input_devices_fpit
 input_devices_hyperpen
 input_devices_mutouch
-input_devices_pentouch
 
 # Matt Turner <mattst88@gentoo.org> (23 Nov 2017)
 # For ancient hardware. Tired of maintaining. Masked for removal in 30 days.
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index 63ee6117c6ba..9deed24529e0 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -32,9 +32,6 @@ sys-apps/openrc pam
 # app-admin/gkrellm may pull in hddtemp, which is not yet available here
 app-admin/gkrellm hddtemp
 
-# Somehow, check's tests are broken..
-dev-util/checkstyle test
-
 # PDA masked until we can do some testing on it
 mail-client/claws-mail pda
 
diff --git a/profiles/default/linux/hppa/package.use.mask b/profiles/default/linux/hppa/package.use.mask
index a15b682d8312..99c32a380222 100644
--- a/profiles/default/linux/hppa/package.use.mask
+++ b/profiles/default/linux/hppa/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
@@ -21,7 +21,6 @@ dev-qt/qtdemo pch
 dev-qt/qtgui pch
 dev-qt/qthelp pch 
 dev-qt/qtopengl pch
-dev-qt/qtphonon pch
 dev-qt/qtscript pch
 dev-qt/qtsql pch
 dev-qt/qtsvg pch
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
index 9078b7c61920..a1ebac8bd77c 100644
--- a/profiles/default/linux/musl/package.use.mask
+++ b/profiles/default/linux/musl/package.use.mask
@@ -17,4 +17,3 @@ dev-vcs/git gpg
 
 # See bug #576928
 media-libs/mesa nptl
-x11-base/xorg-server nptl
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 663009d688f4..0a6667cd9dce 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -24,14 +24,6 @@ media-libs/mesa openmax
 # mask frost USE flag, broken with >=net-libs/polarssl-1.3.0, bug 489256
 net-p2p/fms frost
 
-# Markos Chandras <hwoarang@gentoo.org> (10 Nov 2013)
-# Does not build with polarssl in the tree.
-# see eg 9e36f0475f011912ee0897aa6487d7b9c190600e
-# in polarssl upstream.
-# The polarssl use flag may go away if the rtmpdump
-# upstream will not fix this problem soon
-media-video/rtmpdump polarssl
-
 # Diego Elio Pettenò (27 Aug 2012)
 # The libpci access is only used for linux.
 net-analyzer/net-snmp -pci
diff --git a/profiles/desc/calligra_features.desc b/profiles/desc/calligra_features.desc
index 07269c587e21..5f6dc2261dbe 100644
--- a/profiles/desc/calligra_features.desc
+++ b/profiles/desc/calligra_features.desc
@@ -4,12 +4,7 @@
 # This file contains descriptions of CALLIGRA_FEATURES USE_EXPAND flags.
 
 # Keep it sorted.
-braindump - CALLIGRA_FEATURES option to build mindmap note collection application
-flow - CALLIGRA_FEATURES option to build flowcharting application
 karbon - CALLIGRA_FEATURES option to build vector image editor
-kexi - CALLIGRA_FEATURES option to build database manager
-krita - CALLIGRA_FEATURES option to build raster image editor
 plan - CALLIGRA_FEATURES option to build project planning component
 sheets - CALLIGRA_FEATURES option to build spreadsheet processor
-stage - CALLIGRA_FEATURES option to build presentation processor
 words - CALLIGRA_FEATURES option to build word processor
diff --git a/profiles/desc/crosscompile_opts.desc b/profiles/desc/crosscompile_opts.desc
index 2c43b927f14b..1923d8b13e80 100644
--- a/profiles/desc/crosscompile_opts.desc
+++ b/profiles/desc/crosscompile_opts.desc
@@ -1,9 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of CROSSCOMPILE_OPTS USE_EXPAND flags.
 
 # Keep it sorted.
 
-bootstrap - Build only a bootstrap version of the toolchain.
 headers-only - Build the toolchain against cross-headers only.
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index 2868c78a6f9a..b06ac668b0f4 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -54,6 +54,7 @@ dsb - Lower Sorbian
 dz - Dzongkha
 el - Modern Greek
 en - English
+en-AU - English (Australia)
 en-GB - English (United Kingdom)
 en-US - English (United States)
 en-ZA - English (South Africa)
@@ -62,8 +63,12 @@ es - Spanish
 es-419 - Spanish (Latin America)
 es-AR - Spanish (Argentina)
 es-CL - Spanish (Chile)
+es-CO - Spanish (Colombia)
+es-DO - Spanish (Dominican Republic)
 es-ES - Spanish (Spain)
 es-MX - Spanish (Mexico)
+es-UY - Spanish (Uruguay)
+es-VE - Spanish (Venezuela)
 et - Estonian
 eu - Basque
 fa - Persian
@@ -129,6 +134,7 @@ oc - Occitan
 om - Oromo
 or - Oriya (macrolanguage)
 pa - Punjabi
+pam - Kapampangan
 pl - Polish
 pt - Portuguese
 pt-BR - Portuguese (Brazil)
@@ -146,6 +152,7 @@ si - Sinhala
 sid - Sidamo
 sk - Slovak
 sl - Slovenian
+sn - Shona
 son - Songhai languages
 sq - Albanian
 sr - Serbian
@@ -171,7 +178,9 @@ ts - Tsonga
 tt - Tatar
 ug - Uyghur
 uk - Ukrainian
+ur-PK - Urdu (Pakistan)
 uz - Uzbek
+uz-Cyrl - Uzbek (Cyrillic script)
 ve - Venda
 vi - Vietnamese
 wa - Walloon
diff --git a/profiles/desc/linguas.desc b/profiles/desc/linguas.desc
index b71c8fd9f0ad..f0a4dbbba207 100644
--- a/profiles/desc/linguas.desc
+++ b/profiles/desc/linguas.desc
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of LINGUAS USE_EXPAND flags.
 
 # Keep it sorted.
 
-ach - Acoli locale
 af - Afrikaans locale
 af_ZA - Afrikaans locale for South Africa
 ak - Akan locale
@@ -28,7 +27,6 @@ bn_BD - Bengali locale for Bangladesh
 bn_IN - Bengali locale for India
 bo - Tibetan locale
 br - Breton locale
-brx - Bodo locale for India
 bs - Bosnian locale
 byn - Bilin (Bilen, Blin) locale
 ca - Catalan locale
@@ -50,17 +48,13 @@ de - German locale
 de@1901 - German locale with old spelling
 de_CH - German locale for Switzerland
 de_DE - German locale for Germany
-dgo - Dogri locale for India
-doi - Dogri locale
 dz - Dzongkha locale
-ee - Ewe locale
 el - Greek locale
 el_GR - Greek locale
 en - English locale
 en@shaw - Shavian locale
 en_AU - English locale for Australia
 en_CA - English locale for Canada
-en_EN - English locale
 en_GB - English locale for Britain
 en_US - English locale
 en_ZA - English locale for South Africa
@@ -95,23 +89,19 @@ fur - Friullian locale
 fy - Frisian locale
 fy_NL - Frisian language locale for the Netherlands
 ga - Irish locale
-ga_IE - Irish locale for Ireland
 gd - Gaelic locale
 gez - Ge'ez locale
 gl - Galician locale
 gl_ES - Galician locale for Spain
 gu - Gujarati locale
 gu_IN - Gujarati locale for India
-gug - Paraguayan (Guarani) locale
 haw - Hawaiian locale
 he - Hebrew locale
 he_IL - Hebrew locale for Israel
 hi - Hindi locale
 hi_IN - Hindi locale
-hne - Chhattisgarhi locale
 hr - Croatian locale
 hr_HR - Croatian locale
-hsb - Upper Sorbian locale
 hu - Hungarian locale
 hu_HU - Hungarian locale
 hy - Armenian locale
@@ -138,7 +128,6 @@ kn_IN - Kannada locale for India
 ko - Korean locale
 ko_KR - Korean locale
 kok - Konkani locale
-ks - Kashmiri locale
 ksw - S'gaw Karen locale
 ku - Kurdish (latin) locale
 ku_IQ - Kurdish (latin) locale for Iraq
@@ -161,7 +150,6 @@ mk - Macedonian locale
 mk_MK - Macedonian locale for Macedonia
 ml - Malayalam locale
 mn - Mongolian locale
-mni - Manipuri locale
 mr - Marathi locale
 ms - Malay locale
 ms_MY - Malay locale for Malaysia
@@ -173,20 +161,17 @@ nb_NO - Norwegian (Bokmal) locale for Norway
 nds - Low Saxon locale
 ne - Nepali locale
 nl - Dutch locale
-nl_BE - Dutch locale for Belgium (Flemish)
 nl_NL - Dutch locale for the Netherlands
 nn - Nynorsk locale
 nn_NO - Nynorsk locale for Norway
 no - Norwegian locale
 no_NO - Norwegian locale for Norway
 nqo - N'Ko locale
-nr - Ndebele (South) locale
 nso - Northern Sotho locale
 oc - Occitan locale
 om - Oromo locale
 or - Oriya locale
 pa - Punjabi locale for India
-pa_IN - Punjabi locale for India
 pam - Kapampangan locale
 pap - Papiamento locale
 pl - Polish locale
@@ -203,12 +188,8 @@ ru_RU - Russian locale for Russia
 rue - Rusyn locale
 rw - Kinyarwanda locale
 sa - Sanskrit locale
-sa_IN - Sanskrit locale for India
-sah - Sakha (Yakut) locale
-sat - Santali locale
 sc - Sardinian locale
 sco - Scots locale
-sd - Sindhi locale
 se - Northern Saami locale
 shn - Shan locale
 si - Sinhala locale
@@ -218,7 +199,6 @@ sk_SK - Slovak locale
 sl - Slovenian locale
 sl_SI - Slovenian locale
 so - Somali locale
-son - Songhai locale
 sq - Albanian locale
 sq_AL - Albanian locale
 sr - Serbian locale
@@ -229,19 +209,13 @@ sr@latin - Serbian (latin) locale
 sr_RS - Serbian locale for Serbia
 sr_RS@cyrillic - Serbian (cyrillic) locale for Serbia
 sr_RS@latin - Serbian (latin) locale for Serbia
-ss - Swati locale
-st - Southern Sotho locale
 sv - Swedish locale
 sv_SE - Swedish locale for Sweden
 sw - Swahili locale
-sw_TZ - Swahili locale for Tanzania
-syc - Syriac locale
 ta - Tamil locale
 ta_IN - Tamil locale
-ta_LK - Tamil locale for Sri Lanka
 te - Telugu locale
 tg - Tajik locale
-tg_TJ - Tajik locale Tajikistan
 th - Thai locale
 th_TH - Thai locale Thailand
 ti - Tigrinya locale
@@ -249,7 +223,6 @@ tig - Tigre locale
 tk - Turkmen locale
 tl - Tagalog locale
 tlh - Klingon locale
-tn - Tswana locale
 tpi - Tok Pisin locale
 tr - Turkish locale
 tr_TR - Turkish locale for Turkey
diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index 367a5911708b..3c65f245eef4 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -12,7 +12,6 @@ ast - VIDEO_CARDS setting to build driver for ASpeedTech video cards
 chips - VIDEO_CARDS setting to build driver for chips video cards
 cirrus - VIDEO_CARDS setting to build driver for cirrus video cards
 dummy - VIDEO_CARDS setting to build driver for dummy video cards
-epson - VIDEO_CARDS setting to build driver for epson video cards
 exynos - VIDEO_CARDS setting to build driver for Samsung Exynos video cards
 freedreno - VIDEO_CARDS setting to build reverse-engineered driver for Qualcomm Adreno cards
 fbdev - VIDEO_CARDS setting to build driver for fbdev video cards
@@ -26,7 +25,6 @@ imx - VIDEO_CARDS setting to build driver for Freescale i.MX video cards
 intel - VIDEO_CARDS setting to build driver for Intel video cards
 mach64 - VIDEO_CARDS setting to build driver for mach64 video cards
 mga - VIDEO_CARDS setting to build driver for mga video cards
-modesetting - VIDEO_CARDS setting to build driver for unaccelerated modesetting
 neomagic - VIDEO_CARDS setting to build driver for neomagic video cards
 newport - VIDEO_CARDS setting to build driver for newport video cards
 nouveau - VIDEO_CARDS setting to build reverse-engineered driver for nvidia cards
diff --git a/profiles/desc/vmware_guest.desc b/profiles/desc/vmware_guest.desc
deleted file mode 100644
index 9de6a01d21d1..000000000000
--- a/profiles/desc/vmware_guest.desc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of VMWARE_GUEST USE_EXPAND flags.
-
-# Keep it sorted.
-
-freebsd - Install VMware Tools for FreeBSD guests
-linux - Install VMware Tools for Linux guests
-netware - Install VMware Tools for Netware guests
-solaris - Install VMware Tools for Solaris guests
-windows - Install VMware Tools for Windows 2000+ guests
-winPre2k - Install VMware Tools for Windows 95/98/ME guests
diff --git a/profiles/desc/xtables_addons.desc b/profiles/desc/xtables_addons.desc
index a59618fda9fe..c78e11c7dcc2 100644
--- a/profiles/desc/xtables_addons.desc
+++ b/profiles/desc/xtables_addons.desc
@@ -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
 
 # This file contains descriptions of XTABLES_ADDONS USE-EXPANDED variables.
@@ -6,7 +6,6 @@
 
 account - ACCOUNT target is a high performance accounting system for large local networks
 chaos - CHAOS target causes confusion on the other end by doing odd things with incoming packets
-checksum - CHECKSUM target computes and fills in the checksum in a packet that lacks a checksum
 condition - matches if a specific condition variable is (un)set
 delude - DELUDE target will reply to a SYN packet with SYN-ACK, and to all other packets with an RST
 dhcpmac - DHCPMAC target/match in conjunction with ebtables can be used to completely change all MAC addresses from and to a VMware-based virtual machine
@@ -25,8 +24,5 @@ lscan - match detects simple low-level scan attemps based upon the packet's cont
 quota2 - match implements a named counter which can be increased or decreased on a per-match basis
 pknock - match implements so-called "port knocking", a stealthy system for network authentication
 psd - match attempts to detect TCP and UDP port scans (derived from Solar Designer's scanlogd)
-rawnat - The RAWSNAT and RAWDNAT targets provide stateless network address translation
-steal - STEAL target is like DROP, but does not throw an error when used in the OUTPUT chain
 sysrq - SYSRQ target allows to remotely trigger sysrq on the local machine over the network
 tarpit - TARPIT target captures and holds incoming TCP connections using no local per-connection resources
-tee - TEE target will clone a packet and redirect this clone to another machine on the local network segment
diff --git a/profiles/features/hardened/amd64/package.use.mask b/profiles/features/hardened/amd64/package.use.mask
deleted file mode 100644
index 50e34f0e46d0..000000000000
--- a/profiles/features/hardened/amd64/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Cernlib has address space issues on amd64 and package is no
-# longer supported by upstream. Thus masking it and its reverse
-# dependencies.
-# See bugs 426764, 556612.
-=sci-physics/geant-4.9.4* geant3
diff --git a/profiles/features/multilib/package.use.force b/profiles/features/multilib/package.use.force
index 90f2389e51bd..dfb4f6d5f699 100644
--- a/profiles/features/multilib/package.use.force
+++ b/profiles/features/multilib/package.use.force
@@ -1,7 +1,6 @@
-# Copyright 2004-2014 Gentoo Foundation.
+# Copyright 2004-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
 
 # These packages must have multilib turned on in order to work sanely.
-sys-apps/sandbox multilib
 sys-devel/gcc multilib
 sys-libs/glibc multilib
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 9af31771b185..ed4720c885ab 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -17,7 +17,6 @@ app-emulation/libvirt firewalld
 gnome-base/gdm wayland
 net-firewall/fwknop firewalld
 www-servers/uwsgi uwsgi_plugins_systemd_logger
-x11-wm/mutter kms
 >=x11-wm/mutter-3.22 wayland
 x11-misc/xscreensaver gdm
 xfce-extra/xfswitch-plugin gdm
diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask
index 58ee5df13b40..8884ba565956 100644
--- a/profiles/hardened/linux/amd64/no-multilib/use.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/use.mask
@@ -17,7 +17,3 @@ hvm
 # 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Mask multilib, since we cannot use it.
 multilib
-
-# 2009/05/11 Doug Goldstein <cardoe@gentoo.org>
-# Mask 32bit since this will always require emulation packages
-32bit
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
index d7b99467153b..37c202d1ffcf 100644
--- a/profiles/hardened/linux/amd64/package.mask
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -1,13 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Magnus Granberg <zorry@gentoo.org> (20 Nov 2012)
-# Newer then 300.00 is patched but we still have RWX in the libs.
-# We mask X for we still need to make the doc for revdep-pax else
-# hell will rule.
-# Bug 433121
-<=x11-drivers/nvidia-drivers-300.00
-#dev-util/nvidia-cuda-sdk
 # Need X
 media-video/nvidia-settings
 
diff --git a/profiles/hardened/linux/amd64/package.use.mask b/profiles/hardened/linux/amd64/package.use.mask
index adf1cdc24117..6c676aebf214 100644
--- a/profiles/hardened/linux/amd64/package.use.mask
+++ b/profiles/hardened/linux/amd64/package.use.mask
@@ -21,9 +21,3 @@
 # Magnus Granberg <zorry@gentoo.org> (29 Nov 2012)
 # Bug #444786 disable nvidia on app-admin/conky
 app-admin/conky nvidia
-
-# Cernlib has address space issues on amd64 and package is no
-# longer supported by upstream. Thus masking it and its reverse
-# dependencies.
-# See bugs 426764, 556612.
-=sci-physics/geant-4.9.4* geant3
diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
index 34d4628f470d..56f5b1470f8f 100644
--- a/profiles/hardened/linux/package.mask
+++ b/profiles/hardened/linux/package.mask
@@ -15,7 +15,3 @@ app-crypt/hmaccalc
 # due to C99 struct init requirement by hardened kernels,
 # see bug 540196 comment 9.
 net-fs/openafs-kernel
-
-# broken on hardened bug #608788
-# localedef segfaults when running locale-gen
-=sys-libs/glibc-2.24-r1
diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask
index 75e2892ae0bd..3b65232662f7 100644
--- a/profiles/hardened/linux/powerpc/ppc64/use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/use.mask
@@ -17,7 +17,6 @@ portaudio
 
 # mask mozilla/firefox (bug #108020)
 mozilla
-firefox
 seamonkey
 
 # 2006/03/20 - Donnie Berkholz <dberkholz@gentoo.org>
diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask
index a514e8497fe9..6312ebcd3402 100644
--- a/profiles/hardened/linux/x86/package.mask
+++ b/profiles/hardened/linux/x86/package.mask
@@ -1,13 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Rick Farina <zerochaos@gentoo.org> (26 Nov 2012)
-# Newer then 300.00 is patched but we still have RWX in the libs.
-# We mask X for we still need to make the doc for revdep-pax else
-# hell will rule. Propogating change from amd64.
-# Bug 433121
-<=x11-drivers/nvidia-drivers-300.00
-#dev-util/nvidia-cuda-sdk
 # Need X
 media-video/nvidia-settings
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 5696198b06c2..533c373b04cd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Alice Ferrazzi <alicef@gentoo.org> (30 Dec 2017)
+# Masked for removal in 30 days.
+# Upstream is no more backporting security fixes for 4.12.
+# For a more stable kernel please downgrade to 4.9 
+# or move to 4.14(unstable) if it works for you.
+=sys-kernel/gentoo-sources-4.12.14
+=sys-kernel/gentoo-sources-4.12.13
+=sys-kernel/gentoo-sources-4.12.12
+
 # David Seifert <soap@gentoo.org> (29 Dec 2017)
 # Last release in 2003, EAPI 0, C++ extremely broken
 # Removal in 30 days
@@ -252,9 +261,10 @@ net-voip/ekiga
 
 # Alice Ferrazzi <alicef@gentoo.org> (27 Dec 2017)
 # Masked for removal in 30 days.
-# There are issue on this kernel version due to a heavy changeset.
+# This kernel doesn't boot on hardened profiles.
 # (bug #642268)
 =sys-kernel/gentoo-sources-4.14.9
+=sys-kernel/gentoo-sources-4.14.10
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (27 Dec 2017)
 # Ancient. EAPI=3. (Nearly) no consumers. Needs to go.
diff --git a/profiles/prefix/aix/package.unmask b/profiles/prefix/aix/package.unmask
index 4316cec44a8e..9419418bd1b9 100644
--- a/profiles/prefix/aix/package.unmask
+++ b/profiles/prefix/aix/package.unmask
@@ -3,6 +3,7 @@
 
 # Michael Haubenwallner <haubi@gentoo.org> (03 Mar 2017)
 # Only these versions have the patches for proper AIX support.
+# note: these ebuilds come from repo/proj/prefix.git
 ~sys-devel/gcc-4.2.4
 ~sys-devel/gcc-4.8.4
 
diff --git a/profiles/prefix/aix/package.use.mask b/profiles/prefix/aix/package.use.mask
index 0e514aff0a3d..21d4342daa5a 100644
--- a/profiles/prefix/aix/package.use.mask
+++ b/profiles/prefix/aix/package.use.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (13 Mar 2017)
-# libstdbuf.so build failure is fixed in coreutils-8.27
-<sys-apps/coreutils-8.27 stdbuf
-
 # Michael Haubenwallner <haubi@gentoo.org> (16 Feb 2012)
 # JIT implementation in pcre does not know about AIX.
 dev-libs/libpcre jit
diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask
index 28f2cc6ab75a..4317ed36e081 100644
--- a/profiles/prefix/aix/use.mask
+++ b/profiles/prefix/aix/use.mask
@@ -16,7 +16,6 @@ clvm
 directfb
 djbfft
 fbcon
-fmod
 ggi
 gpm
 hardened
diff --git a/profiles/prefix/darwin/macos/10.10/x64/use.mask b/profiles/prefix/darwin/macos/10.10/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.10/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.10/x86/use.mask b/profiles/prefix/darwin/macos/10.10/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.10/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.11/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.11/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.12/x64/use.mask b/profiles/prefix/darwin/macos/10.12/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.12/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.12/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.12/x86/use.mask b/profiles/prefix/darwin/macos/10.12/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.12/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.12/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.13/x64/use.mask b/profiles/prefix/darwin/macos/10.13/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.13/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.13/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.13/x86/use.mask b/profiles/prefix/darwin/macos/10.13/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.13/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.13/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.4/package.use.mask b/profiles/prefix/darwin/macos/10.4/package.use.mask
index abb881877509..6559a807eafd 100644
--- a/profiles/prefix/darwin/macos/10.4/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.4/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 
@@ -6,7 +6,3 @@
 # mach_override.h missing
 # http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
 dev-lang/erlang hipe
-
-# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
-# there's no (official) java6 on macosx
-dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.4/x86/use.mask b/profiles/prefix/darwin/macos/10.4/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.4/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.5/package.use.mask b/profiles/prefix/darwin/macos/10.5/package.use.mask
index abb881877509..6559a807eafd 100644
--- a/profiles/prefix/darwin/macos/10.5/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 
@@ -6,7 +6,3 @@
 # mach_override.h missing
 # http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html
 dev-lang/erlang hipe
-
-# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
-# there's no (official) java6 on macosx
-dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.5/x64/use.mask b/profiles/prefix/darwin/macos/10.5/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.5/x86/use.mask b/profiles/prefix/darwin/macos/10.5/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.6/package.use.mask b/profiles/prefix/darwin/macos/10.6/package.use.mask
deleted file mode 100644
index cba856984633..000000000000
--- a/profiles/prefix/darwin/macos/10.6/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
-# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
-# there's no (official) java6 on macosx
-dev-util/checkstyle test
diff --git a/profiles/prefix/darwin/macos/10.6/x64/use.mask b/profiles/prefix/darwin/macos/10.6/x64/use.mask
index c16569bf2a90..457c02eaffad 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.6/x86/use.mask b/profiles/prefix/darwin/macos/10.6/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.7/x64/use.mask b/profiles/prefix/darwin/macos/10.7/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.7/x86/use.mask b/profiles/prefix/darwin/macos/10.7/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.8/x64/use.mask b/profiles/prefix/darwin/macos/10.8/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.8/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.8/x86/use.mask b/profiles/prefix/darwin/macos/10.8/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.8/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.9/x64/use.mask b/profiles/prefix/darwin/macos/10.9/x64/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.9/x64/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/macos/10.9/x86/use.mask b/profiles/prefix/darwin/macos/10.9/x86/use.mask
index 63b5b7a8d61b..3e153701348d 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.9/x86/use.mask
@@ -6,7 +6,6 @@
 # profile have a USE flag associated with (such as altivec, mmx, etc).
 
 # Unmask x86 instruction sets
--ifc
 -cpu_flags_x86_mmx
 -cpu_flags_x86_mmxext
 -cpu_flags_x86_sse
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index 5f339ea021ca..ef90eac4facc 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -6,29 +6,12 @@
 # has multiple compilation issue, resolved for 1.1.8, bug #602990
 =app-misc/pax-utils-1.1.7
 
-# Fabian Groffen <grobian@gentoo.org> (10 Sep 2016)
-# revbump for adding libcxx dependency, which we already have, so avoid
-# the hassle
-=sys-devel/llvm-3.8.1-r2
-
 # Fabian Groffen <grobian@gentoo.org> (31 May 2015)
 # fails to compile due to some missing compilerrt stuff, hints at asan,
 # not sure what the problem actually is, 3.7 and 3.8 compile just fine
 =sys-devel/llvm-3.6*
 =sys-devel/clang-3.6*
 
-# Fabian Groffen <grobian@gentoo.org> (08 Feb 2015)
-# missing faccesstat (missing gnulib), bug #538502
-=sys-devel/patch-2.7.4
-
-# Fabian Groffen <grobian@gentoo.org> (19 Oct 2014)
-# Fails during bootstrap, has install_name problems for libstdbuf
-=sys-apps/coreutils-8.23
-
-# Fabian Groffen <grobian@gentoo.org> (12 Aug 2014)
-# Needs some patching, bug #513428
-~dev-libs/libffi-3.1
-
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Darwin systems
 sys-apps/util-linux
@@ -55,14 +38,6 @@ sys-apps/pciutils
 # preferred
 media-libs/mesa
 
-
-# Fabian Groffen <grobian@gentoo.org> (27 Oct 2009)
-# Fails compiling due to some missing dwarf symbols and internal
-# segfaults
-~sys-devel/gcc-4.4.2
-~sys-devel/gcc-4.4.3
-~sys-devel/gcc-4.4.4
-
 # Elias Pipping <pipping@gentoo.org> (09 Oct 2007)
 # darwin-miscutils are only available on darwin
 -sys-apps/darwin-miscutils
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index 8ba77145d248..deba9cf25949 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -23,7 +23,6 @@ clvm
 directfb
 djbfft
 fbcon
-fmod
 ggi
 gpm
 hardened
diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask
index 672a528372d9..f937794bef2e 100644
--- a/profiles/prefix/mint/use.mask
+++ b/profiles/prefix/mint/use.mask
@@ -16,7 +16,6 @@ clvm
 directfb
 djbfft
 fbcon
-fmod
 ggi
 gpm
 hardened
diff --git a/profiles/prefix/sunos/solaris/arch/sparc/make.defaults b/profiles/prefix/sunos/solaris/arch/sparc/make.defaults
index 552a0bfb3103..92d16c9bef5c 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc/make.defaults
+++ b/profiles/prefix/sunos/solaris/arch/sparc/make.defaults
@@ -1,11 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE_EXPAND="ABI_SPARC"
-
 # multilib build stuff, single ABI (no multilib)
 MULTILIB_ABIS="sparc32"
 DEFAULT_ABI="sparc32"
 ABI="sparc32"
-IUSE_IMPLICIT="abi_sparc_32"
 LIBDIR_sparc32="lib"
diff --git a/profiles/prefix/sunos/solaris/arch/sparc/use.force b/profiles/prefix/sunos/solaris/arch/sparc/use.force
index 50cdf1705691..4592c02daad9 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc/use.force
+++ b/profiles/prefix/sunos/solaris/arch/sparc/use.force
@@ -3,4 +3,3 @@
 
 # Force the flag corresponding to the default ABI
 sparc-solaris
-abi_sparc_32
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 24de66646f72..5e9d14563ad5 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -6,10 +6,6 @@
 # has multiple compilation issue, resolved for 1.1.8, bug #602990
 =app-misc/pax-utils-1.1.7
 
-# Fabian Groffen <grobian@gentoo.org> (13 Jun 2015)
-# Needs patching to compile (d_type and DT_REG), bug #551696
-=app-portage/portage-utils-0.56
-
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Solaris systems
 sys-apps/util-linux
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 9d6ae2553211..940968ee8e62 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -16,7 +16,6 @@ clvm
 directfb
 djbfft
 fbcon
-fmod
 ggi
 gpm
 hardened
diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 92beb403eb7f..3b9f839a32c0 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Michael Haubenwallner <haubi@gentoo.org> (15 Mar 2017)
-# Cygwin breakage in 0.16 should be fixed in 0.17
-~net-dns/libidn2-0.16
-
 # Michael Haubenwallner <haubi@gentoo.org> (20 May 2016)
 # Does not work with Cygwin.
 sys-apps/man-db
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index eb0c49f36f14..5bdf2c04fd49 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -26,7 +26,6 @@ dvdr
 # emacs USE flag is masked because of missing implementation for unexec()
 emacs
 fbcon
-fmod
 ggi
 glut
 gpm
@@ -35,7 +34,6 @@ hardened
 hddtemp
 ibm
 ieee1394
-ifc
 ipod
 ipv6
 lm_sensors
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index 6c372bfc6497..88172149732b 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -1,12 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
-# This version of blender uses only old cuda which is
-# masked in the 17.0 profiles.
-# The opensubdiv USE requires cuda making it an impossible combination
-=media-gfx/blender-2.78a-r1 cuda opensubdiv
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
 # Unmask default-PIE on 17.0 profiles.
 sys-devel/gcc -pie
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index d9fe0c9cd48d..1135ab6e42b7 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -26,14 +26,10 @@ app-emulation/wine -gstreamer
 # gnome-extra/hamster-applet-2.32 and x11-misc/alacarte-0.13
 dev-lang/python sqlite
 
-# REQUIRED_USE="?? ( pulseaudio gstreamer )", and we want pulse in gnome
-net-misc/spice-gtk -gstreamer
-
 # Required by app-accessibility/orca-3
 app-accessibility/speech-dispatcher python
 
 # gtk3 input method plugins required for gnome3; gnome-shell wants ibus[dconf]
-app-i18n/ibus gtk3
 app-i18n/uim gtk3
 
 # Pulled in by grilo-plugins which is needed for gnome-music
@@ -43,7 +39,7 @@ media-libs/grilo playlist
 media-libs/harfbuzz icu
 
 # Pulled in by tracker and grilo-plugins, has REQUIRED_USE="?? ( gtk qt4 qt5 )"
-media-libs/libmediaart gtk -qt4 -qt5
+media-libs/libmediaart gtk -qt5
 
 # Pulled in by net-im/telepathy-connection-managers[msn] (via dev-python/papyon
 # and net-voip/telepathy-butterfly)
@@ -68,4 +64,4 @@ x11-base/xorg-server kdrive
 # Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
 # Set reasonable default toolkit for gnome users to prevent emerge error
 # when USE=tools
-x11-drivers/nvidia-drivers -gtk2 gtk3
+x11-drivers/nvidia-drivers gtk3
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 19314fdf843c..6e9c07dcad03 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -62,11 +62,6 @@ media-video/mpv lua luajit -sdl
 # Needed by x11-misc/xdg-utils.
 app-text/xmlto text
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
-# Set reasonable default toolkit for all desktops to prevent emerge error
-# when USE=tools
-x11-drivers/nvidia-drivers gtk2
-
 # Ben de Groot <yngwin@gentoo.org> (18 Feb 2015)
 # Enable sensible defaults for desktop users (bug #540046)
 dev-python/PyQt5 gui network printsupport widgets
@@ -93,7 +88,7 @@ media-libs/libpng apng
 # gudev, required by freedesktop.org udev helpers like udisks and upower
 # introspection, exception, enabled from here instead of ebuild to skip extra deps for a system package
 dev-libs/libgudev introspection
-sys-fs/eudev gudev introspection
+sys-fs/eudev introspection
 sys-fs/udev gudev introspection
 virtual/libgudev introspection
 
diff --git a/profiles/targets/systemd/package.use.mask b/profiles/targets/systemd/package.use.mask
index c31a88fb75a9..8904a13bc617 100644
--- a/profiles/targets/systemd/package.use.mask
+++ b/profiles/targets/systemd/package.use.mask
@@ -12,9 +12,7 @@ dev-libs/libusb static-libs
 # Pacho Ramos <pacho@gentoo.org> (29 May 2014)
 # upower support is not needed on setups running systemd, also
 # relies on old upower (#508920)
-# Add telepathy-mission-control because of the same logic.
 >=mate-base/mate-session-manager-1.8.1-r1 upower
->=net-im/telepathy-mission-control-5.16.2 upower
 
 # 'static-libs' support on sys-apps/systemd is not provided
 virtual/libgudev static-libs
diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
deleted file mode 100644
index 65320c3ffae0..000000000000
--- a/profiles/updates/1Q-2012
+++ /dev/null
@@ -1,17 +0,0 @@
-move x11-misc/synergy-plus x11-misc/synergy
-move media-sound/minitunes media-sound/musique
-move dev-perl/sdl-perl dev-perl/SDL
-move net-libs/telepathy-qt4 net-libs/telepathy-qt
-slotmove =dev-libs/libmowgli-2.0.0_alpha1 0 2
-move media-tv/linuxtv-dvb-headers virtual/linuxtv-dvb-headers
-move app-shells/prll sys-process/prll
-move net-wireless/wispy-tools net-wireless/spectools
-slotmove dev-ruby/syslogger 3 0
-slotmove <gnome-extra/nautilus-actions-3.2.2 0 2
-move dev-php/php-tokenstream dev-php/PHP_TokenStream
-move dev-php/php-texttemplate dev-php/Text_Template
-move dev-php/file-iterator dev-php/File_Iterator
-move dev-php/php-timer dev-php/PHP_Timer
-move dev-php/php-codecoverage dev-php/PHP_CodeCoverage
-move dev-php/yaml dev-php/YAML
-slotmove media-sound/frescobaldi 4 0
diff --git a/profiles/updates/2Q-2012 b/profiles/updates/2Q-2012
deleted file mode 100644
index 9334e9902b61..000000000000
--- a/profiles/updates/2Q-2012
+++ /dev/null
@@ -1,23 +0,0 @@
-move xfce-extra/xfce4-appfinder xfce-base/xfce4-appfinder
-move dev-lisp/cl-asdf dev-lisp/asdf
-move dev-lisp/cl-asdf-binary-locations dev-lisp/asdf-binary-locations
-slotmove media-libs/libharu 2 0
-move sys-fs/bleachbit sys-apps/bleachbit
-move sys-fabric/openib sys-fabric/ofed
-move app-text/djview4 app-text/djview
-move app-text/focuswriter app-editors/focuswriter
-move app-office/languagetool app-officeext/languagetool
-move dev-vcs/cola dev-vcs/git-cola
-move app-portage/eclean-kernel app-admin/eclean-kernel
-move kde-misc/kcm-gtk-config kde-plasma/kde-gtk-config
-move x11-misc/see x11-misc/seetxt
-move dev-python/Whoosh dev-python/whoosh
-move dev-texlive/texlive-latex3 dev-texlive/texlive-latexrecommended
-move net-libs/axTLS net-libs/axtls
-move x11-misc/tudor-volumed media-sound/tudor-volumed
-move media-video/leechcraft-lmp app-leechcraft/lc-lmp
-move x11-themes/gtk-engines-nimbus x11-themes/nimbus
-move media-gfx/iscan-plugin-gt-s80 media-gfx/esci-interpreter-gt-s80
-move x11-libs/libPropList x11-libs/libproplist
-move dev-perl/Text-ParseWords perl-core/Text-ParseWords
-move net-fs/leechcraft-vrooby app-leechcraft/lc-vrooby
diff --git a/profiles/updates/3Q-2012 b/profiles/updates/3Q-2012
deleted file mode 100644
index b575f343a449..000000000000
--- a/profiles/updates/3Q-2012
+++ /dev/null
@@ -1,33 +0,0 @@
-slotmove media-gfx/blender 2.60 0
-move net-voip/telepathy-sofiasip net-voip/telepathy-rakia
-slotmove kde-misc/kanyremote 0 4
-move app-i18n/ibus-mozc app-i18n/mozc
-move sys-auth/nss-ldapd sys-auth/nss-pam-ldapd
-move sys-apps/seabios sys-firmware/seabios
-move sys-apps/sgabios sys-firmware/sgabios
-move sys-apps/vgabios sys-firmware/vgabios
-move net-wireless/iwl1000-ucode sys-firmware/iwl1000-ucode
-move kde-misc/kdocker x11-misc/kdocker
-move net-misc/ferm net-firewall/ferm
-move sys-apps/whdd sys-block/whdd
-move dev-ruby/ruby-liquid dev-ruby/liquid
-move dev-ruby/sexp-processor dev-ruby/sexp_processor
-move dev-ruby/sqlite3-ruby dev-ruby/sqlite3
-move dev-ruby/ruby-activeldap dev-ruby/activeldap
-move dev-ruby/ruby-fcgi dev-ruby/fcgi
-move dev-ruby/ruby-ferret dev-ruby/ferret
-move net-wireless/iwl6005-ucode sys-firmware/iwl6005-ucode
-move net-wireless/iwl6030-ucode sys-firmware/iwl6030-ucode
-move net-wireless/iwl6050-ucode sys-firmware/iwl6050-ucode
-move net-analyzer/nagios-nsca net-analyzer/nsca
-move net-analyzer/nagios-nrpe net-analyzer/nrpe
-move app-arch/TheUnarchiver app-arch/unar
-slotmove =media-libs/gst-plugins-bad-0.10* 0 0.10
-slotmove <media-libs/grilo-0.2 0 0.1
-slotmove <media-plugins/grilo-plugins-0.2 0 0.1
-slotmove app-doc/pms 2 0
-slotmove app-doc/pms 3 0
-slotmove app-doc/pms 4 0
-slotmove app-doc/pms 5 0
-move app-misc/lolcat games-misc/lolcat
-slotmove =dev-ruby/trollop-2.0 0 2
diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012
deleted file mode 100644
index 63cf399b459c..000000000000
--- a/profiles/updates/4Q-2012
+++ /dev/null
@@ -1,55 +0,0 @@
-move sci-geosciences/gpxviewer sci-geosciences/gpx-viewer
-move app-text/yudit app-editors/yudit
-move app-emulation/qemu-kvm app-emulation/qemu
-move media-libs/libmediawiki net-libs/libmediawiki
-move media-fonts/source-sans-pro media-fonts/source-pro
-move media-fonts/source-code-pro media-fonts/source-pro
-move x11-libs/openmotif x11-libs/motif
-move app-doc/openmotif-manual app-doc/motif-reference-manual
-slotmove dev-libs/boost 1.36 0
-slotmove dev-libs/boost 1.37 0
-slotmove dev-libs/boost 1.38 0
-slotmove dev-libs/boost 1.39 0
-slotmove dev-libs/boost 1.40 0
-slotmove dev-libs/boost 1.41 0
-slotmove dev-libs/boost 1.42 0
-slotmove dev-libs/boost 1.43 0
-slotmove dev-libs/boost 1.44 0
-slotmove dev-libs/boost 1.45 0
-slotmove dev-libs/boost 1.46 0
-slotmove dev-libs/boost 1.47 0
-slotmove dev-libs/boost 1.48 0
-slotmove dev-libs/boost 1.49 0
-slotmove dev-libs/boost 1.50 0
-slotmove dev-libs/boost 1.51 0
-slotmove dev-util/boost-build 1.36 0
-slotmove dev-util/boost-build 1.37 0
-slotmove dev-util/boost-build 1.38 0
-slotmove dev-util/boost-build 1.39 0
-slotmove dev-util/boost-build 1.40 0
-slotmove dev-util/boost-build 1.41 0
-slotmove dev-util/boost-build 1.42 0
-slotmove dev-util/boost-build 1.43 0
-slotmove dev-util/boost-build 1.44 0
-slotmove dev-util/boost-build 1.45 0
-slotmove dev-util/boost-build 1.46 0
-slotmove dev-util/boost-build 1.47 0
-slotmove dev-util/boost-build 1.48 0
-slotmove dev-util/boost-build 1.49 0
-slotmove dev-util/boost-build 1.50 0
-slotmove dev-util/boost-build 1.51 0
-move sci-chemistry/mmtk sci-libs/mmtk
-move app-office/texmakerx app-office/texstudio
-slotmove =media-libs/gst-rtsp-server-0.10* 0 0.10
-move games-board/jrisk games-board/domination
-move x11-libs/elementary media-libs/elementary
-move x11-misc/pnmixer media-sound/pnmixer
-move app-portage/pyGPG dev-python/pyGPG
-move x11-libs/vdpau-video x11-libs/libva-vdpau-driver
-slotmove <net-libs/farstream-0.1.90 0 0.1
-move dev-ruby/ruby-bsearch dev-ruby/bsearch
-move net-misc/ptunnel net-proxy/pingtunnel
-move media-sound/leechcraft-lemon app-leechcraft/lc-lemon
-move dev-haskell/hsql-sqlite dev-haskell/hsql-sqlite3
-slotmove dev-ruby/builder 3.1.4 3.1
-move x11-terms/terminal x11-terms/xfce4-terminal
diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
index a9311ede2183..b319f5b973c5 100644
--- a/profiles/updates/4Q-2017
+++ b/profiles/updates/4Q-2017
@@ -4,3 +4,4 @@ move dev-perl/MARC-XML dev-perl/MARC-File-XML
 move dev-perl/MARC-file-XML dev-perl/MARC-File-XML
 move dev-util/gogland dev-util/goland
 move app-crypt/zuluCrypt app-crypt/zulucrypt
+move dev-perl/RadiusPerl dev-perl/Authen-Radius
diff --git a/profiles/use.desc b/profiles/use.desc
index 91ae1ac5d496..40c9747f2b5d 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -165,7 +165,6 @@ jpeg - Add JPEG image support
 jpeg2k - Support for JPEG 2000, a wavelet-based image compression format
 kde - Add support for KDE (K Desktop Environment)
 kerberos - Add kerberos support
-kontact - Enable support for the KDE personal information manager (kde-apps/kdepim*)
 ladspa - Enable the ability to support ladspa plugins
 lame - Prefer using LAME libraries for MP3 encoding support
 lapack - Add support for the virtual/lapack numerical library
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index dcac634746b1..26e3eb1737b7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1113,6 +1113,7 @@ app-text/blogc:git - Build blogc-git-receiver tool
 app-text/blogc:httpd - Build blogc-runserver tool
 app-text/blogc:make - Build blogc-make tool
 app-text/cb2bib:webengine - Use dev-qt/qtwebengine instead of dev-qt/qtwebkit
+app-text/coolreader:wxwidgets - Use x11-libs/wxGTK instead of Qt5
 app-text/crm114:mew - Add support for using the mewdecode mime decoder (app-emacs/mew)
 app-text/crm114:mimencode - Add support for using the mimencode mime (net-mail/metamail)
 app-text/crm114:normalizemime - Add support for using the normalizemime (mail-filter/normalizemime)
@@ -5168,6 +5169,11 @@ media-video/vlc:x265 - Support X265 Encoder.
 media-video/vlc:xcb - Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678.
 media-video/vlc:zeroconf - Enables support for zero-configuration networking via avahi.
 media-video/vlc:zvbi - Enables support for teletext subtitles via the zvbi library.
+media-video/webcamoid:headers - Install development headers
+media-video/webcamoid:libuvc - Build with libuvc support
+media-video/webcamoid:qtaudio - Enable audio capture/play via dev-qt/qtmultimedia
+media-video/webcamoid:v4lutils - Build with V4L-utils support
+media-video/webcamoid:videoeffects - Build video effects
 media-video/x264-encoder:10bit - Set output bit depth to 10
 media-video/x264-encoder:avs - enable AvxSynth support in the AviSynth input module
 media-video/x264-encoder:ffmpegsource - Enable ffmpegsource aka ffms support, disables lavf
@@ -5961,6 +5967,8 @@ net-libs/iax:snomhack - Use slower memset for SNOM phoneem
 net-libs/ldns:dane - Enable DNS-based Authentication of Named Entities (DANE) support
 net-libs/ldns:ecdsa - Enable ECDSA support
 net-libs/ldns:gost - Enable GOST support
+net-libs/libbitcoinconsensus:asm - Enable assembly for optimization
+net-libs/libbitcoinconsensus:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
 net-libs/libbtbb:extras - Install pcapdump and btaptap tools
 net-libs/libbtbb:pcap - Add support for network packet capture via net-libs/libpcap
 net-libs/libbtbb:wireshark-plugins - Build the wireshark plugins for bluetooth baseband sniffing
@@ -6689,6 +6697,8 @@ net-p2p/amule:remote - Enable remote controlling of the client
 net-p2p/amule:stats - Enable statistic reporting
 net-p2p/bitcoin-cli:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
 net-p2p/bitcoin-cli:ljr - Enable Luke Dashjr's patches
+net-p2p/bitcoin-qt:asm - Enable assembly for optimization
+net-p2p/bitcoin-qt:bip70 - Enable support for the BIP70 payment protocol
 net-p2p/bitcoin-qt:bitcoin_policy_rbf - Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order
 net-p2p/bitcoin-qt:bitcoin_policy_spamfilter - Enhanced spam filter policy: Notorious spammers will not be assisted by your node
 net-p2p/bitcoin-qt:http - Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)
@@ -6700,6 +6710,7 @@ net-p2p/bitcoin-qt:tor - Enable automatic configuration of a Tor hidden service
 net-p2p/bitcoin-qt:upnp - Enable Universal Plug and Play
 net-p2p/bitcoin-qt:wallet - Enable wallet support
 net-p2p/bitcoin-qt:zeromq - Report blocks and transactions via zeromq
+net-p2p/bitcoind:asm - Enable assembly for optimization
 net-p2p/bitcoind:bitcoin_policy_rbf - Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order
 net-p2p/bitcoind:bitcoin_policy_spamfilter - Enhanced spam filter policy: Notorious spammers will not be assisted by your node
 net-p2p/bitcoind:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 86f87f03c3b5..c66c6f55c23a 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 0b1437c19d14..1051ed59a63c 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -3,7 +3,7 @@ DIST gromacs-2016.2.tar.gz 27339623 BLAKE2B c3548f4abdc4c1b09a79a3da99d7ca8060da
 DIST gromacs-2016.3.tar.gz 27342692 BLAKE2B 3bea357cb672f41dda68c0d4291c06e2ab8bbc91629e25c9e56741223911be7994be10b2427fb1ca1cd41e511d23323851ba3211ee8590f152e23a64b2253095 SHA512 16593df0a52620766fb86cfeb16328793503f860cb07cdbbd503ba7f41e6430efb4848389b7179ca3907b57311162666d05224b454e1afb1b74b220f38498d86
 DIST gromacs-2016.4.tar.gz 27368706 BLAKE2B 2a176812fe2a097d72c7148ff5ed4ed7209279cf439af6a969c3aba81157c59a4d9af34d19c7b1da088b0a4ab981b489b84446afbcaf64b20724bda1dc3560ff SHA512 69661d2a7a8a5259be277de35e2baa4b688d1f7bef225fc7d733a9b00c6ee135dcbad517c7c9f751121647c2fbd085f2c9cdf22dbd941c7ebc5d3b09e7e08f1f
 DIST gromacs-2016.tar.gz 27321561 BLAKE2B cdcf0aa5ac36981e736fd2ecc2f641e99f40146d829c88e5ff973c7b7c3c1ab920f7822c336e9eea87a8605362e723d7477dd07f9154c8a38476a3f6c391d6aa SHA512 756771baaa85a1d16e7d5b8e4c96bbd1c04c7acdc536a253886cff186316330f06d60d206a0159efb15f47f161c779d3757dc5dbceab8c097241c1382d376201
-DIST gromacs-2018-beta2.tar.gz 29867327 BLAKE2B 6cf2e0c8889e0db7cc1d261cab7176481cf8ac9d79fb0cd0defb4c5f9474b91d694b9d4c6ef556dd7bf8505259bab1c1efca0a4bbdb7338a243383306da2c0a6 SHA512 a276de608e123aa350f9d5c2884e40edaed29541946dddc305b0a94cedf3301185f3ab916d579a043478bb18c54d357d439cd79151c78176373ddeb3665f873e
+DIST gromacs-2018-rc1.tar.gz 29863602 BLAKE2B 1b8146198aef435d74c57b5a6e42b8107416896fed71444830baf4368604c1b35326a77815c5125e1610a9765cf1d5d51d3a69a04d3679f7c1f3618598258c0a SHA512 f2a56a2d3ce6efd170f22d66dbb9418ae59257aff27853037570d0939582df947c7558aa652626dd911ee22c037ab0cb1b340b5008bc8f40d27d90883100d375
 DIST gromacs-5.0.4.tar.gz 26342095 BLAKE2B 27a2483e23533ad627114c0005fa0d49a311b359c31aed6378bdd768c9dda03c3b19f11d961f0bd3b82a1711737d4b7dce13cad5fc56d058dd0110fe21421ee3 SHA512 bc62b623bf71dcaa948aaf7563a3d3afa973da0702062848a20323db202e862dcee413197dacd1472866ccb40fce7709e283177b1c6c49514064f23e6c46b5ee
 DIST gromacs-5.1.3.tar.gz 27095702 BLAKE2B b7fd8fa10e8c4f4368ac551338c59374dc35f85c9fdae5d64eec62929b8f04ea724a084959b3618cd8a151bf3e0a0c84c8f75de953722effca82a4928941ce73 SHA512 9ab26e1b2268f8d567b89b2d99d0b75b937b28edceaec56d17ca3243c76faa31255ffc0c45d762c7c693fe500b00e36ad43b80572d1d7f92dc87f9d2d98c0ba6
 DIST regressiontests-2016.1.tar.gz 67094518 BLAKE2B 3ae0132e246f2abcf77495bff69adb32bfe98063a824cc408279fb43022ca5e8e07afaee08f3a255657b8cdfd21ba2ff4cc428c2c3d21958ba5149ce745d436c SHA512 fc01c802d81400373a147171881f3b7b9309402e8ffb08287ba393aefbb701ba93bbe0b9549ff6fa264a8befbba445c2d2c7450633063a724f78ec8ca81ae8c9
@@ -11,7 +11,7 @@ DIST regressiontests-2016.2.tar.gz 67095329 BLAKE2B fec8a663845ad67374c8a230d159
 DIST regressiontests-2016.3.tar.gz 67093968 BLAKE2B a644bbd2a0398c1d84f61809a9f4f1cb89d307b0e9952f414e28d18464799e5f49fe810e342768a7b15f1d63b10bf1facb148c1d04ad670c613022302f04ea9d SHA512 ee87df9f339954da0e1f1b4c8b8d4deb574f3b73d174010a295a7a0e8bc462ead7691090ea7cf8ac3d984a6cd70f1cd22c3592fa161b2967061ae5ba2796286b
 DIST regressiontests-2016.4.tar.gz 67643648 BLAKE2B 767c3b0ca1002e6ca68fc3346b7164cca3beaa52f9b1c70672b64cf80427cab045e4d924d0b67a4fe4c76e3a1c0a803964e278d2a9b14b87a555f98dd78525d3 SHA512 367438b897a05e1cc0dcd1d3872fb6a0e9ff6b1146e9448d941d6517dce789f0c478d20cf0a4f3565070f132dc88872441aadb8b499f59efa0e1e4a6dd6a7135
 DIST regressiontests-2016.tar.gz 66908712 BLAKE2B 3039b5b46bf99dc2e34a61ed0f47f7355087c260bd1accc119f9ed99bb03c4645d05df41e301cfc6a6de6a9a369b2bf4e01a54852100577e40605e091bbe24e8 SHA512 59902c1973c33ea8f003f21a737dc7cc64da3258112322eedc9834b53628134a6817d5ee5b3950c9bfd97a3a0580aef88ddef0609ef2c58693c96c7575651e01
-DIST regressiontests-2018-beta2.tar.gz 67867984 BLAKE2B d5a68dd30c92d1ccfd08b7074b41771c08e94be9556524bf5c13517711cc74ec945aa8bb167cdc4f954b12ac214f9c24a2935ceed6a92c6ecd2a0d1cc860fb63 SHA512 2dcacf52220972b0eae03da7e917e2e2bc85acc4cc2adcddefbe5d6176d5a5200eb77aeb55df06942fa88078f25f623c7b3c586fde852d6045b9caa0337d802a
+DIST regressiontests-2018-rc1.tar.gz 67866295 BLAKE2B 1936a4a14d3011e426e0f057d803339a8324e10d087d56f93dc7a497250a973c6b19ed2691b4641d12b7f13de01dbe36a9903a4e10e3792b842319e42ad0331a SHA512 feccf48d6af84abf350e5ad829c600f86b8e8e4f4f3378c34b209daa30965e3f68751058f12bdbb228da6b4ccd0a72c8191956ec5bd184f190000a9c97e581a9
 DIST regressiontests-5.0.4.tar.gz 65193251 BLAKE2B c5e5f23adcc2639fe652bc252533307c7fda44453d506603242968bd8588c7394028b2c3c7a9252f807a050d40e8f78735e904dfe517d3db8ae962051f4826c1 SHA512 747725fa28c1c9525596bdeeb8809e45268e19036c11dac67d043aa1c51748688ca37eb6014eb7e819eb927a8b9ca2631d0ace4cdff8ed491b08c316c530ab65
 DIST regressiontests-5.1.3.tar.gz 66994083 BLAKE2B 7009f65ad0138664ac84e57f8bc7cce5d18a59f99943e56b6642583120bfce279e005ac0bacd2db8904ea477a48e2b938c64de46a65fa5d08fce6009d53583c3 SHA512 486e86eb3b75bae822abe82dac4e1098aa13723bd04214021f835a2f0b847303f015a9ececc33aa5ae63d31a2eeae07e512f22464b6c0e26d1286b0781578022
 EBUILD gromacs-2016.1.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
@@ -21,7 +21,7 @@ EBUILD gromacs-2016.4.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb
 EBUILD gromacs-2016.9999.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
 EBUILD gromacs-2016.ebuild 7968 BLAKE2B c0ba44661dce5ccda3c2378fad57e88ca90d15cb1914d6214ee4559e8ebd6c6c700624b32abf168a4a653cc5794fac9fab71024a9b7bc5464d404d768ac74ef1 SHA512 3ca5d4ae9b01a106b279bc828e42366a017b9517a450b773b944c6d12dce64199e3a80d280e4c475c637c70009a1a0fd1ca74f99b03f08067a10d9e9ad450d8f
 EBUILD gromacs-2018.9999.ebuild 7899 BLAKE2B 8053de4c12e2201d37e8d0a077d33fc0b103b79d73379488c46bc638ba763b55ebf69ae53180ffd850e4b860fc03a1c3ec57049f1b257e04e0322ed482afcd51 SHA512 734710474160c6a55206b332e5370bd9e2d0092aed19c4c1ccab7f5d9567eac2a47d163a50aa607f8c7e8e2ccc6eadeb9b394e9f638ac85eafe5f74ced68fd02
-EBUILD gromacs-2018_beta2.ebuild 7899 BLAKE2B 8053de4c12e2201d37e8d0a077d33fc0b103b79d73379488c46bc638ba763b55ebf69ae53180ffd850e4b860fc03a1c3ec57049f1b257e04e0322ed482afcd51 SHA512 734710474160c6a55206b332e5370bd9e2d0092aed19c4c1ccab7f5d9567eac2a47d163a50aa607f8c7e8e2ccc6eadeb9b394e9f638ac85eafe5f74ced68fd02
+EBUILD gromacs-2018_rc1.ebuild 7899 BLAKE2B 8053de4c12e2201d37e8d0a077d33fc0b103b79d73379488c46bc638ba763b55ebf69ae53180ffd850e4b860fc03a1c3ec57049f1b257e04e0322ed482afcd51 SHA512 734710474160c6a55206b332e5370bd9e2d0092aed19c4c1ccab7f5d9567eac2a47d163a50aa607f8c7e8e2ccc6eadeb9b394e9f638ac85eafe5f74ced68fd02
 EBUILD gromacs-4.6.9999.ebuild 8110 BLAKE2B dd8ac9cbc4abfcc75a3a188c59cdbe5111f363404ff5a787f64b05d4bd411deebb50f172f09963800ed87997788b2e678617805e65a523bed19aa6ef18fe2b96 SHA512 2206e257f0b29b6f3a90c5d7739079b9add3e04f2a3acbd58c814811b389b5d51b3594815a94529d1de43deb380504029c302d18fc16d63a81c92727254e863e
 EBUILD gromacs-5.0.4.ebuild 8429 BLAKE2B c06c423365fa79befd5a4f0b6314e77b96d983c84df776ce84fddc79d35ce735d856d1184e5913af0c8cd3a0c4e9087110af9bd4402e2bce1f014e64a8a585a7 SHA512 d1e91cc25c5f90bd0fbad15060cae9c8bf1235ca45a2b72521b3a4f5f091bdd7d32ec2e6ff2bb22cd3fe165092f11a24ea148ae8000b8517f0b8671f6c2af6f2
 EBUILD gromacs-5.0.9999.ebuild 8439 BLAKE2B 33d51254e62593a58c636bd902f43edc553ad11af306d1d022278b223eda15b0772097f26565df74a1118bd5b144e5b93aac09cdb995123ccbae2856889c31b2 SHA512 6756116cdeae9c21b094f74ea1b1d9f41617467dc736878cdcff27fed9f53b338830a608e23e87238d0756884799fbc5d62f02685774ea86c239ecc3e8804814
diff --git a/sci-chemistry/gromacs/gromacs-2018_beta2.ebuild b/sci-chemistry/gromacs/gromacs-2018_rc1.ebuild
index 315835fdc606..315835fdc606 100644
--- a/sci-chemistry/gromacs/gromacs-2018_beta2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018_rc1.ebuild
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index deb2234f6b90..9b7a6abe2027 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 258b2a831f79..8836dd8f036b 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -2,22 +2,15 @@ AUX 50maxima-gentoo-1.el 538 BLAKE2B 0c0810f90f3a64f5e576b9e3480032ad7aa52ede02b
 AUX clisp-1.patch 1194 BLAKE2B b64764d80b5908a35081b9bb7114e18de266156cb80bae1c764af8c74594a5238e916ed34c547c3053804d68840f2106278dfc83c61445ee9ab9361539315ddc SHA512 05febcd92f6e9d667a8bc8c5c2bf7f02a1585cf5cff8add669716b6fc014ca603ee5bd72e2824db2b8d20cf3f7c9e5cc981c7bce7091c8f5f7ec002a20de40d3
 AUX clozurecl-2.patch 1505 BLAKE2B c5550f79e67dd007c970759c5e734009d1cb4fa0af728d414ce271175770ed32bd2cf5e58c9738e32afa76b0053b2eee77c886650b0ba99c7e0e3176bc946d69 SHA512 41664b77eae0f2c3cc0e551bd2c26c02769faed339b5725dc790691929094cd5d5008169eba9788515392d9fed00919aaacbb24ee91b76f5d51eb6468335cf9c
 AUX cmucl-1.patch 1336 BLAKE2B 59767907f9f2734fa43e8d9c0e876cf2bf1f2cb0e360976ddd08b4eda9685cd1b862aa072a2f0202733db5ab91958bf0d6b48af3d20e6748f4de2e6b366f49ed SHA512 3b8c01ecbbcd87101e4e31356293216d9c2a018ddabc076905a8b87eeda27bea6cd36242ab6b9caf7553fb9187544beb620b739211c63e21afa1b2f050ef318e
-AUX db-0.patch 529 BLAKE2B 2bf919661bc5fa9c7375220cf433a6cb8d8bddd0c37e532df8b2be7931ccbf70a59fdab1207489aa26a093d7c770d0e26558a3875c93a5122123e0cf972b67ed SHA512 c3a196c2192be23c7551c1b4dd893c8304926318234ef06cf438c24f425f7fc93d8ebed4a9b4708852bb2e8ca7284afa03dfe53548cec8ebd6ba89e73a901cfa
 AUX ecls-2.patch 1612 BLAKE2B 1f06a895ed09844e8d42f462e4541a49de46762a3e9189073a7624785937da2b5ec0e5c54e230652f80bc47a359793c1ed25209061787c3e2b0da76025bdbc86 SHA512 cd37e62c24f24e49f264d63526615537cb088386cfc48f3eac8fcc746d16f6d79c585dee6f24c664fca355f539728a1a23cc75f3672c240a210a407e87b73141
 AUX emacs-0.patch 807 BLAKE2B 82c879f9c252c4efefb007f8553e845ddc52d76af5cbeab740a1f2bde459b5e87957e0f3e5a9d76d5c1e879ddbebdfb9a6d6b80745cc40e3ddc4379887f4e9b2 SHA512 f62d364651838ed196a2e8965930b42313cb73f912b898b953b526ffc5dc0135841b53618fbbb6a32d21d3412ba5f2bfb253bf41c640a136f68d830f43628ac4
 AUX rmaxima-0.patch 552 BLAKE2B 8b8ceb5ea671049490ab006be31f6e81f85d9e43950296db920b3a0d4eb8b19cd14b8b599c98e1dc82f69d441d04c631c4aec2315eaee68f791ddce75dc7ed56 SHA512 a60c8c5ac23b0342823fbcd15e27f44ea85652640271ea845e383796422fa416b221dd036eb0a1639f70f9b09473471657612c7a5f99892cfb214d52156a6907
-AUX sbcl-1.patch 1412 BLAKE2B 9b2eb7245bcaebbd16bf160795970f23c743b94c9e1876ed841a4482603d842b1ed02d841b39396eed8a8fd0c5f3a970b4303a981990d4e975e9db4c808f5682 SHA512 a75d05de3e80e255b36180469a6c51a200b287e8c11aaeb09916a6c8e7b6a16abf41d78a66a51325ca5ca4129c12121ceedd1ae87a89f5adc0666b2094cf2f14
 AUX sbcl-2.patch 1072 BLAKE2B 3e16339b7b9acbbfcd424780432be4a4267b994c3a7a8774c95ff8335d48565d15dae3cba16b127a9184e4fe20b5d6930df2e385c2a15b9f58e2d0fa597665a1 SHA512 b8df0b53f4ae04e175dfab8889206ea8ffa83c51b2408322423d5f52cf956b1084e7d1ba0c054032f9121cb1684fcc6bb9d48b1a967f9e01492ad25c035b1c62
 AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f93b949a05de9226d19d7898daf998cbedc61a77556c923f3f6f8e57508b73f3cae117f62d214d SHA512 110db85899241e1f9ea8427ffb397737aefe0bb6286d037c2c04cfad9726838521ef6403242aeb1e4246d06f13cf83af84bba38567a99b00ed6a081f17b38ead
 AUX xdg-utils-0.patch 1090 BLAKE2B 7a342a9e0bfd5b3aae1e3f8c45046c4fcaffea277cb68193e92fce4b23e03a0430ae095891183497e5deb969f1ba5e68f2423a9576c7465b137300bc2b096803 SHA512 31b121a2d6f1c24e5f2fa3e6129f661a891660665bf45a2907146e3bae9309d185f83d7001287df92a73aff81562a7011ad6b92e03516883bc0ae0730570fa38
-DIST maxima-5.37.3.tar.gz 29964644 BLAKE2B 8f98de6cd331fe6306298f962da953c3dd90a4d44f2ab062117eff42f1d63a82db92232d14fe48997241acc34cb9d7af2e997e8df215a49ba1df75702f650f92 SHA512 a337afdc779abc88297e7dadf8af949da881c91a237e85ed654046c98692f2446c0b2ddb8c81b637cb7a35dd3b712832aadc5dedcaa8b681496dae4835c9d0f1
 DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
-DIST maxima-5.39.0.tar.gz 38652090 BLAKE2B 13642beb12e5ca5d3284abc0f7a7a0f00913e22b224f5f6fbca24a75445371fb46131ad32c48e539143524b79a32cda307be94642daf6287a050b99559b18246 SHA512 393ade47fc3832ee44df7bf0c3bd2e501755167ec0f02d50d5876e7cf54fe682f2ebf2511290fa498d174e55961451e61ea5c1c5f6e5f9e6d04ad73d45a5d2a9
-DIST maxima-5.40.0.tar.gz 41668208 BLAKE2B da33cbfb655419cee697dd74861256f4b77b2d52b0a19869010781008d50c6841259db74d95b283e25a9827fc47e340f24c5b0d781f548eae039fdea3d98d310 SHA512 7aa36ae56c289e1cc6bb1722a6ee93fed5bf893747a26bb52a48f93cd02d65b63c453f37dc2c86ab4596ad192150aed9ad6b361ab295eda5207d9633c07cdee6
 DIST maxima-5.41.0.tar.gz 41540226 BLAKE2B ff726044c9026bc58d04832fa6382146ed7e7d61d801fa7131b1e7e2ed386b99e238e039481697f9aa24cea59ffd0f6811675cd28818c9fe53f023f965f9d149 SHA512 1b93ae2db055ba7fb4a95924a896667f0cfa1c675c603c104181662aeb32b10b006158526b2f3ad93a59688a23eacdc82e870bb8ffb182a89e1e51de013ec209
-EBUILD maxima-5.37.3-r4.ebuild 4828 BLAKE2B 5ff727f590a2c490e27e3352e3974980967ae3f522c9a47b39f5e6e2db8288eefad84bb2f043b3065ac1be21364b374a8fadaf3ebd082d407110f2afab1ac379 SHA512 633d63be6891ada0e394415e236355c3a5141472df821f37b92e23e3c7b01f1b18e3fba39d60e94b7289d6c0eeae5f1521fa617bb5a3669ccc0905b486f91ecf
 EBUILD maxima-5.38.1.ebuild 4821 BLAKE2B 276ef7be163424ac82e3829da51df4073616c4ec45fd1002589f0fe5e4f662e27db20729d188539f4cb4ca21d828c475bfb2db3cb6f5350935f6bca207d9be08 SHA512 3003b55bf303482d51462ab9b5332a6cb5e170b9780836666f9af5bd5d0838cca2fe57f26f5c955a5414594184bfd3c90064ee638f086074a40b66a7cf02cc22
-EBUILD maxima-5.39.0.ebuild 4824 BLAKE2B 6b3e62a923ea0ba10e8e3ffaf3fad5db2d5ef1a6e156aa5a870f99f5590b15a34213c153830270875b1cbd83e5c5715cb9582b64cab9db2f3b8c97bb20eb5104 SHA512 c7926f33b56a0d18bf958513282ba8876427acac63d27f374b2eda914e733ea693357a01d7bfa90beb6f15d8f849e60c20a81d3436f9942aa510bbb591a5b999
-EBUILD maxima-5.40.0.ebuild 4824 BLAKE2B 7e010f103f2a185ec286389ef7641344a36857e3247a55347e309e3321a4ca61328a3135738e704ea35ce946cde4a073a43175cf451900d00b7f69f926420d25 SHA512 cb5bd1095eeeab1a6a08da4f3dd7aaf6ffc7721efb6f8dda327b238a5e879c4f3fca898dd85e363a809cb90747b0f3a85dfcbe2de4311a371b4efd81f7e82335
+EBUILD maxima-5.41.0-r1.ebuild 4890 BLAKE2B 5aa2a97dfd4dc72718a544c7de8a058d7a5ed102086b52e51906421cc69182df0252b336a7e4c2469cbe51fb761154088812edb764355859e3718eaa1b574783 SHA512 a2bfb607dfe6faa7098ae880ca4f3b7e3db808ecfa714611947df5d4fe00d7fdc6b9f7477ae9ccd3d83f25ae70c7eeffd0295105b5043ebbaeaa4c7f1bea8ee3
 EBUILD maxima-5.41.0.ebuild 4824 BLAKE2B 7e010f103f2a185ec286389ef7641344a36857e3247a55347e309e3321a4ca61328a3135738e704ea35ce946cde4a073a43175cf451900d00b7f69f926420d25 SHA512 cb5bd1095eeeab1a6a08da4f3dd7aaf6ffc7721efb6f8dda327b238a5e879c4f3fca898dd85e363a809cb90747b0f3a85dfcbe2de4311a371b4efd81f7e82335
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/files/db-0.patch b/sci-mathematics/maxima/files/db-0.patch
deleted file mode 100644
index d6cc18617cc5..000000000000
--- a/sci-mathematics/maxima/files/db-0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -U2 maxima-5.37.1.orig/src/db.lisp maxima-5.37.1/src/db.lisp
---- maxima-5.37.1.orig/src/db.lisp	2015-08-11 01:01:13.000000000 +0600
-+++ maxima-5.37.1/src/db.lisp	2015-09-04 00:21:43.596685564 +0600
-@@ -389,10 +389,14 @@
- 
- (defmfun isp (pat)
--  (let ((isp 'unknown))
-+  (let ((isp 'unknown) #+ccl (err t))
-     (ignore-errors
-       (setq isp
- 	    (cond ((truep pat))
- 		  ((falsep pat) nil)
--		  (t 'unknown))))
-+		  (t 'unknown)))
-+      (setq err nil))
-+    #+ccl
-+    (when err
-+      (setq +labs nil))
-     isp))
- 
diff --git a/sci-mathematics/maxima/files/sbcl-1.patch b/sci-mathematics/maxima/files/sbcl-1.patch
deleted file mode 100644
index 8899f0973708..000000000000
--- a/sci-mathematics/maxima/files/sbcl-1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
---- maxima-5.37.1.orig/src/maxima.in	2015-05-22 04:40:03.000000000 +0600
-+++ maxima-5.37.1/src/maxima.in	2015-09-03 16:22:57.340893630 +0600
-@@ -193,5 +193,5 @@
-   if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
--    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
-+    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$@"
-   else
--    exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$@"
-+    exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$@"
-   fi
-diff -r -U1 maxima-5.37.1.orig/src/server.lisp maxima-5.37.1/src/server.lisp
---- maxima-5.37.1.orig/src/server.lisp	2015-04-10 01:41:59.000000000 +0600
-+++ maxima-5.37.1/src/server.lisp	2015-09-03 16:23:47.100891537 +0600
-@@ -10,3 +10,2 @@
- (eval-when (:compile-toplevel :load-toplevel :execute)
--  #+sbcl (require 'asdf)		    ;not needed here for a recent SBCL
-   #+sbcl (require 'sb-posix)
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild
deleted file mode 100644
index 93b6c5ed9385..000000000000
--- a/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps
-LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=(   .    .     y               .    .         y     )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( .    .     .               ecl  ccl       .     )
-# patch file version; . - no patch
-PATCH_V=(   1    1     .               2    2         1     )
-
-IUSE="emacs tk nls unicode X ${LISPS[*]}"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-RDEPEND="!app-emacs/imaxima
-	X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( virtual/emacs
-		virtual/latex-base
-		app-emacs/auctex
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latexrecommended )"
-
-# generating lisp dependencies
-depends() {
-	local LISP DEP
-	LISP=${LISPS[$1]}
-	DEP="dev-lisp/${LISP}:="
-	if [ "${SUPP_RL[$1]}" = "." ]; then
-		DEP="${DEP} app-misc/rlwrap"
-	fi
-	echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	LISP=${LISPS[${n}]}
-	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-ARM_LISP=2 # gcl
-DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-	local n=${#LISPS[*]}
-
-	for ((n--; n >= 0; n--)); do
-		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
-	done
-
-	if [ -z "${NLISPS}" ]; then
-		use arm && DEF_LISP=${ARM_LISP}
-		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
-		NLISPS=${DEF_LISP}
-	fi
-}
-
-src_prepare() {
-	local n PATCHES v
-	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 db-0 )
-
-	n=${#PATCHES[*]}
-	for ((n--; n >= 0; n--)); do
-		epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
-	done
-
-	n=${#LISPS[*]}
-	for ((n--; n >= 0; n--)); do
-		v=${PATCH_V[${n}]}
-		if [ "${v}" != "." ]; then
-			epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-		fi
-	done
-
-	# bug #343331
-	rm share/Makefile.in || die
-	rm src/Makefile.in || die
-	touch src/*.mk
-	touch src/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local CONFS CONF n lang
-	for n in ${NLISPS}; do
-		CONF=${CONF_FLAG[${n}]}
-		if [ ${CONF} = . ]; then
-			CONF=${LISPS[${n}]}
-		fi
-		CONFS="${CONFS} --enable-${CONF}"
-	done
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
-				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${CONFS} \
-		$(use_with tk wish) \
-		$(use_enable emacs) \
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		pushd interfaces/emacs/emaxima > /dev/null
-		elisp-compile *.el
-		popd > /dev/null
-		pushd interfaces/emacs/imaxima > /dev/null
-		BYTECOMPFLAGS="-L . -L ../emaxima"
-		elisp-compile *.el
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	docompress -x /usr/share/info
-	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
-	if use emacs; then
-		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
-		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-
-		insinto /usr/share/${PN}/${PV}/doc/imaxima
-		doins interfaces/emacs/imaxima/README
-		doins -r interfaces/emacs/imaxima/imath-example
-	fi
-
-	# if we use ecls, build an ecls library for maxima
-	if use ecls; then
-		ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
-		insinto "${ECLLIB#${EPREFIX}}"
-		doins src/binary-ecl/maxima.fas
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.39.0.ebuild b/sci-mathematics/maxima/maxima-5.39.0.ebuild
deleted file mode 100644
index b43477f95708..000000000000
--- a/sci-mathematics/maxima/maxima-5.39.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps
-LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
-# <lisp> supports readline: . - no, y - yes
-SUPP_RL=(   .    .     y               .    .         y     )
-# . - just --enable-<lisp>, <flag> - --enable-<flag>
-CONF_FLAG=( .    .     .               ecl  ccl       .     )
-# patch file version; . - no patch
-PATCH_V=(   2    1     .               2    2         1     )
-
-IUSE="emacs tk nls unicode X ${LISPS[*]}"
-
-# Languages
-LANGS="de es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-# texlive-latexrecommended needed by imaxima for breqn.sty
-RDEPEND="!app-emacs/imaxima
-	X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk:0 ) )
-	emacs? ( virtual/emacs
-		virtual/latex-base
-		app-emacs/auctex
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latexrecommended )"
-
-# generating lisp dependencies
-depends() {
-	local LISP DEP
-	LISP=${LISPS[$1]}
-	DEP="dev-lisp/${LISP}:="
-	if [ "${SUPP_RL[$1]}" = "." ]; then
-		DEP="${DEP} app-misc/rlwrap"
-	fi
-	echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	LISP=${LISPS[${n}]}
-	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-
-# default lisp
-DEF_LISP=0 # sbcl
-ARM_LISP=2 # gcl
-DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-	local n=${#LISPS[*]}
-
-	for ((n--; n >= 0; n--)); do
-		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
-	done
-
-	if [ -z "${NLISPS}" ]; then
-		use arm && DEF_LISP=${ARM_LISP}
-		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
-		NLISPS=${DEF_LISP}
-	fi
-}
-
-src_prepare() {
-	local n PATCHES v
-	PATCHES=( emacs-0 rmaxima-0 wish-2 xdg-utils-0 )
-
-	n=${#PATCHES[*]}
-	for ((n--; n >= 0; n--)); do
-		epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
-	done
-
-	n=${#LISPS[*]}
-	for ((n--; n >= 0; n--)); do
-		v=${PATCH_V[${n}]}
-		if [ "${v}" != "." ]; then
-			epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-		fi
-	done
-
-	# bug #343331
-	rm share/Makefile.in || die
-	rm src/Makefile.in || die
-	touch src/*.mk
-	touch src/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	local CONFS CONF n lang
-	for n in ${NLISPS}; do
-		CONF=${CONF_FLAG[${n}]}
-		if [ ${CONF} = . ]; then
-			CONF=${LISPS[${n}]}
-		fi
-		CONFS="${CONFS} --enable-${CONF}"
-	done
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
-				CONFS="${CONFS} --enable-lang-${lang}"
-				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${CONFS} \
-		$(use_with tk wish) \
-		$(use_enable emacs) \
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		pushd interfaces/emacs/emaxima > /dev/null
-		elisp-compile *.el
-		popd > /dev/null
-		pushd interfaces/emacs/imaxima > /dev/null
-		BYTECOMPFLAGS="-L . -L ../emaxima"
-		elisp-compile *.el
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	docompress -x /usr/share/info
-	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
-
-	if use emacs; then
-		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
-
-		rm "${ED}"/${SITELISP}/${PN}/emaxima.sty || die
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-
-		insinto /usr/share/${PN}/${PV}/doc/imaxima
-		doins interfaces/emacs/imaxima/README
-		doins -r interfaces/emacs/imaxima/imath-example
-	fi
-
-	# if we use ecls, build an ecls library for maxima
-	if use ecls; then
-		ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
-		insinto "${ECLLIB#${EPREFIX}}"
-		doins src/binary-ecl/maxima.fas
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
-
-pkg_postrm() {
-	if use emacs; then
-		elisp-site-regen
-		mktexlsr
-	fi
-}
diff --git a/sci-mathematics/maxima/maxima-5.40.0.ebuild b/sci-mathematics/maxima/maxima-5.41.0-r1.ebuild
index 8bdc377e8486..c9917d44ca01 100644
--- a/sci-mathematics/maxima/maxima-5.40.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.41.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools elisp-common eutils
+inherit autotools elisp-common eutils xdg
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
 HOMEPAGE="http://maxima.sourceforge.net/"
@@ -27,7 +27,7 @@ IUSE="emacs tk nls unicode X ${LISPS[*]}"
 # Languages
 LANGS="de es pt pt_BR"
 for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
+	IUSE="${IUSE} l10n_${lang/_/-}"
 done
 
 # texlive-latexrecommended needed by imaxima for breqn.sty
@@ -131,7 +131,7 @@ src_configure() {
 	# enable existing translated doc
 	if use nls; then
 		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
+			if use "l10n_${lang/_/-}"; then
 				CONFS="${CONFS} --enable-lang-${lang}"
 				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
 			fi
@@ -194,6 +194,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_mimeinfo_database_update
 	if use emacs; then
 		elisp-site-regen
 		mktexlsr
@@ -201,6 +202,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	xdg_mimeinfo_database_update
 	if use emacs; then
 		elisp-site-regen
 		mktexlsr
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 5cfff8dd3f92..7de2f00e2e22 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,4 +1,3 @@
-AUX wxmaxima-require-wxGTK-3.0.patch 466 BLAKE2B 54d6c8cad12edab71e7efc5c4c0fe3acf079f7419258d597096e284c7d8b4293e1b4e3dfb141d81fed6cba617b13f83d0f5449d3a67146914f4985164bc92187 SHA512 9c90982c43f9d4a0e6c2cd69704cd52694615234cd7b2f3180d14146ac3d5bc1deb9098bc75745dc5f18a2be664ef3b783cceb689bf200eabf47588ec59ca226
 DIST wxmaxima-15.08.2.tar.gz 5592673 BLAKE2B cacb508cbcb24e27a43998ba0079b14117980669c25b39b017c0c659ef48d2ad338c6503aea99447a14250ed1a68a3414880828fc8ffdcbd3177b8eb9355a919 SHA512 a537c49477f54df4fd9e4e42a5e0d0d740f1ede817d807a98b7cec877a3ad77b2be0a61ae487a7fa5beb193b112eca163b8873292ecab5acf118d58a91e91af6
 DIST wxmaxima-16.04.2.tar.gz 5178050 BLAKE2B 52c416040277fbbf0f8e930f3ad3b8a78f7ed65d28d31722b0fef8482df261c418185705dd00841d9975ea55838303756ca7874a0e94f174fd4274fbd2dbc5d4 SHA512 da8159e7c779f50bde7a6f6852987c18aaf724b1ebf0bdc4d231f40b80e04cee2870a520251d212681b3f0a7533d28b744d3684fc395a26d2a46b48c1a31a856
 DIST wxmaxima-16.12.0.tar.gz 4842949 BLAKE2B 668219b2602b02e49eafa2c35fa7a5cfc995691356f5ce747590aa2e516ad8c1c8a6f57c8c8e19095ff301b7fd131942ea0ed6dbf4ce3b728fbb139e2139b5dc SHA512 6a68cf6b4fdf07bef7fdd19397c226c3cf4f693aaab8ae028e6af69b114a04fa7dbf20f7f183853f8f655ef8d0bf984ee2a0af6096697ab3c454d17f37c98819
@@ -8,5 +7,5 @@ EBUILD wxmaxima-15.08.2.ebuild 1653 BLAKE2B 1822797d2cf9afbd98b08d4ad3384c118c59
 EBUILD wxmaxima-16.04.2.ebuild 1656 BLAKE2B 64e40008e8b3912ab8955fb70d839845e2f901e53ffb2f9f623c59abe8266a81829b14999ca86cb351a82d8a7f30c1f5f7608df43258915ff53905b70079c0f9 SHA512 e3a379cc00ace47d2864a330c505d8f0e288703e8652b66467234fa69dd5143af61db7efd9b1d4ee6a324530febfe188570ba7814d0a67b50c4e0cb6efbc9c74
 EBUILD wxmaxima-16.12.0.ebuild 1656 BLAKE2B 64e40008e8b3912ab8955fb70d839845e2f901e53ffb2f9f623c59abe8266a81829b14999ca86cb351a82d8a7f30c1f5f7608df43258915ff53905b70079c0f9 SHA512 e3a379cc00ace47d2864a330c505d8f0e288703e8652b66467234fa69dd5143af61db7efd9b1d4ee6a324530febfe188570ba7814d0a67b50c4e0cb6efbc9c74
 EBUILD wxmaxima-16.12.2.ebuild 1656 BLAKE2B c56ed7d7b05ac88ad7555183abec7a8a24f6a44b2920889c539b36c708a5c637ef36bb311df6b5f46ea58a9c1a7599678746e67bde4554190c6ccb69b37d61cc SHA512 e6452ab3a3d4ccbe71befe27477775c00bdfe1235fa10e25acc5ed8d6d528acb735937eccddc288e5a70149baeb852b17fa00d652720526f299b246b4882575a
-EBUILD wxmaxima-17.10.1.ebuild 1311 BLAKE2B 3800a3abe3d2bf4425ae13927cc586b1f8305d87bf60c9e3c81adb2bef21db19bd0274699da2c9406816a6de1e1e4752f491e78a1101e4ba7c0853bd90068c55 SHA512 55516215396e1b53946ee8fd50dcfe375ea4a378561b5308a71844e4ed0729fc80c1af6816ff550ba0ebfeec3212d52176b6ce0ed4ef7376d9f7ebecd1a546c2
+EBUILD wxmaxima-17.10.1.ebuild 1306 BLAKE2B 5c96b27590bf6dd78beaff9a8b8b686a4c1b7c8a49f7045eaec2beb527168b4a371bd1dbe6b918d6c137bb6b4d2e88502268d406397b7dc9d5b703d7b3443ff4 SHA512 7ad43881f4bf03c28fe46e01e35cfc9a9bab8eb49745b40e3f0fd9a6b62c630312c7a8a7c7863efdcc5bea56b2f4cc7166dce7f1f6feff2e45dcf172b7903b0a
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch b/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch
deleted file mode 100644
index b08434061d39..000000000000
--- a/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U3 wxmaxima-Version-17.10.1.orig/src/CMakeLists.txt wxmaxima-Version-17.10.1/src/CMakeLists.txt
---- wxmaxima-Version-17.10.1.orig/src/CMakeLists.txt	2017-10-22 12:45:56.000000000 +0700
-+++ wxmaxima-Version-17.10.1/src/CMakeLists.txt	2017-12-28 21:29:58.389806037 +0700
-@@ -1,3 +1,4 @@
-+set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk2 --version=3.0)
- find_package(wxWidgets REQUIRED std xml html adv aui core net base richtext)
- 
- include(${wxWidgets_USE_FILE})
diff --git a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild
index 52fa2ddc14ed..c121ca2e948d 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
+WX_GTK_VER="3.0"
 PLOCALES="ca cs da de el es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils l10n xdg-utils gnome2-utils
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
 
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
 HOMEPAGE="http://andrejv.github.io/wxmaxima/"
@@ -18,17 +18,14 @@ S="${WORKDIR}"/${PN}-Version-${PV}
 
 DEPEND="
 	dev-libs/libxml2:2
-	x11-libs/wxGTK:3.0"
+	x11-libs/wxGTK:${WX_GTK_VER}"
 RDEPEND="${DEPEND}
 	media-fonts/jsmath
 	sci-visualization/gnuplot[wxwidgets]
 	sci-mathematics/maxima"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-require-wxGTK-3.0.patch
-)
-
 src_prepare() {
+	setup-wxwidgets
 	cmake-utils_src_prepare
 
 	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index e06128805b4c..2c1590d24646 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 7ff2862de203..ec6f8a39fc62 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,9 +1,6 @@
 AUX 64gle-gentoo.el 161 BLAKE2B 89fd74e68819e2f4653861a110ba977f205e2a200810c03f81297c87ea55167aec2dfcee87b187d310516fd36dd04e365afcaf8fa17c4691b4847071f2a35ad0 SHA512 eda9f1f3ef933aa9f43054c7eae6ec9200022723d91259fb6ba42ddbfbd01f8953d4dcd9aa541211b054c6c93947d7cada1db599db046443b90451cce9e3d7f8
 AUX gle-4.2.4b-parallel.patch 464 BLAKE2B 93348570ff1eb5d489ca6ed9eb3b5092c85a9e2e92dafc9dd208d580bd294603571cea8f2f2c4a04089805b2025faaeb425e4f576fb826c58519b7b428af74e3 SHA512 aeb1c1df07716844105cab33d84ffc5837a4a8b0452872360eaa169157ffdba88720783d421a0fd236a8ac89d128a1e75349d96566dc92f89b50a47352375cab
-DIST GLEusersguide.pdf 2244780 BLAKE2B c00f6788b8cd27b0c76731f3aee5717efded726555ad68d97f7bc54be51526a259baf7580dfcbc86decf566eb75b846f44545f98389e6716c81afb5055721551 SHA512 cce76a83d09a68d449f4e3717e9dfcaa6c0866a1c36eb58f7180c2602f8a780804278804fee555ae6360bcf8b10b34c2124408975ea49824ab5d8ae23685fc71
-DIST gle-graphics-4.2.4cf-src.tar.gz 2321647 BLAKE2B a48759c0181fc34a8f235e39e06352b85e5717ea650588cfeb08342eea1b4ba56e7ace54cc8e6970b40423b31c0c70a832579cc11c0f5c6b20679d955a68137c SHA512 961205fcb763ef0fd0b59cfffd144440ea7dea8a54a19e79caa97712245a51ceaaeda5b92ce2571852cec14357af696861bf9cd588aa08622cc8f1f5ebf3959a
 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
-DIST gle-manual-4.2.2.pdf 2238766 BLAKE2B 0998b0172d6d4039bd8f5942414dddb6200258975bd3267582b7a38bc2dae1e1af6dd4756d483b274e1a3189809f36c7a432b14a24a59ef2e360749e2446d997 SHA512 0eaa10f1f13c2f65145cbeb8f713b6de787dcc7dd3c3a30e27514b1cc8e74007d38adc12fc7666d665677354c7c14db521dea05126614def4ec30f3429cd1a41
-EBUILD gle-4.2.4c.ebuild 2428 BLAKE2B 05977b0c6913e8c83b8cae8203ea9f60d3362f652e9162f3441f50e2f0fec9acb1243150950fc114d955956b25bc20cd133cfbc1d12a401b5f663b85f559d5e1 SHA512 ee4b18afcbd8fd31e950a4e8ed8675e7b119ec52e31cbaae4e3c405cc6ed4e50e851278522c9abb21eec2bc1fc35dfc1d0384b8181fdf8934f432f7752caa49c
+EBUILD gle-4.2.5-r1.ebuild 2074 BLAKE2B 102370cbf7b9238be08a3c9eaf3ae6fd278f58b229e5fe361634732a104c56223ff22d14cd96cac7ef4d235c59f7a3b070bf55cf76e72bc7bd90b3d41d4b43be SHA512 b31d30f09e3d33aad156357ee3e36051da86a5c0117792114389376ef1a31fde40e841bb45140a275c29fbb80ad6b74be3e2a8b17588cbadf3c6c2eb6b407986
 EBUILD gle-4.2.5.ebuild 2314 BLAKE2B e90414a83df92d6be1313726d7c2b5c9074b4e3da697c95b944fe5bed07eb4133301ffe8d1b69e027d4dc440578171ea34dac4d76ec7fca22604c96f8b16e08f SHA512 b1a4be632e722a9aa6fb6f9b344076cc45738e34e961a5e3071b1868204450208700901d0a04bd6e450514a4ffa046d09c4a0bb049bb8f5b77d14d43d769c96d
 MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee
diff --git a/sci-visualization/gle/gle-4.2.4c.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index 5df58681d2a3..322a1e5c6b24 100644
--- a/sci-visualization/gle/gle-4.2.4c.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,28 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils elisp-common qt4-r2 flag-o-matic autotools
+inherit eutils elisp-common flag-o-matic autotools
 
 DESCRIPTION="Graphics Layout Engine"
 HOMEPAGE="http://glx.sourceforge.net/"
 MY_P=${PN}-graphics-${PV}
 MAN_V=4.2.2
-SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz
-	doc? ( mirror://sourceforge/glx/${PN}-manual-${MAN_V}.pdf
-		   mirror://sourceforge/glx/GLEusersguide.pdf )"
+SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz"
 SLOT="0"
-LICENSE="BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )"
-IUSE="X qt4 jpeg png tiff doc emacs vim-syntax"
+LICENSE="BSD-2 emacs? ( GPL-2 )"
+IUSE="X jpeg png tiff doc emacs vim-syntax"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	sys-libs/ncurses:0=
 	X? ( x11-libs/libX11 )
-	qt4? ( dev-qt/qtopengl:4 )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
+	doc? ( dev-texlive/texlive-latexextra )
 	emacs? ( virtual/emacs )"
 
 RDEPEND="${DEPEND}
@@ -44,7 +42,6 @@ src_configure() {
 	econf \
 		--without-rpath \
 		--with-manip \
-		$(use_with qt4 qt "${EPREFIX}"/usr) \
 		$(use_with X x) \
 		$(use_with jpeg) \
 		$(use_with png) \
@@ -53,6 +50,9 @@ src_configure() {
 
 src_compile() {
 	emake
+	if use doc; then
+		emake -j1 doc
+	fi
 	if use emacs; then
 		cd contrib/editors/highlighting
 		mv ${PN}-emacs.el ${PN}-mode.el
@@ -63,19 +63,12 @@ src_compile() {
 src_install() {
 	# -jN failed to install some data files
 	emake -j1 DESTDIR="${D}" install
-	rmdir "${ED}"/usr/share/doc/gle-graphics || die "rmdir gle-graphics failed"
+	rm -rf "${ED}"/usr/share/doc/gle-graphics
 	dodoc README.txt
 
-	if use qt4; then
-		newicon src/gui/images/gle_icon.png gle.png
-		make_desktop_entry qgle GLE gle
-		newdoc src/gui/readme.txt gui_readme.txt
-	fi
-
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}-manual-${MAN_V}.pdf \
-			"${DISTDIR}"/GLEusersguide.pdf
+		doins build/doc/gle-manual.pdf
 	fi
 
 	if use emacs; then
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1d7f9abffc10..f08fa7b7d64e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 0b87b3d00cda..cef85677cfc3 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -4,9 +4,11 @@ DIST collectl-4.0.5.src.tar.gz 624040 BLAKE2B 83e9c0eff03bc1560aa62e97fd788bb3e2
 DIST collectl-4.1.0.src.tar.gz 625147 BLAKE2B 60361e16bdc1ac7619d3e36b12f17f02703266fe43f0c0ec59e89a1a0c8d2ffd5a0eb6bc693fab98fdd14d4d8416865f2520f55026105bfef6697e93627c0d4b SHA512 b74918e458f4e7e9c6b598b078ef9522ba307b0055c0488167785d226f74a960bd075804128caef756d40a9c5a3f0189e912984c1b0c9bf62c537921e94714c5
 DIST collectl-4.1.3.src.tar.gz 634862 BLAKE2B a76fe50a9c26c5e25d951a4efceceb6474a46593180ef18d1cf346a8d52e6b3f43bd6d0b410fc36dcfd694f2ebfd35b232e6939df319e086897a74679affe57c SHA512 2938f349708dba164915fd44e7c2a58cc5088e3bafa9009c82973d5f03f8f62395cde925c6e3c1d49c6e22b653a7d1be352ec70dbabcc68b68fb3a795c1b5da8
 DIST collectl-4.2.0.src.tar.gz 634317 BLAKE2B 2c6f34dbc5ddc6616c5eb2a917d5c20dba10c9a600bb08a2cfeb6fc01ed7d916423d4fd1e1fdb7447f53c76a0fddc46087296ece671ca401e60a0c6c042dc20f SHA512 a0c3fd393a3fd3e34a838be26ebe4f111d5b62016d6c319cc556af93bec42672bd700c30c1b9a877fce049b0c11a6fbaf70c4c140ecf8f854408849a6d3a7855
+DIST collectl-4.3.0.src.tar.gz 634357 BLAKE2B 1e5e500d8c7b06e9d6262a599700d2b2104eea18c0fd57e36a493eb8c6c56e3701b73bbb60a1b5c12cd14cd7bced1730db737109da5d07bab73290a9fa5e818e SHA512 bc1cf9f36748ca496599bc52b3fe786fda44459b17b7410c96588ca28fe24529f51534318f62915da276a23085c33947abbe3ece479ba76a86ba7e0317587879
 EBUILD collectl-3.7.4.ebuild 882 BLAKE2B e63145c55030cfef3971416563849a9f161f0a47f1ac55589ec6a43d7bcc6cf21598252ab07fc2823f5b052162d51bf19c34cf86a540bf6c284351e9e4e2a74a SHA512 2b09dbe7cc358fece6f20d00bef7ed391e0ae6b94ccd6b018dce3c04b7e3c62c7058adcc5dd4fb634a65c536d5b9c26cbdf201e66edcb515328c83f767430814
 EBUILD collectl-4.0.5.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
 EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
 EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
 EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
+EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-4.3.0.ebuild b/sys-apps/collectl/collectl-4.3.0.ebuild
new file mode 100644
index 000000000000..c22ce227a617
--- /dev/null
+++ b/sys-apps/collectl/collectl-4.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
+HOMEPAGE="http://collectl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
+
+LICENSE="GPL-2 Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.8
+	virtual/perl-Time-HiRes
+	>=dev-perl/Archive-Zip-1.20
+	sys-apps/ethtool
+	sys-apps/pciutils"
+
+HTML_DOCS="docs/*"
+
+DOCS=(
+	README
+	RELEASE-collectl
+)
+
+src_install() {
+	dobin collectl colmux
+
+	insinto /etc
+	doins collectl.conf
+
+	insinto /usr/share/collectl
+	doins *.ph *.std
+
+	insinto /usr/share/collectl/util
+	insopts -m755
+	doins client.pl
+
+	doman man1/*
+	einstalldocs
+
+	newinitd "${FILESDIR}"/collectl.initd-2 collectl
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index a66a30fad5e6..90181b2b9cef 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,21 +1,21 @@
-AUX 218-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
-AUX 228-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71
-AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
-AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376
 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78
-AUX 236-uucp-group.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9
-AUX generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
+AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
+AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
+AUX gentoo-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71
+AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
+AUX gentoo-uucp-group-r0.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
+AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
 DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff2a14db4932720f90c3dc898b1e78595db983948373a2e28191fb3b0aad234f80feb91ee8ae4b607a44038a9cae SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40
 DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c88a981358b282fe56d43cd432d0ee0c0245e9c13d5460b94d83908b84a382dad3348b999f2356ab3ef2ae2c542a867d SHA512 3081f4cf64542ba64a28fe2eff11d8040af42255eb99b5210db9d583fc4b4360a4a4bb8769a1e43d38474d69ead681974cb98d4605968b38f98fd3d9b40bf211
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
-DIST systemd-236-patches-0.tar.gz 2545 BLAKE2B 9c5aa8e845726b4324cefa41397b0be283b8583cec4b7ded08b3e8909747015bc55fafd8502eac38c62985d5a8a6364e9d3eb71b68b1950c400bde11c14335d9 SHA512 1951fec7ccb1856c7a893a47c6d1931e60465d71ccb9d5a6ace3595d5a2bea75fa92c89aac2791e4deb2df19e580dec87eb0252ed81ed3b8dd4cdf2ca587cf83
+DIST systemd-236-patches-1.tar.gz 3331 BLAKE2B c4ef8881252e79f920572eb73210b205f36ee2a45aaba4bea5e5e8b2f89b92b79deb8e30a62c9163fd0bb2fbc2215e0dda6ca3388b71e4349a8659591c23064e SHA512 d4c93968d03b5f2f2279b030e65399a7d1971eab4d9be8f2122eab67b1fb7b24eef46993beab8400fc782954dc78f400778c3fff5ba4f6c51a14eeb1931c3862
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
-EBUILD systemd-233-r6.ebuild 13575 BLAKE2B a4d8da1fe7fbc67f679524228512e4bd400573ac144327af395ea82ebfee22f58d30bd2b4407ad2f0ee73f6499289ef2fca57568993e9699849463d6c6a9171c SHA512 848b2868bea39128b1163f3fe1e0ba4ae4533225fe054e81f157970795feedded32d7df145ee834010b65943d4c4407839814f1d540a53c8cf82c4333fe0a2d3
-EBUILD systemd-235-r1.ebuild 13484 BLAKE2B 9a037516042b6d8527b1eb4fd248883112b605563ef01492a3ffd98b39d0e51092656824677d46d13e48c4f36ddf5f1d30e3866821bc93ee2b581caa52b71cdc SHA512 76d568a6a97965d9bf38c5e5409da1db6fedde7186f3cebca5a19cfc5b27ce2d711d99cdadefd92630887d4254e87b0355310bb865c122e958b817dc52d8df37
-EBUILD systemd-236-r2.ebuild 12882 BLAKE2B 3091b2e72f9b340141a7492de9a3bcc632fbbf9d00ef9d401c89be736a83d45046437d4d9484745c97c416b80874038d3441dab5d47d15786689973e05a5461e SHA512 2bb6da515ca51b86d14977f762f624eeffb9416062164eca5466befc3a425b7105b06027e9d80b5e0a1b3e7845501c38502797065f553f561a05fcdb94705d13
-EBUILD systemd-9999.ebuild 12821 BLAKE2B 20927186d7ea6bc4a734e9e15d2536ed13a07ab76d95a6e38ad31d366ff78de1c6a7e84b7082af311392e4b38fc0d9e53ec1e5ea225647d3f5e4b18d4bfa868e SHA512 7b1b08bda5299f584db913893a2d90e66aa08bc9df19343202c8847399813e89782de78ea208a9082155a07194da9c9e360cf24243f0459c13c16680dc3142ec
+EBUILD systemd-233-r6.ebuild 13584 BLAKE2B ff12a0a8567efcb2e1946bcee741f7f9812953a486711409d0d264d1b28098dc797ee52b7507ab92dcf5b87d516f698689a39a179e676ea1e29b6a7ba837aac2 SHA512 b9c58ceeb3e02b13a0e4b6c6c58d43f0f9f2fe7e487c47e9b33de6f77e2c6139941ce5204598b745dc746c365ae6119f8b7f8ba022195ae844c237fce6f8f4cc
+EBUILD systemd-235-r1.ebuild 13506 BLAKE2B 0cbf4561d133839204ff6a7fbd5d984ef72ba0859977b308a58f0d92ed7dbe01eccb38ef2b66aa1423321f014fece45f90a48d18d68c63cf8e7c76e5c82c2637 SHA512 ebacf9761e113be1f8fdf1d1e54ca95ea6c4f3736942b86d6cfc6d18c792178d5a85611e37db4966296e6044fc5263b27e22d4bc8c73ed991cd6f0c9074aa0a3
+EBUILD systemd-236-r4.ebuild 12977 BLAKE2B 05c987a7da3c1f63a32bb8a3b30611ff307c053986bb7648d9132608d74e714bdfab4682c4b6d3815723444acb727b05fdeef1faeb26e8a70e5b84a4ce81875a SHA512 d95a10baff7d28001a2899cb450f834289c26fb7eaac1d75315f3bc12c40106627214080091c6b6202619fe4be6fa49d3969487a6612920d35453d96ffde6ee7
+EBUILD systemd-9999.ebuild 12916 BLAKE2B 6fc7eafd442dee19f373b3ff1c12fed6be21fe4d32ee4ec3c919b67c7ca4b23e4ac341060230ff78018d6e9416d2d51a98e7494351f5d034d09ebe576fb004dd SHA512 f0d94381647e27cf553f200f3a9e918139107de5277bc40f830627c00bb6a087d4b23cd71e406bf2c1e25851621de74e2c99e1e19cd506cb2378988da738a388
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch
index f44b4be85d50..f44b4be85d50 100644
--- a/sys-apps/systemd/files/218-Dont-enable-audit-by-default.patch
+++ b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch
diff --git a/sys-apps/systemd/files/generator-path.patch b/sys-apps/systemd/files/gentoo-generator-path.patch
index 6912b481f20b..6912b481f20b 100644
--- a/sys-apps/systemd/files/generator-path.patch
+++ b/sys-apps/systemd/files/gentoo-generator-path.patch
diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/gentoo-noclean-tmp.patch
index 769aa04ccf6e..769aa04ccf6e 100644
--- a/sys-apps/systemd/files/228-noclean-tmp.patch
+++ b/sys-apps/systemd/files/gentoo-noclean-tmp.patch
diff --git a/sys-apps/systemd/files/233-systemd-user-pam.patch b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch
index eb2223e52f27..eb2223e52f27 100644
--- a/sys-apps/systemd/files/233-systemd-user-pam.patch
+++ b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch
diff --git a/sys-apps/systemd/files/234-uucp-group.patch b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
index 89cf552c8295..89cf552c8295 100644
--- a/sys-apps/systemd/files/234-uucp-group.patch
+++ b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
diff --git a/sys-apps/systemd/files/236-uucp-group.patch b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch
index 9c53b8b18ab9..9c53b8b18ab9 100644
--- a/sys-apps/systemd/files/236-uucp-group.patch
+++ b/sys-apps/systemd/files/gentoo-uucp-group-r1.patch
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index d735dd02ab98..fded2f5f4a08 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -158,9 +158,9 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-noclean-tmp.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
 		)
 	fi
 
diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
index 1175508fe8db..a0800a27a1d6 100644
--- a/sys-apps/systemd/systemd-235-r1.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -156,11 +156,11 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/234-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-noclean-tmp.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r0.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
 		)
 	fi
 
diff --git a/sys-apps/systemd/systemd-236-r2.ebuild b/sys-apps/systemd/systemd-236-r4.ebuild
index 276c398c8a9a..816c66a23733 100644
--- a/sys-apps/systemd/systemd-236-r2.ebuild
+++ b/sys-apps/systemd/systemd-236-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz"
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -154,11 +154,10 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/236-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
 		)
 	fi
 
@@ -205,6 +204,8 @@ multilib_src_configure() {
 		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
 		# no deps
 		-Defi=$(meson_multilib)
 		-Dima=true
@@ -393,6 +394,7 @@ pkg_postinst() {
 
 	enewgroup input
 	enewgroup kvm 78
+	enewgroup render
 	enewgroup systemd-journal
 	newusergroup systemd-bus-proxy
 	newusergroup systemd-coredump
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f8eb096a861c..7122881b52d1 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -151,11 +151,10 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/236-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
 		)
 	fi
 
@@ -204,6 +203,8 @@ multilib_src_configure() {
 		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
 		# no deps
 		-Defi=$(meson_multilib)
 		-Dima=true
@@ -392,6 +393,7 @@ pkg_postinst() {
 
 	enewgroup input
 	enewgroup kvm 78
+	enewgroup render
 	enewgroup systemd-journal
 	newusergroup systemd-bus-proxy
 	newusergroup systemd-coredump
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 2bbf3eeea95e..bd89d36db762 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/f3/Manifest b/sys-block/f3/Manifest
index 4cf4e58dcafc..5c43794a1ec0 100644
--- a/sys-block/f3/Manifest
+++ b/sys-block/f3/Manifest
@@ -5,5 +5,7 @@ AUX f3-6.0-respect-ldflags.patch 1092 BLAKE2B db0069bac1bd7558edaebe058d72189aa0
 AUX f3-6.0-upstream-issue-44.patch 655 BLAKE2B f276f377674fccab2e1ae2d13dd5e7c3454868c83f7289249390d066a894d6a7595e132a55cc519b0b37802b709f6f703829babd66bf323029715e16c9c37c19 SHA512 3228507ae8ce77a683689f3b1efc67c68ee718f2903d7bc5bcea2fbd8e8943deec586154f99bbf9f7ed992b7c351958e6862b8f45a1936763f92a6d30a2f0a35
 AUX f3-6.0-use-argp_parse.patch 10555 BLAKE2B f598b473e727741094153570e0975895bf6e5994817172a0a6da03ae0d3cc92521a603ea4e99a6db46245f557a818e107273b9bcd192ded41606cd793b3a8da0 SHA512 46afaf0b8954c06a80d6b5d8a06f8da73bbd843799c78ff45083d03e687d387ef27c87f69befb274438a58fffbc041e7adeba5b6496305dd998f54cda05f651d
 DIST f3-6.0.tar.gz 45355 BLAKE2B c06f5ea3285f46197af05e7c4a75dc1e94b28acc14ec4f8da6b3fbeaec723cfaa420fa2542573a1cd5586ea50e27c3e8010ecd88ecfeb7b9ad28591f072c1377 SHA512 7960d01d7a2bd01a236006fcb4081cc7e2c0be674bc3e28137f00ea3f558a04eed47f10e7d3795c219943092ee43fb3189e19ff1925a7ed4ff5102130d65a470
+DIST f3-7.0.tar.gz 67492 BLAKE2B 6b6882958ca831a26cd815635a563dd1bac9c93103fd6e9a2a4040b6ea3725395be96d0cbef9d7e01441402edf63a63110be41f5db559eb5fa85ac82a101751d SHA512 217348c3911995143e2d1f777ff6038ffd541f6868d58da9ca0a702610377f26eac7aafcd993d9b410b4d5a6d27d2c4fa8020b665beee7c2f760dc293a63c41f
 EBUILD f3-6.0.ebuild 1387 BLAKE2B c20f631d61c25b08b9cf090491b43e55a81a2d41badcc533604215f1ba4c21f20e66e69c8b7bc71c22c852e5fe2a7f768da1ec9fad7a6249aba8edbb56eeaca5 SHA512 4fdc8440afd59d67130b44a5d8a74e86730f882bf4f0ddca7271e4e71b9fcc501934c04130ff6e85a4ac34007a592d4b58712bab0c6b51a7b5cec7d8aa56304e
+EBUILD f3-7.0.ebuild 1101 BLAKE2B 3138246757df8786b965d02053fc45c0c7892cb7cc5f16bd4e0c795e9dca5540c0bb836d4735d66d9539ded5dd1cebb2ff5ca79262ca78582387185d20751880 SHA512 fd7e3a67dc1aecd489facb63038b9d880083202354e120b88bb56706ec72330fa77be437b0bfa1a1b2ed34bf90745979f2aab42fd9e1dde4357e41f3d95115cf
 MISC metadata.xml 959 BLAKE2B 216b03b57f363f727f19317c6ac7a9dcd5c383f23939803e0e04a5061628c0669083084e0bfd2a3bd8234810e37cf851babc8b63355bd9e4082a35126844c4df SHA512 a3c52956ad1241ea8d834cfe4d45f36fb80e4c3d717f18e0f15e126b950a2cf6fdd036e8612b9feee8812d9c77a49ce9e209a2e54fd8d0f3655696814b4c9b40
diff --git a/sys-block/f3/f3-7.0.ebuild b/sys-block/f3/f3-7.0.ebuild
new file mode 100644
index 000000000000..a7890b6371bd
--- /dev/null
+++ b/sys-block/f3/f3-7.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utilities to detect broken or counterfeit flash storage"
+HOMEPAGE="http://oss.digirati.com.br/f3/ https://github.com/AltraMayor/f3"
+
+PATCHES=(
+)
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/AltraMayor/${PN}.git"
+
+	PATCHES=()
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/AltraMayor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+IUSE="extra"
+
+DEPEND="extra? (
+		sys-block/parted
+		virtual/udev
+	)"
+
+RDEPEND=""
+
+DOCS=( changelog README.rst )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:-ggdb::' \
+		-e 's:^PREFIX =:PREFIX ?=:' \
+		Makefile || die
+
+	tc-export CC
+
+	append-cflags -fgnu89-inline # https://github.com/AltraMayor/f3/issues/34
+}
+
+src_compile() {
+	default
+
+	if use extra; then
+		emake V=1 extra
+	fi
+}
+
+src_install() {
+	emake PREFIX="${ED%/}/usr" install
+
+	if use extra; then
+		emake PREFIX="${ED%/}/usr" install-extra
+	fi
+
+	dodoc "${DOCS[@]}"
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index ba26481ebc57..e2213424ce38 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index ce111d1b7b0b..a234415cd6e0 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,7 +1,7 @@
-AUX binutils-config-5 12363 BLAKE2B f3459aafdb985357fd9aec342453493a06d37de9cbc1e20d3c2f39fb21cb433af836ff1512e18a6237cc69fbe44b3c096288bde82b8f0709f82f695db62c0a85 SHA512 a666b07ab45a54fbf869c1f5bdcb8767b393a4bbaef7dc0e1cbf2a1b70cbb0e9cbf6528617dc90428aa420aa6a6e86eb629738323b80ee77089de75bd885713c
-AUX binutils-config-5.1 12166 BLAKE2B a7011cf803455a63deda7c62f3dbb378da1735f17824232394d4e0367edea257482a2b09e2b260fc4263916ef8b07051042162996e4030ae2ebe992f4cf07f35 SHA512 487aefba5f292b32626a1823fb918081f9467bfb21378b0fb8a70c98a9648e32524a6fc0c6e0dd98dd618744ca4e227b1daa7fd71856fe73c1ee10204d9c16e8
+AUX binutils-config-5 12171 BLAKE2B df24e3f7629642b71ad1e97560919a0daf58b4c1066a3a6c4342b77f266f7b8f4ee5b999b71746dbb7e4863c7e35060aa255a5bb9da865a805b091362802c92b SHA512 a444f81455cfe366072cd600aebab5c66c871b7a1b3fb935a7600596fa18dc7a4a55d82b0c0a2b239b0c3ab6a488159d3c1fd6a7e1c9fd8de4096822dfb647ad
+AUX binutils-config-5.1 11974 BLAKE2B 7cf382cbca13af78fd7581327e4c33a8a3c0ab2a77594de2a5b41219b7477e5e773a30d7caa731c3091d9274bc32378346db498e9a6ebd45c14e91e94dc26e5f SHA512 19cb807f663661e8c0437880bb1f330a2b5996b92d419cdc24fd95924f9c66ac76673354de879ce6f2a32721b1dab208250ae205fbcfa1d7aaa249fd15ee03e1
 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-EBUILD binutils-config-5-r3.ebuild 1128 BLAKE2B 4ef1d4aa6cb85479909bd0c1c77847bec279de43629e468b9ba903e7972ff25039c69621f7d9f2947fb595ced20cdd7af4b1c3f3a56af2c75edeee1c365cecff SHA512 0262239b2c34a14ce7e2e7851715fc917fc4e838bef98ab402c00f9fd8aac7a05db82eae34bd77eb96473f75e313b05dcdbf04b8a900eebb3ddcff35bdb3d528
-EBUILD binutils-config-5.1.ebuild 1169 BLAKE2B dbe4fc38f02aadf96849ba02b35d3adb37e022c6db05d41906c28521c7e9586a1982178ce9f8fd7288fea8fb551adba306ce7e120d83382079e8cc5acab25a3d SHA512 df024b6d226a76ae5322970aa739c1113de4d563c3a82e79e7ebefdcbda4767e6b0e551e4be0025f485b49484bb01d10875e114a95611dc907dbe1ac4d633673
+EBUILD binutils-config-5-r4.ebuild 1128 BLAKE2B 4ef1d4aa6cb85479909bd0c1c77847bec279de43629e468b9ba903e7972ff25039c69621f7d9f2947fb595ced20cdd7af4b1c3f3a56af2c75edeee1c365cecff SHA512 0262239b2c34a14ce7e2e7851715fc917fc4e838bef98ab402c00f9fd8aac7a05db82eae34bd77eb96473f75e313b05dcdbf04b8a900eebb3ddcff35bdb3d528
+EBUILD binutils-config-5.1-r1.ebuild 1169 BLAKE2B dbe4fc38f02aadf96849ba02b35d3adb37e022c6db05d41906c28521c7e9586a1982178ce9f8fd7288fea8fb551adba306ce7e120d83382079e8cc5acab25a3d SHA512 df024b6d226a76ae5322970aa739c1113de4d563c3a82e79e7ebefdcbda4767e6b0e551e4be0025f485b49484bb01d10875e114a95611dc907dbe1ac4d633673
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/binutils-config/binutils-config-5-r3.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
index 6a486bdebf46..6a486bdebf46 100644
--- a/sys-devel/binutils-config/binutils-config-5-r3.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
diff --git a/sys-devel/binutils-config/binutils-config-5.1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
index ef7b1bd5c11d..ef7b1bd5c11d 100644
--- a/sys-devel/binutils-config/binutils-config-5.1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5
index e6c5fac00264..acb72b7e3435 100755
--- a/sys-devel/binutils-config/files/binutils-config-5
+++ b/sys-devel/binutils-config/files/binutils-config-5
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Format of /etc/env.d/binutils/:
@@ -145,17 +145,13 @@ switch_profile() {
 	cd "${ROOT}/${LIBPATH}" || exit 1
 	if [[ ${TARGET} == ${HOST} ]] ; then
 		dstlib=${EROOT}/usr/${HOST}/lib
-	elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then
-		# true for at least avr and msp targets
-		dstlib=${EROOT}/usr/${TARGET}/lib
 	else
 		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
 	fi
 	# When upgrading, we need to clean up ldscripts and libs.
 	# Don't symlink back in the libs -- the binutils-lib package handles
 	# these now.
-	# TODO: Stop requiring even the ldscripts symlink, except
-	# we can't for bare-metal toolchains, so...  bug #147155
+	# TODO: Stop requiring even the ldscripts symlink.
 	mkdir -p "${dstlib}"
 	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
 	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
diff --git a/sys-devel/binutils-config/files/binutils-config-5.1 b/sys-devel/binutils-config/files/binutils-config-5.1
index 945295c3e3ad..ec06d47c14a7 100644
--- a/sys-devel/binutils-config/files/binutils-config-5.1
+++ b/sys-devel/binutils-config/files/binutils-config-5.1
@@ -145,17 +145,13 @@ switch_profile() {
 	cd "${ROOT}/${LIBPATH}" || exit 1
 	if [[ ${TARGET} == ${HOST} ]] ; then
 		dstlib=${EROOT}/usr/${HOST}/lib
-	elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then
-		# true for at least avr and msp targets
-		dstlib=${EROOT}/usr/${TARGET}/lib
 	else
 		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
 	fi
 	# When upgrading, we need to clean up ldscripts and libs.
 	# Don't symlink back in the libs -- the binutils-lib package handles
 	# these now.
-	# TODO: Stop requiring even the ldscripts symlink, except
-	# we can't for bare-metal toolchains, so...  bug #147155
+	# TODO: Stop requiring even the ldscripts symlink.
 	mkdir -p "${dstlib}"
 	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
 	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 71a9398e5d35..00a5c6449c3c 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,12 +1,11 @@
 AUX use-new-path-for-functions.sh.patch 302 BLAKE2B 9aff99c39e97553c8d23ee141f354d0a27138a715d2ee13ee2cfc700d33d99d4f51b501d7edbe8333c68f1c4259f97c6479b6ec9f26e9f837d158d4e2d82cc1c SHA512 539d3bfaaef536958fd2018fd957c83ecf98eaf0b0a5a5360088ae4896a4bf0f51b417d73d21a21f946e8a84ac38115cb4c1700b5b6c1b0480b49f229469a5d3
 DIST crossdev-20151026.tar.xz 22160 BLAKE2B 36cd292ffc9e8051d2684315a1546260ea3de9ff6c1324d8c0463501c1ab2671a998f176220220f8050d3d816bff48d1e263b35fcc50139e6149965d4d163b30 SHA512 f60efd4ad867efd0eb33de5fe327ccbfe73b574c97507bc0edd7ef141ad74c035ae2a0d446180e6a9eb5f43197f44933a452245feec849bacfb03fc07067edd0
-DIST crossdev-20160602.tar.xz 22292 BLAKE2B f3ade0af8ce39b6c9a5aed30845e5633b68da0796cd43c9ae05450f8a982027e428fbcca110b485a41c335963ff932c1b5cfcca3aba6143f648bc8f4ed2e27b7 SHA512 580cc51e599086a14c51153e656d30b5c2f0e08c7601384d3e082716edeaa532e832b515df2517618cc51be187fcf8738db10e412a5635a16d0bb58b1631a53e
 DIST crossdev-20171119.tar.xz 22596 BLAKE2B 4e606f63aad234684b6400203fc22a9ff7dbd9f14dca5e2f2055f08207e412a3a3352921109100b32b4f6fb51cc0836ada4e8db8011d781e9e7c990d6c92d3d1 SHA512 3b8d7b89adf06d5ffef169ed1015532220c997731e083fd73c27d80ea09a6a7efd456734104aa58ef386426f9a04fed3147f37aefe4106c378a0b865bfffb2f0
 DIST crossdev-20171227.tar.xz 22780 BLAKE2B 983dd5da66c1e467b622867c9d474c7e1b7befd4fb91e1e008f7d7d8416bb077bcd06274fe8145ec9338f652e780d2ddd3a501f79b46af280cb5dbb4c8324965 SHA512 bc91e95aa9a927416f2b97b989657de5a740707bb4f4cbfc3d9e0626c3977b3091040104a52205762ef9cc0d3cd7933fb527efa20086dedfd9b390dc2be167a0
+DIST crossdev-20171230.tar.xz 23016 BLAKE2B 4661b3f9fac314b7346f0de7227d12ae2d6851e448f6d065471499df8ada5d699ef91c6b6bca285b2aefcbf67ab351fefbe9344c0884a7c0d33ff27215c8ed9c SHA512 bf8761a3018790501adb4bb173e3281d1d7628de8f65a1aa5df0b328a4af8088be466dbe8c185e7ed44aca31b078320a4f62c56351f4b7cbf832349184d9709f
 EBUILD crossdev-20151026-r1.ebuild 965 BLAKE2B e32a6498622e7e95cad638e4e98e769a6b3490181f9f6b5f436edc7ad7df0e15d5ea312a9450e87dbe6811e8ae95847fc6ff81231822d7625cf7dd4ae5de2320 SHA512 cd4084c2dcf43b410e35d4a99bc04b3fec726b3665834acb5dfd6403ec1cad86632a424fcac8afc72f98b3ab37f15e4de8ebb783c9dee81d4a472902a08b9da5
-EBUILD crossdev-20160602-r1.ebuild 927 BLAKE2B dfc4215d6685716feba535b5fd23aab284960e86429e704d4cbaa98f134d2ef89ced93af308589ce15416c52f7179c2c956778777d0a7551c21be406531526d4 SHA512 fb4831d068fbf4014322bea03ad49a4d458d2f0adff9a2d2a712215869bc5d8c057c6efca4e0f2997926cbecb343c9dee57441861317c38630d37fa4902560e7
-EBUILD crossdev-20160602.ebuild 978 BLAKE2B 06690e31b7d7ef1a95c9fa0eee932c3eb93a31d61356f3d51bdd3c062af6ffc514936231883ad2ffe774ef7f714c51d8e624e53fde16b8cc900ae22e9cf50f29 SHA512 234953b134b82e5119e3333ab8b90c24dadcf6c498ac5f9be1a45d94f0c65f9b11b4d759a59a59284fc49ac20304777f8e05c7ee3d8920668f207d8df6fc8e2f
 EBUILD crossdev-20171119.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
 EBUILD crossdev-20171227.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
+EBUILD crossdev-20171230.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
 EBUILD crossdev-99999999.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
 MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
diff --git a/sys-devel/crossdev/crossdev-20160602.ebuild b/sys-devel/crossdev/crossdev-20160602.ebuild
deleted file mode 100644
index c8ea4e1ecb32..000000000000
--- a/sys-devel/crossdev/crossdev-20160602.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-}
-
-src_install() {
-	default
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20160602-r1.ebuild b/sys-devel/crossdev/crossdev-20171230.ebuild
index aa413719ace2..73d9c4690063 100644
--- a/sys-devel/crossdev/crossdev-20160602-r1.ebuild
+++ b/sys-devel/crossdev/crossdev-20171230.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
@@ -26,12 +26,9 @@ 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
 		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
 	fi
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f01685d08fb5..2b4bb0dcc0d3 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 70527d1355a9..a0ef9898562e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -28,6 +28,9 @@ DIST genpatches-4.14-11.extras.tar.xz 17480 BLAKE2B f8928c584ddde806347a6e2e0aaf
 DIST genpatches-4.14-12.base.tar.xz 348424 BLAKE2B 538eed70f434fd4f5234e1847aba7675a70633698fd4d88cd758377120960c2b9c83a1aff65d9e3638c3b5415e7a59c250734355dcc65c413d33d31caa51d130 SHA512 236a34ce8ab9162456c3bc301de28cca5dff60ec1d55004337ddbecee0d69c36248d7113310f3e7d5e6d68478582a4aadc822eb61f3e145b066181a7bf422c1e
 DIST genpatches-4.14-12.experimental.tar.xz 5180 BLAKE2B 671bee030fbb04111bafac179e4077c7ed67f855e74db995d657c2425ccb1388e9d6b215cb2538677b956dba5e464e6e38202dcb4b05765a9484e5e436df6d84 SHA512 88146d6255cab97e2a8cb3fedeb2ba658b10f06a8ca130006e937a32b7ff7a8a7da5aac11d25118e8ad74d582c20aebc2aed266300b32bdddccda10f8752338c
 DIST genpatches-4.14-12.extras.tar.xz 17488 BLAKE2B 5a3d8cb4cd6bdefffc5f21caa1ed9155b67caf1475575a90b4e1dc71e447ded6ab56652bee4ddf40cacfbbe56e5f25e921fc0fc912aecf2346d260a0efe24815 SHA512 74e0e482445124d65c2f13510c484a80b38ee5f48399bab232aced06e4dec113893ebe9c982522f8332c37373a0f15779a6a2afa0dadbc96a623d9a254a1162b
+DIST genpatches-4.14-13.base.tar.xz 349100 BLAKE2B c38845313e140b1d8681f6832b651beddf9d16957ee3eeea2d1c50d3707513a9a3566515384401fca8599255750d67db735c711617a7c3c265082dcc063b23d3 SHA512 3651adbc031e7d6ffe72de292ea5f28912aec17054712cc21292600e6f2ff88d30feee2b8d1a4e7087afb27f897d3de21448119c25f4c03ba5554a8f2eeec086
+DIST genpatches-4.14-13.experimental.tar.xz 5180 BLAKE2B 67e3da688f6881c983fa81ff95f2aad44e64d09fbe9dda69a495b79df8ebe6cb58e1a69bfba64ed4eaf909b70c1dba46a5f179adc89cc832d51b208b32c09045 SHA512 5f75bf8430358e036bd00e25c7a0b06ad9bf17b91a6032a137ce0fdc1c5611d7775b653169d4bc1ee2855f54df75f38361a5b5bffbc620d131837c9c4f51b329
+DIST genpatches-4.14-13.extras.tar.xz 17496 BLAKE2B e975699bf198db664e6eed352d964e7b908252bf4d0bd556f805b3caa4696bb63a4c6e1aeeab62867705acc9e1f59c2e9ba92e788568e99af55b012684b89d4a SHA512 fc435efb55749af0e4b50afb9024b474dec53bbe05eedca07ece2590ac96c08bb54e05b511d072fe3a07f6957f8c05f66697ad303477d27141d2afd3a0ddb897
 DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
 DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
 DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
@@ -80,9 +83,10 @@ EBUILD gentoo-sources-3.10.107-r1.ebuild 727 BLAKE2B 4d22e2f178beb9ee125d190bceb
 EBUILD gentoo-sources-4.1.43-r1.ebuild 733 BLAKE2B 5230623068738ad4e5d5a4d69ee7ea418c4fc78f8381f16b44c0c6d3cc6d1e86ab49713666589302a9e322b9aa0fbdb6a976e5755907d65bd1d211cb965423b2 SHA512 e43bef6fe50f0f01740889506257f81930860bbb853fa26c758bd51f286a070c42f80515606799f58c11a37fe4a0768fe644d37835e38c71c9a12c7732b31a35
 EBUILD gentoo-sources-4.1.47.ebuild 742 BLAKE2B f8126714a887b03fe9261da81783b404a506600045af38139e9d1696905b5b9d49b8e3b7cde99432b2742949ade26b20ae32a25fd26cffeaa74129b4175a16f5 SHA512 b7e4b14cf61fb90c6e6af77b79f60fa6905584d80f20a0f9120351dfc001c892eb883e2f832743180e6408036b50ba86d8629ff41955b8c867c8dafb863b0e9f
 EBUILD gentoo-sources-4.1.48.ebuild 742 BLAKE2B a65ce80c975151ec3d25eebaa4dfd7339e959e13b8a2d95a7c2498e3eb4c8da262792bdd72ca9a40e6540d1ce2f765c9d2dfca1f387d40c01a741c9277f6bc76 SHA512 1c70ad1f385bbeb38ec395c8d6b9fc8d8b7b2856d304b62e276231afed83441e25791b7c51842b3931f454ab554625e4dd20220f29c01c5778560409c0c0dd4d
-EBUILD gentoo-sources-4.12.12.ebuild 736 BLAKE2B 3e6d6890e7e5b719b93c5f701be6ae13b7648ef8d84c6c7be6a3f8ac85833f17cb4a077defb87dfdf2b714eefcf21290340594a9ce20337057ea842094a27957 SHA512 9780c3b8c878412849a62b4edba2cc9b0931af176c35ad76a173993d2c42d53825919444945eff7b1ee96a67f2b49f7db3c698ec78e0e3c05f68c523f09c8653
+EBUILD gentoo-sources-4.12.12.ebuild 742 BLAKE2B 6b8de468978b352461f911cd84f3aafafd39df95bba43d18c541b411d521a7c138d42aa89b1c31bbe106d9a5b232d13527dbb76dce5b0f035784c942b31b80ca SHA512 bb6e96e2db6a31c333c612a0d3f9374625f46d3cc81f957c5d7d2ef6f8bb9ded53f1dc21d83f065d1ccc77b84b8d20e805686f100a871835760bcc3a4c623b84
 EBUILD gentoo-sources-4.12.13.ebuild 742 BLAKE2B f677573672403df6abbaa0d220934c060bf329842fcd5c7d21ef3e152211ed33f1f42d9ec9b525cb4f79c39a10def1de2b4de78dd124cc70eed159d98956b88a SHA512 4f5cf9c4458e29f0e3b3936e1b746bd04670ee5169de35182e2ad8332dbebfc82eed1e15dbfe2b581dc25f09f470d7cef68b40a3bb9f3d3545db401f0c709362
 EBUILD gentoo-sources-4.12.14.ebuild 742 BLAKE2B 8cb45742e3a9e1a68f401456884c15885ca38aafe2e15d225781381543c16f5707098acdb1d8feec8273081a8ca93d83d979caee71a7dc0c70e3d71bcd1881b1 SHA512 19526e1c4554d9e18526ad1f71815396db6b6f46286fbe0a2e3d9ce0fb48367ca4891464d662d36225ffae70133444b3c0bc85e150008efe108e7c8dc7db3acb
+EBUILD gentoo-sources-4.14.10-r1.ebuild 742 BLAKE2B 6b8de468978b352461f911cd84f3aafafd39df95bba43d18c541b411d521a7c138d42aa89b1c31bbe106d9a5b232d13527dbb76dce5b0f035784c942b31b80ca SHA512 bb6e96e2db6a31c333c612a0d3f9374625f46d3cc81f957c5d7d2ef6f8bb9ded53f1dc21d83f065d1ccc77b84b8d20e805686f100a871835760bcc3a4c623b84
 EBUILD gentoo-sources-4.14.10.ebuild 742 BLAKE2B ec583216784cae63f758b9a08f09778a59e3dd2ebf594d57f6fddd47fc6106945d8beb44a13dd2ae16742d7be22353758cb98a57f4c97338c021288aca053db5 SHA512 09786f2f434205a46f4e277856fd9f4d5870723749fecac19fee24448025cf75ea1e03425b699891ca022927fec75a2e643fdf247145daedca0265e200f47f7f
 EBUILD gentoo-sources-4.14.8-r1.ebuild 742 BLAKE2B 493b800cb7fdd217c141aa2d94f6af21d83aa2c19e8cc76613ebda470b115218504e1faa487260aa3ec5798df2dbd15d37fc88112ff8411676f3b57d177a3bff SHA512 d6dada25484f8dba5a772a51d3073224f3e8e4ef72eff9a365c900ae574181e21ee7035c812e068158cbc5916abc874864809973a8435afbf8b2b88c4a939a0a
 EBUILD gentoo-sources-4.14.9.ebuild 742 BLAKE2B 2ec59b4a79db4d5e94b268a5d8888f54fd6a5ee61d146c9fd7553dff8d6443609cb198cff98fec615e7b2ec5a535a22765c3b328adf923cde7e03e5da36fc434 SHA512 d488ac5b60c05c266d1e4c911b6ca341dc024f087ef3896576648f6488fb810733e3693814871d15331b4cf9e7d62da47b3b8456e4fac4a6c6f03ba247bae4ab
@@ -98,6 +102,6 @@ EBUILD gentoo-sources-4.9.68.ebuild 742 BLAKE2B c7eec94c0d5fe70021406b391bc63043
 EBUILD gentoo-sources-4.9.69.ebuild 742 BLAKE2B 660110214442d6e64d52b0ab2d7aaf60d035b5d3e9e1c680d830aeed3861f0a70564c7883190493d80f779955177ebe81a2ba81f8e5d464edbcf35811dd5a9e1 SHA512 332be83df8e3b347455e8f7773244e4790e56376cd8dc22448af6c82a3ec468456d748fc69d9090d784086407792c9d2bd30aa5deb75480fb830b9220db799ff
 EBUILD gentoo-sources-4.9.70.ebuild 742 BLAKE2B 90a0dee3cb25ec996f4e7de09f07c07cbbdf1323a7c3975f1535426b68f13f488c42ade54ec5063ec85efdbf8665b597027200806b60b82692744f86dace8627 SHA512 5198e01ab3c82eae128947998ee1586acfcb93067c2ad367f70fc8f70a1cdd6299cec1080584f817c13d5800bb0eb77da34e67d0e7c6b50cea0e76e9a4a4d663
 EBUILD gentoo-sources-4.9.71.ebuild 742 BLAKE2B bc2f4b4f8f838bd1731a22df179a0dfb95e6e00a7e86185987d0a6fc8eb1059a4f2151f5b7505519ed168aa6a07e70a50ebcf7dc71215976d98a18ed9df6d870 SHA512 f9178c2d8c371ade825545bb7d01024dab0a71343c93f7aa66f433f8960c9a6de12f8e6ac81749a099ce9d26b0c7f6311561605c621c5e5802e6e80a4142ea0d
-EBUILD gentoo-sources-4.9.72.ebuild 741 BLAKE2B ddfd7123964d1cfa25611ac580b706546040c2f61d9053ea45be09d89c99b0b2f3a60f9356742e1b21ef4a97b137322ebf779b4d3b94cb8e8ffd392be1f264db SHA512 4d001716067583f60c5137c54c51a0305230ecb480c36652da3a714449f70e0b2de69f45a9f37c4a14031ba4dc114a17df792916740ea39f823beb48c885b606
+EBUILD gentoo-sources-4.9.72.ebuild 739 BLAKE2B 23f3f4c6bb2218b7670ecab28a7c94147cf2954bf53d91ae2edef358ecf2f73ff4151a8529e745206b38985848caec01553c2fe32541ba304492b5ad6ceaaa9e SHA512 5052f03a8628ccaba63be20a836495a70bc590eae1e8beb718adeb4d58003a58d6c284c1254b25e79d6a0d5ee2450b048475e8c58beb54b5abffdd49bdf8575d
 EBUILD gentoo-sources-4.9.73.ebuild 742 BLAKE2B 325a44a3bb59e8ccc3d02c6d18b6933bf3c3a980a922a4b49a13b7f4d9121a2dda03c73f9c82d0bfc1c447c06109f7dc5d30cb0e454710ec011aa100ca0891f3 SHA512 5ad5e8d5dc84ca2cabbb90767788a5b0698a21909cbd51161fdc8cd74ad7271aa16f9681444d4284939c5018f5001543a628da2067e5a0c16bcea2ced809f968
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.12.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.12.12.ebuild
index 369cff1ff798..7d7786e4edb2 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.12.12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.12.12.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.10-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.10-r1.ebuild
new file mode 100644
index 000000000000..7d7786e4edb2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.10-r1.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="13"
+
+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/gentoo-sources/gentoo-sources-4.9.72.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.72.ebuild
index 64a5bb73fea2..7a5874ea0508 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.72.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.72.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index ca8d257acff7..dcbadab419c0 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -35,7 +35,7 @@ EBUILD linux-headers-3.18.ebuild 1444 BLAKE2B 420273f8046f2f94c43503d6674241636a
 EBUILD linux-headers-4.10.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
 EBUILD linux-headers-4.11.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
 EBUILD linux-headers-4.12.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
-EBUILD linux-headers-4.13.ebuild 1530 BLAKE2B 6c0067847ba176037db8fc3f36bb0a95d1afd8313b8bdd9a2eefdeafa044b1a6032f5ad12cb3e53d423896c061bffdbcd4a0b4e31396938bc8664df78c202879 SHA512 ba9f21377a46871f95fac34a3f980b806171db72e1eae84e4bd04670acc81ebe7b011432d286e79e843fb916ced547cd63b10d3a65afb6a242c0c4837599807f
+EBUILD linux-headers-4.13.ebuild 1529 BLAKE2B cf260cfb15865136a3412b13b1806f47a19d94f1fab5ebc28e67b818582d8bb5b04bb2dc4f704862d54a76f3cc16805c37bc79ce14b98ea185ca3fef7628bd1b SHA512 8e31c345b0c9b71916295aa0e450b403e727c6218b24242e930b2f5ec6eaaf4dfe98b39b024543645664edbe368e0f209993e2eaffdc3e51260a36255d94ee33
 EBUILD linux-headers-4.14.ebuild 1539 BLAKE2B 8900db7ba2982d602920c18fdbc34340d624eb18d1477a59426170f8c5d82d88aaca5b1132a6211fe52dd635fe18d06c294d1e93e901bb6fde702ce83a229520 SHA512 412b3b9d932373fa4e3643d7cb14b96972d3fada2991f1150816365a0989fe6d802975882329afd6039809bfa49863a4e3043e596a4f1ff32e18fc7d5ba5bd6f
 EBUILD linux-headers-4.3.ebuild 1518 BLAKE2B 52d619f4780c15425f36e56137a9c92946f2819ad8053e737ab444bd21b5ef8012980ae83084038dfdf511edc039f9ae9b4538f137865d2a7efb5a018d231efa SHA512 a66be101c58288eacb28d46397a6f22c01b87b59057c527fc4716bc71f7b2ec657548293de60665bc4bbb7da14ada8270964a0f6e46ca5b349c73c4e446b2fcb
 EBUILD linux-headers-4.4.ebuild 1518 BLAKE2B 7aa19afb813093a903a3de6ac6176470baa3fcac408bfaae4adfb49d676b74f022bcf08ad719184dde1b947e6bd32246af220e9b30649556ded38b58c0833a62 SHA512 f4476f0cd952626fecdf8d13b28f33ad44bc9839d0918306af9dff1a97a65eee730421c906df5ea1f77be143be5deefbd23c985b135b330c15dc3188383015e0
diff --git a/sys-kernel/linux-headers/linux-headers-4.13.ebuild b/sys-kernel/linux-headers/linux-headers-4.13.ebuild
index 7b84214defb5..d4d2033f2fb7 100644
--- a/sys-kernel/linux-headers/linux-headers-4.13.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.13.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 110bf790fb4d..3812e4577dc7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0a71506ebe3c..cf90a6e004da 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,6 +45,6 @@ EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92a
 EBUILD glibc-2.25-r10.ebuild 4965 BLAKE2B 060110e8a01add709b5fd4892d7cdaeb71ec3a2300b27f21b103933ac60b3118c075a7dba70d8886d363953323be8473f8cc9fb672456c24fa324674465c9534 SHA512 bf04ea4805336e34479195dc136827ff78c752eb415f54b9a23924d28851554ca9bd9c68a8be264a810e7e74e536d43be5645fa54d79fb00ea2714116bf8d9eb
 EBUILD glibc-2.25-r9.ebuild 5038 BLAKE2B 6bf0e5ad7ff8403fdf35e001418446cb5bc09c4407f28ee04be3e5bf0ab3bb5da57128cea4e4943c81a615b7704ef4e1805d61540b39702702da3723eeee8ada SHA512 e28ab996019d8f3b80523ca4ae2c42857e469ce61eb01d1c248699a37d141223bac5c345b14bd50d18fedd173818d6bc94ab0bcd37aa565cd695bdbbc7dd7b6b
 EBUILD glibc-2.26-r3.ebuild 25373 BLAKE2B b39fb75551e268f4942457d3aa8a06b7e707032ba68388d8303f43bb047299ce976844384d28c0de7d9a0947a769fe7f96beabb4a60c45790465a0fe4c92a556 SHA512 fb21295d3bc781df3882b3eabb1f3d95d7d1465bfd28a4bd45a79a593c3ad61f042d147c0d1dc835e206a3e0fff975724a1295725fbe81a8718307d315719ccd
-EBUILD glibc-2.26-r4.ebuild 25388 BLAKE2B eaa2d151a2320a4b0a599e2feb2cf92c2b366013d4635a4162556e8f9c40eb211674dec9e247bb7b020d34ffb172be792cf38c476aab250dbb06d6335a3ce780 SHA512 7e8974fbc214dd52f16ae210f6e757afe5f8cc915f86405d21ebe32d81b25a3800577463c3c3ef317155e3cb6680fac1c6c6ea61eccc559b95cc064def2db393
-EBUILD glibc-9999.ebuild 25615 BLAKE2B fa6507373cf8c934beca7228b8768cfc573077f416e938e5b36cc5f39894ac9a646b05746548b7b7625f4ee34ffbd165319aaa45768a963c10b8d8654e304826 SHA512 ed0a29a626c9a55432d45a5cc3814b34ee3fae775eb529969810be918f33b0fca4c0bed54d66f07961a0600e1cf8aec67ca611a486f48853376bdd510008a82e
+EBUILD glibc-2.26-r5.ebuild 25594 BLAKE2B d127817d3554218ee16cae19a1e959083950675e0aaeadaba9185425f28a17141b5d9a578e28dc4b58a376444a8df41a8fac9632f82382e427adfd755132ff6b SHA512 11196cf14c1891e13bc7b6e2b6e687dfd85c6b59328902bd6adf5e068b87e2c96253408e9d8ba8a8c2b7f47b7818017d43b46411be9ea30231c0708866b19da6
+EBUILD glibc-9999.ebuild 25821 BLAKE2B c52ab7226bd30f3d3cc674575e8022a84c040e04ae5221ef7e479c71dcb5d74c7d721a8d02aecee42341dbf1c2f111ea3d472d9cd33f83b1f4b0d837af8b7cea SHA512 ead08f31af0d81a53203146e7a6001d3c9b8e182a7ab524efb7fe70188fdf4aa0250c65f02b06e996c2cd2ee705ac7f6394ab7f98ed539125c44d048703ca139
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.26-r4.ebuild b/sys-libs/glibc/glibc-2.26-r5.ebuild
index 97cf7ef1cbce..abde9e62f95f 100644
--- a/sys-libs/glibc/glibc-2.26-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r5.ebuild
@@ -607,15 +607,18 @@ glibc_do_src_install() {
 	find "${D}" -name "libnsl.a" -delete
 	find "${D}" -name "libnsl.so" -delete
 
-	# Normally real_pv is ${PV}. Live ebuilds are exception, there we need
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
 	# to infer upstream version:
 	# '#define VERSION "2.26.90"' -> '2.26.90'
 	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
 
-	# Newer versions get fancy with libm linkage to include vectorized support.
-	# While we don't really need a ldscript here, portage QA checks get upset.
 	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		dosym ../../$(get_libdir)/libm-${upstream_pv}.so $(alt_usrlibdir)/libm-${upstream_pv}.so
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
 	fi
 
 	# We'll take care of the cache ourselves
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a5bf3b51ebc1..2aed938db026 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -614,15 +614,18 @@ glibc_do_src_install() {
 	find "${D}" -name "libnsl.a" -delete
 	find "${D}" -name "libnsl.so" -delete
 
-	# Normally real_pv is ${PV}. Live ebuilds are exception, there we need
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
 	# to infer upstream version:
 	# '#define VERSION "2.26.90"' -> '2.26.90'
 	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
 
-	# Newer versions get fancy with libm linkage to include vectorized support.
-	# While we don't really need a ldscript here, portage QA checks get upset.
 	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		dosym ../../$(get_libdir)/libm-${upstream_pv}.so $(alt_usrlibdir)/libm-${upstream_pv}.so
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
 	fi
 
 	# We'll take care of the cache ourselves
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 09b1ef3e15a5..e28ddbfa1013 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -14,8 +14,8 @@ EBUILD libomp-3.7.1.ebuild 1368 BLAKE2B 31a4e2b6cea595eedf00655e46a11e235c52a03c
 EBUILD libomp-3.8.1.ebuild 1368 BLAKE2B b686505a85cd3a343808fa1343d0fa6c31c8e66c43c81f92152553c4e996ba88000def2355ac079e2b7b0755efe064596ed7b51409443a1143287c6a1a26e6e1 SHA512 7ba7b4fccdbc2e9a69f73f5fafd985f862b4b28eb3f775d2650e78a2596826b1d8d947aa6e19f708572409139ea094da0d1c24ee35fb3d8812f8363bd948b3c7
 EBUILD libomp-3.9.0.ebuild 1264 BLAKE2B d47970eb3edd24601f97770c326f9274849425ae33aa745cb3544f91a0475944bd1d637b7a50fe3ef0f4643f7fb7adaa91756ca79acf556216362e8c8e1c53b1 SHA512 e0772254fd1ccf735a4325a41bcd30eaaeec30063a541b9f77a5295e1674e0b4a38af86738bfc9a71f4196b81945cd7c08655fc468105aa11d24c38d303aac0a
 EBUILD libomp-3.9.1.ebuild 1326 BLAKE2B 4e1c5178e66a3d4371556bcb26fab5ea84e2bac1ce0abb127d68bbe09f4e735d6d8ed4404f19bb6d8cb4808a782a5b72c9425e4acd2fe2cc97ebc3372de1c72c SHA512 99afa3364dfe73c52792e1f0c4cc19c9beb1fdb28d7fd009a778c351f86fd1759a1c4bfcd46194890b51f227844c063fed53085d78c0b91351858ed517e42794
-EBUILD libomp-4.0.1.ebuild 2053 BLAKE2B 951e6d1290ded761b9ad5b8b111adc7dcbbdfe6d957001917073a0420fbba5d2aee8ef5c89c06b5ab938dffdbd43d7dd54daff0d16a6258ff7ebfad67f56dc96 SHA512 f6670cf731957f39927d0378b280889ec83aa811bf22980379486c6cfa41e0d4309f4e0ed6a0b7c5b15a72a3b9ee7bbee3f4ee6e3ea396288c1751a32bc63ab2
-EBUILD libomp-5.0.0.ebuild 1889 BLAKE2B f09475c0732e0df8c5d2dc607ec8aeaef786128199ff042311df101e21044053a7f1126d06af6ab094f15a4638e171fbe85b6e34bba3fee5e61d32b49e00fb61 SHA512 0dc4338c9b877c83754a711231369f38f781de447d035623e479aa6b6cec4248b4fa158eb6801e1266066e5ed4528a22a09e0c3738aa6441cb9012c69222c2d0
-EBUILD libomp-5.0.1.ebuild 1889 BLAKE2B f09475c0732e0df8c5d2dc607ec8aeaef786128199ff042311df101e21044053a7f1126d06af6ab094f15a4638e171fbe85b6e34bba3fee5e61d32b49e00fb61 SHA512 0dc4338c9b877c83754a711231369f38f781de447d035623e479aa6b6cec4248b4fa158eb6801e1266066e5ed4528a22a09e0c3738aa6441cb9012c69222c2d0
-EBUILD libomp-9999.ebuild 2043 BLAKE2B b97582b120c1fbcfdbebef908c6efa61b41392aac7c319b2a655c6d40c46335f907aafc229805b4f1b39a56e8ba0ddb7a6395fe2b63a5fec27cc786c432582a7 SHA512 5918ea4691402ef663872dc1482c52853db7ade37b2a68d11a0174a529f67efb033d7270c1e74d0cc38286927ad2d9b1e397e5596e737d4050521e618802ece6
+EBUILD libomp-4.0.1.ebuild 2188 BLAKE2B a59f253ab870927b3cf2adc1682701d8805dda2c52f56529b34ab66987168f1039ef9b285680e8a8ca09fc2dbec48eec55b15ca59cc0ae365c6c5a11e5ad9f2a SHA512 e39909c1b48042fa7da5dd8eab5804721d3775f3c74c196257ded941fa5fafb1b1e697484d9ca96f21797583fcaa381372dbb28a97d0eee4d8993a3dd8d94506
+EBUILD libomp-5.0.0.ebuild 2024 BLAKE2B 1278194f24e5e37ce636fb0269e133d996581d9be8578a0b1bb8aaa29518e2e2936987515ba665a45730889853c42ffe5982474cda58073d612c402c724901ef SHA512 7b39d3a903cf1ee049d2257d14236314965d17b9bc99de8da78252647f42ff3f40e8b26b5763992be1965deca87b61e2f5ffce3c8fdb9a1c739bee30ec958b3e
+EBUILD libomp-5.0.1.ebuild 2024 BLAKE2B 1278194f24e5e37ce636fb0269e133d996581d9be8578a0b1bb8aaa29518e2e2936987515ba665a45730889853c42ffe5982474cda58073d612c402c724901ef SHA512 7b39d3a903cf1ee049d2257d14236314965d17b9bc99de8da78252647f42ff3f40e8b26b5763992be1965deca87b61e2f5ffce3c8fdb9a1c739bee30ec958b3e
+EBUILD libomp-9999.ebuild 2162 BLAKE2B 09d9069c77be4810e8ee75a66c543c76ce0256713a50d0371d77ec5d804283e64c8a16a16774062b7f4da3efe627a324d07d62b82d7788a40ac113be5bcb3922 SHA512 76183694ec4fce233c288036f52abbc80352c378e9571c026acf58f1ae739506a29a24cb0150407a7d0bdab1b99a945ce8e161f39af5b10b94d0dd0d9c23fdf6
 MISC metadata.xml 670 BLAKE2B e059d444954246af28f1e5fde5a5bcda4662965a09fbe77d852e27ee7017e1723937b693c4e057963b71e32b5492660965a15af60087c540dc1161dc1a349a38 SHA512 d4269bb7192e00feed26327bb2ac36db3b1c4f5d55417c22efb9a64fa5a006c17dd39459ecc305e8a9a3a954271ad10013fe5c9159a30ea609513aabddebf485
diff --git a/sys-libs/libomp/libomp-4.0.1.ebuild b/sys-libs/libomp/libomp-4.0.1.ebuild
index 2eed580030c3..299e49921e10 100644
--- a/sys-libs/libomp/libomp-4.0.1.ebuild
+++ b/sys-libs/libomp/libomp-4.0.1.ebuild
@@ -8,7 +8,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib linux-info python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -22,8 +22,7 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="hwloc ompt test"
-# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
@@ -43,11 +42,19 @@ S=${WORKDIR}/openmp-${PV/_/}.src
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+CONFIG_CHECK="~!SCHED_PDS"
+ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
 pkg_setup() {
+	linux-info_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
diff --git a/sys-libs/libomp/libomp-5.0.0.ebuild b/sys-libs/libomp/libomp-5.0.0.ebuild
index f90baa29e665..87c3bfe493f6 100644
--- a/sys-libs/libomp/libomp-5.0.0.ebuild
+++ b/sys-libs/libomp/libomp-5.0.0.ebuild
@@ -8,7 +8,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib linux-info python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -22,8 +22,7 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="hwloc ompt test"
-# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
@@ -43,11 +42,19 @@ S=${WORKDIR}/openmp-${PV/_/}.src
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+CONFIG_CHECK="~!SCHED_PDS"
+ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
 pkg_setup() {
+	linux-info_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
diff --git a/sys-libs/libomp/libomp-5.0.1.ebuild b/sys-libs/libomp/libomp-5.0.1.ebuild
index f90baa29e665..87c3bfe493f6 100644
--- a/sys-libs/libomp/libomp-5.0.1.ebuild
+++ b/sys-libs/libomp/libomp-5.0.1.ebuild
@@ -8,7 +8,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib linux-info python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -22,8 +22,7 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="hwloc ompt test"
-# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
@@ -43,11 +42,19 @@ S=${WORKDIR}/openmp-${PV/_/}.src
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+CONFIG_CHECK="~!SCHED_PDS"
+ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
 pkg_setup() {
+	linux-info_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild
index 6b0c0b5b8014..4d5905215164 100644
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -8,7 +8,7 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-multilib git-r3 python-any-r1
+inherit cmake-multilib git-r3 linux-info python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -24,8 +24,7 @@ LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS=""
 IUSE="hwloc ompt test"
-# Restrict tests to avoid hanging, https://bugs.gentoo.org/638410
-RESTRICT="test !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
 # tests:
@@ -43,11 +42,19 @@ DEPEND="${RDEPEND}
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+CONFIG_CHECK="~!SCHED_PDS"
+ERROR_SCHED_PDS="PDS scheduler is not supported as it does not implement sched_yield()"
+
 python_check_deps() {
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
 pkg_setup() {
+	linux-info_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6fc362ff21b9..0aae2757c9a3 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 3a11fda71865..d88170685bea 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -6,6 +6,6 @@ AUX postinstall-en.txt 670 BLAKE2B 1b04aee08ce7fa84e75590374397bf96e9cfd12c2f982
 AUX reconfig 349 BLAKE2B a733307066d91e2c4df0969a3bee5969df51bf72ef0a7a343cf453a804ac474c7d0dc7d43dd89e54a2ec60579824ce495e3062829c05583363bbbe6c1743569a SHA512 bde5c8b728d9f40a8c7b6ff4df683b415c82729ccb95f3652500f6b0274bf7e2471ced0480813765d9c682f43d7de3baac7ab5b27a9a25525393c5c13270b6b0
 DIST bugzilla-4.4.12.tar.gz 4931062 BLAKE2B 21d060d3a6bc8fd16d5a0283bb5c3735a473283d829be711e22b9d21fc203c8bd33cc9b940417480fa4b16dc478dcb3b526f305c324c97ccac7965b2820bea01 SHA512 51520cc55ae0fb30f8a8efb98e9b5a5a35ca74e9ec3667528fae6520fa7f12137e01948009b152481d0b8e02d435b42c3cacb5449fb42fe709964db68a386548
 DIST bugzilla-5.0.3.tar.gz 4069689 BLAKE2B 1be1d911b59a06f9073a2e610b88af2b1b62bda1e2ef812f65faf2fc35499cff20b96f29a522cf8478ed65c4de9008a349162159f180f59f79a380d777340548 SHA512 82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46
-EBUILD bugzilla-4.4.12-r1.ebuild 2833 BLAKE2B 0c0c1200702a8022a8b9914fecce2ce3cbbabfd631f1ba90d6c89a757e78286df5cc8762dc738483628f964257bb546999abee3176721622c671c74b60cd52c1 SHA512 a0a259e4071f066f0dd22bb64e7b2168835f558be7ae4d6c81c5a9bf4c68eb854087acc2acb5b229d1402b2c133469d37e35ae6d1cfc4518120e78259119bf3b
-EBUILD bugzilla-5.0.3-r1.ebuild 3011 BLAKE2B 6fa2176ab52161a714f34d7ece030a56d972a505289171aa8cd1ddb605aabd1bed9e39bd20eb8b91b1cf09cd2a9cc9e11ac34e715b9819be5593425b5c8d7b64 SHA512 fbe347b26726713b330ea313d2ae32b695f20f053ae5757d1704b2d80a72633b9c5683e8d01e45c3f5b77815ab97cc6ccd59030b2755b17729abd26a7012c0d3
+EBUILD bugzilla-4.4.12-r2.ebuild 2836 BLAKE2B e4cf747481b2dee27afdf85985da4001b454bee3ab75db395c1d3cdf3b9a5930706335799ac56b93132265a773c65810b30a436884207b807da1b5eb930d9ae2 SHA512 5db3b619ce4323782aa1ca22a43e4811911345d5663febfe473faf94a3d88af6136f5bd83324cb1c40222f26d9229beec6ac7a0f69f3904ed712f3b1fb9ec9f7
+EBUILD bugzilla-5.0.3-r2.ebuild 3014 BLAKE2B 2f9079dd3bdf0eef06b9146df8832d871e52bd1dd9160290bee47c2bdebf175c27784364e52d8c9376b6268c1042c8036a0487efe11be702876f9959a27b5bf0 SHA512 aa95133911b1bd11853717cbb49b7bad859fe29dac98bb8daf9be24a699c64d89707e2b9962db23297dd9dbd0b432bdc9e91a001b6ce963796723f3182c06f04
 MISC metadata.xml 392 BLAKE2B 7988b93af36ffeb2841c4a7b3d4dbe41533347c3847d41a999e7b00ddb4e11cd738defe96a95a51c5b6f7416f2fbeaf78ea47f3eb3502c5d02f964d1e3cd8c3a SHA512 e0893f3ce807576e90bdddfbf8b19bd32665fa40b288d01126ecbc402d2867b512f26afb5a62e8ed3bd0fa9c749a7f0e2e90547db5f1078274b4e0653f1d0fc1
diff --git a/www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild b/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
index 1e10e2a37f67..2d6b66fd871d 100644
--- a/www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 		dev-perl/libwww-perl
 		>=dev-perl/PatchReader-0.9.6
 		dev-perl/perl-ldap
-		dev-perl/RadiusPerl
+		dev-perl/Authen-Radius
 		dev-perl/Authen-SASL
 		>=dev-perl/SOAP-Lite-0.712.0
 		dev-perl/JSON-RPC
diff --git a/www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild b/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
index 7aa733d0f136..0675641f3211 100644
--- a/www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild
+++ b/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 		dev-perl/libwww-perl
 		>=dev-perl/PatchReader-0.9.6
 		dev-perl/perl-ldap
-		dev-perl/RadiusPerl
+		dev-perl/Authen-Radius
 		dev-perl/Authen-SASL
 		>=dev-perl/SOAP-Lite-0.712.0
 		dev-perl/JSON-RPC
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index dbcff9479b12..8ad1e4a980d1 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index cc8ce16cfd15..2cfbf03b6b63 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,9 +7,7 @@ AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6d
 AUX chromium-gcc-u2f.patch 1670 BLAKE2B 9d83331ec5e9d4ef3b58e9119c7c152abe61daf8b32e168662de9e734d935c24913b603c631d148ed1cb7b5364e751cbb9bcc7e58e5c34f375958898fc0cf8f5 SHA512 f10486ef46940fa740ca2d7e8225924704a4f89b709ef3dfb7ad128865982c220f8971d169515d9d1be08ee112aef1cac95281f0a5af4615256d9760966545f1
 AUX chromium-gcc5-r4.patch 3648 BLAKE2B 44ad25ba69e100f7df35a2532ad1c8e55acf9dbbdcb1c28000c755748ef62848d325c7e379e06d1a0567dbda0e3f97808755ef90e2b7a197aa74a786d0280ca0 SHA512 6b6d80c8adfbb317003712b94cfdf733af48ee5f32d10b6f6e8599cd08b7a9d8b73e6cec2902ed55eb0a962ba9c9cf14a70299e132ec7bfec29806ed23836791
 AUX chromium-gcc5-r5.patch 568 BLAKE2B 9c4979a0eb540f490844a368173d7bb6a0f101daca5ea4ab5213fbda62e0a615ee2e0d674a550ded59b7a29aa9193782664e71a614e9c7387061b3d347423994 SHA512 f1878f6960f0f6cad723e2f26ffeed7fc6c2c0e468098d5f08d7e305d644375436c5d7c1698d79bc9f3625fd5736793132d088e68f543838a073c2be68fe5882
-AUX chromium-gn-bootstrap-r22.patch 355 BLAKE2B 8a74d22f93d452e6be173a434d36618326264f648a5567bc0bacbea523ec08fed7b45631c645bef056c9e9d2adf6d1322e319778817adc05dd0abf83fb4f339c SHA512 617b5009f30c7da7a5523cd0be3c1e8c4d8c396401191e0b7dd46126a352a0318ce64947f05557cc94e8a7b5a8cffb3b11265ac1961650f8a3e8541fce2969fd
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
-AUX chromium-math-includes-r0.patch 1206 BLAKE2B 20baae52c881e65ac6ce8ae4c944c2280f0fd21e477a69dccf132ff88227771b590d1956ba2c6168b441b481c5967548681ef3b8d898b3172386b7b7df33e835 SHA512 4a14315fd87ba269e59dda83c9cdf760cff27934974db13bb40f31c8750f4ea6b4b325c7950469278ac82bd67fa770e58a39d712d0b6a75d2befde90b2a267b7
 AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r22.patch b/www-client/chromium/files/chromium-gn-bootstrap-r22.patch
deleted file mode 100644
index 5723281cc7d6..000000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r22.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -481,6 +481,7 @@
-       'base/metrics/sample_vector.cc',
-       'base/metrics/sparse_histogram.cc',
-       'base/metrics/statistics_recorder.cc',
-+      'base/observer_list_threadsafe.cc',
-       'base/path_service.cc',
-       'base/pending_task.cc',
-       'base/pickle.cc',
diff --git a/www-client/chromium/files/chromium-math-includes-r0.patch b/www-client/chromium/files/chromium-math-includes-r0.patch
deleted file mode 100644
index 4d2cd324c2a9..000000000000
--- a/www-client/chromium/files/chromium-math-includes-r0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c6cb5c835e12ffa75e26eaefeef631d125c4e04d Mon Sep 17 00:00:00 2001
-From: Philippe Hamel <hamelphi@chromium.org>
-Date: Wed, 1 Nov 2017 18:41:59 +0000
-Subject: [PATCH] Fix GenericLogisticRegressionInference includes.
-
-Bug: 759161
-Change-Id: I199c7604eb38fc5a1b8107710eeaa27f8e71b299
-Reviewed-on: https://chromium-review.googlesource.com/743690
-Commit-Queue: Philippe Hamel <hamelphi@chromium.org>
-Reviewed-by: Roger McFarlane <rogerm@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#513195}
----
- .../machine_intelligence/generic_logistic_regression_inference.cc       | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/components/machine_intelligence/generic_logistic_regression_inference.cc b/components/machine_intelligence/generic_logistic_regression_inference.cc
-index cf6420b85113..d085f6d1f537 100644
---- a/components/machine_intelligence/generic_logistic_regression_inference.cc
-+++ b/components/machine_intelligence/generic_logistic_regression_inference.cc
-@@ -4,6 +4,8 @@
- 
- #include "components/machine_intelligence/generic_logistic_regression_inference.h"
- 
-+#include <cmath>
-+
- #include "base/logging.h"
- #include "components/machine_intelligence/ranker_example_util.h"
- 
--- 
-2.15.0
-
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d2e49beac748..500843909d47 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index d33dc007b83d..cd02928a868f 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -2,9 +2,11 @@ AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4
 DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
 DIST motif-2.3.6.tar.gz 5725456 BLAKE2B 40f1af89e267de8d7603a7db81390286d52d1fd1ae1a7f45dae82b6d11f6a7c35e4214b9df0f3901781a9249632d40aff360b9d97cffc3218ca2d251693d9ae2 SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60
 DIST motif-2.3.7.tar.gz 5715478 BLAKE2B 594aec6674c60e6c8f0e8abc830b934a11b7274fd5eb2d344943ceea9096caf047107523dc4429fed0023935935979e6af5a26b2481a593f3090807ad3fcd8ef SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
+DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
 DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093cbe50f9c7a632c618b81b90a9761cb06a944f15378673f22419e5e71ed975d18f95ba05ad366f88ddbca898dc08a6 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
 DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
 EBUILD motif-2.2.3-r12.ebuild 1833 BLAKE2B d6e581822fa7ecb133b2aa74d71c2737b78a4c273436ab23267a125137e70e64aeb40c40a7e22b37c4434bee8cc80d8a9dc3c3b5d276efcfb855b89a7270ab66 SHA512 50013e267d02ddf5b1dae145715661633eb93367334e32c47bab77c4d826e1155d6720e447f175277abae8df7dc299c9dc5507cc8a7bfb019551a9fc8e5e88bb
 EBUILD motif-2.3.6-r1.ebuild 3468 BLAKE2B 75be1e877dd39810cc656c62935512abe527cc5e602e125dd60586ebd16256b4b4948ec952a90c4e4ca8776d8b23a45e41bd589c8c0a291373b3333e54473fcc SHA512 31e3580fcc61f6e748e0464ca0b535483d16186c33065c5d6fb3041d4862a73e7d53d8007dce5085a0da9947f2c863eb5e7bf38ac2a0fa63d50a73336519c828
 EBUILD motif-2.3.7.ebuild 3476 BLAKE2B 04d82961f5e18636cf08ba3ae3549a6db6ee786b6bcbaac1950bf6a856efb2d4862b4c8a76ddde160ed2c59aa433e6bcfd650807e4444941fdb1574c4dbe99d6 SHA512 6c1341bbabcfbd7f27c700016e602592e5676b184b5db9391c8bb5357bb948e06419aa888ec066d70c767134e7a0e3c96e72b42be70d608dd85ef084247bdd00
+EBUILD motif-2.3.8.ebuild 3396 BLAKE2B b973221fbec5b9a59354d1da06891d75f610fee811081eef08a57866676d89603bc87de3ead2f12515dac5ce75fb6d8488b458d4f54db39056fede1703e15acb SHA512 94df476727be54e35defe9bf0a6d47ad017649d86d75a43645ce6abdb1b2a42047d503844dd1f8d79e55e289a0b1b66351c723a585fc1027738088673915b268
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8.ebuild b/x11-libs/motif/motif-2.3.8.ebuild
new file mode 100644
index 000000000000..3c3dba0edf71
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="https://sourceforge.net/projects/motif/
+	http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	xft? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
+	x11-misc/xbitmaps"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	# disable compilation of demo binaries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	# add X.Org vendor string to aliases for virtual bindings
+	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+	AT_M4DIR=. eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	# for Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
+			&& use unicode; then
+		# libiconv detection in configure script doesn't always work
+		# http://bugs.motifzone.net/show_bug.cgi?id=1423
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	# "bison -y" causes runtime crashes #355795
+	export YACC=byacc
+
+	# remember the name of the C compiler for the native ABI
+	MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
+		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+multilib_src_compile() {
+	# The wmluiltok build tool is linked with libfl.a, so always
+	# compile it for the native ABI
+	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+	emake
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use examples; then
+		emake -C demos DESTDIR="${D}" install-data
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+	fi
+}
+
+multilib_src_install_all() {
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	# cleanup
+	rm -rf "${ED}"/usr/share/Xm
+	find "${D}" -type f -name "*.la" -delete || die
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0a91b154b140..2ddf9daf6c50 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 6227c5b0c13a..b8bcd40cfe88 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,9 +1,4 @@
-AUX slop-4.3.21-no-cppcheck.patch 790 BLAKE2B 3511eaa3b4b81619a6350bc3d54e6e57b8ac5a3c3339cd44ea7775df721e4095a00ebb190964e076604cadbc27aa8beeb53c1402d321d88a03368e03548cfc80 SHA512 0cfef93fdad5c9b739032388698e2a2fb997774f95590573f7a1807a219435282b9d0e4daddf6ea79547c54cdfcd76b7545eb5009d1dc4b06ab81636beed29a5
-AUX slop-4.3.21-no-gengetopt.patch 2109 BLAKE2B 3d2ed3a09f2040d327fda945e85e71198ea56ec18091ea3cf2bcd7665981188271fa27b6683b2d04d2223fb52d18b20795ac021202550e29704738f41b118b69 SHA512 f345eaa42463dce37da6368b6f2e0d343c0af8a639e59a031f95f66cf3d4c99b6af3c4ed09b38408268b327334bf835e2e6207e8fdd12dbf106ca67552a545f7
-AUX slop-4.3.21-no-librt.patch 1099 BLAKE2B 92b4a02454e62f364d2ffa03bf1713ed22d5a90e1d4a90dbefa1463bf19f947dd223beb834b2d03cb0f9ab911b5e6137d6df6c5381dd55ec080f7e0b1abda449 SHA512 aca2ee7b8ceab74e7add153692884ee29ec787f3b0df5627a825a1c090be59406df7f9ed2fed1301a2ef28d15d0f9cbdf4fa221f5a4734e7582868f02fe65c2b
-AUX slop-4.3.21-no-opengl.patch 1201 BLAKE2B eaafe762eb7c1b518f5d11ac7e3cd414554221840fab4d7861da995ac045b3d2978d215bcbdd9a8f25aa4a371c9eddbb0a4f0e852eedcdd21cad7a76c7928cbe SHA512 df03f77d1a812e02070c4a44ad74c373ce0cf739a847a2ddd2dbab591488bd31da21544db0d6818f456a0b0c2cc0f092a055b1d1f869868b6f12418c02cfdcb5
-DIST slop-4.3.21.tar.gz 488238 BLAKE2B dc99c690984b616b28f93c3dd26ebd4264dcba7d66c5929f3732c88d3a423f19a3ab94d6673091735bd0d6dc4cec1bc41fc8e3f7bc666e9a8459acb717405e4d SHA512 4489a108883b785eb5dda368a06ea0b7c61e3afeefdeb421f211e01e3cb7eb20836200197abc755be653f086fcd3b8647a460dacf15062fe2cd44438b4f54b68
+AUX slop-6.3.46-fix-build-system.patch 2274 BLAKE2B cec202a664d3329d7354f63d20e5a197363296d1506e46900ae51d542bc44279ac62fb9668dcaa2cbade49688d210f9fbac7cbbb706feb5382921536b8471c2b SHA512 344396f7cc8c60f09647c434b78183264dede5548e243df3408f46486f489eb14353fa770ba1f604f604a15417a92f84cd51c561b7026b74b854d8ba7d02cc67
 DIST slop-6.3.46.tar.gz 89391 BLAKE2B 0150ca63e4a598e892abd5505e867f01204f29796dc378a7f3d0c041c1a27f000e98962c41cbf8109573575b37449c1869f29f988c5d2046b504382b2a56779d SHA512 9f44bbb8e14e71a17858711d8da902cb9cf5dc65ed47284be15122f2d1793544deab7f0700517bd07e44613662bfbc7f0991f3d36dcf74af6f90de5fbbd79558
-EBUILD slop-4.3.21.ebuild 998 BLAKE2B 70597f35b452127d3a978965ca3e4ca72bcec5e16789ffd073b51db3825c9d3b76afa16498311a00ab56cba9e064cda29e36db39c57707a397e44d2d3eaf3877 SHA512 6885b852092d53097338ecb21e5c15c022afa203513f0699de9bfae3268a5414773f3511435ea7d410115792ec080d17fecf4d4df889f334abaee67414030ad4
-EBUILD slop-6.3.46.ebuild 538 BLAKE2B 28aa2fbab1f6806f7b9af9fe06149f3024846cc271a51db6ef11a4386b628320fe3dc70ae8ea0ada6d97fb70186dd16448e588fd4fbef9e3d07686a003258f4a SHA512 d912f801f8d79024246bcb564171aeb268bd82ddeff2039ba215693690a731a872c73c5b7737fa9954f2f0be25f993c22b81e8eaa5a757438706d5c25ecf0d44
-MISC metadata.xml 834 BLAKE2B 424b01ed5fcac7f55fdbffca1fa5f028251bacffa5889c61e46d1b21d9f4c2880f939d80567ed9509115f5456e8ba31daa592172d6f84c1adedd9b9888793ae5 SHA512 d3048ec19bdb9d9cc6a0c6f47d751ae29718a754b3c2ea90cb015787c491d536857b50eaa8b98c17fce83738e15200a96909d7fee48186a9cfd7267e1f6b5277
+EBUILD slop-6.3.46.ebuild 601 BLAKE2B 769a13a66a24a8067fdafbb6d3cce48090d4193fb40a14a98cd56d1d4d331e642ec50e601b8944e7276037e07cd52b27c0cb0b79295820c1305f63c8601f3051 SHA512 e96b0e0d8f2562f40a8770980dd46b0f7bbce5588b4fb1cb7d62c88a10fa9ae5880d40918db178f5f4ac5ce6c46957a685af528f795009c8094375738308fce4
+MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch b/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch
deleted file mode 100644
index f92c57f977df..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 361f930..0982647 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,15 +33,6 @@ else()
-     message( FATAL_ERROR "Your operating system isn't supported yet! CMake will now exit." )
- endif()
- 
--# Add a check target for our makefile.
--find_program( CPPCHECK_EXECUTABLE cppcheck
--              DOC "A tool for static C/C++ code analysis." )
--if (CPPCHECK_EXECUTABLE)
--    add_custom_target( "check"
--                       COMMAND "${CPPCHECK_EXECUTABLE}" "--enable=all" "*"
--                       WORKING_DIRECTORY src VERBATIM )
--endif()
--
- # Here we generate some of our code if we can. I package it pre-generated
- # so nobody has to go find and install gengetopt if they don't want to.
- find_program( GENGETOPT_EXECUTABLE gengetopt
diff --git a/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch b/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch
deleted file mode 100644
index 13f79eef2110..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,29 +33,6 @@ else()
-     message( FATAL_ERROR "Your operating system isn't supported yet! CMake will now exit." )
- endif()
- 
--# Here we generate some of our code if we can. I package it pre-generated
--# so nobody has to go find and install gengetopt if they don't want to.
--find_program( GENGETOPT_EXECUTABLE gengetopt
--              DOC "A tool to generate code to grab command line options." )
--find_program( SED_EXECUTABLE sed )
--if ( GENGETOPT_EXECUTABLE AND SED_EXECUTABLE )
--    message( "-- Regenerating cmdline.in" )
--    # gengetopt generates cmdline.h, then we move it to cmdline.in.
--    execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--    file( RENAME "${CMAKE_CURRENT_SOURCE_DIR}/src/cmdline.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/cmdline.in" )
--    # Due to a bug in gengetopt, we have to manually insert some code.
--    # Replace the first instance of REPLACEME with some text.
--    # Eight backslashes = two in the code because of how many instances of escaping is happening.
--    execute_process( COMMAND "${SED_EXECUTABLE}" "-i" "0,/REPLACEME/{s/REPLACEME/X=%x\\\\\\\\nY=%y\\\\\\\\nW=%w\\\\\\\\nH=%h\\\\\\\\nG=%g\\\\\\\\nID=%i\\\\\\\\nCancel=%c\\\\\\\\n/}" "cmdline.c"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--    # Then replace remaining instances.
--    execute_process( COMMAND "${SED_EXECUTABLE}" "-i" "s/REPLACEME/X=%x\\\\nY=%y\\\\nW=%w\\\\nH=%h\\\\nG=%g\\\\nID=%i\\\\nCancel=%c\\\\n/" "cmdline.c"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--else()
--    message( "Warning: Command gengetopt or sed not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" )
--endif()
--
- # By default our src/options.ggo has our cmake versions variables for
- # the 'version ""' line. We replace them here.
- # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic.
diff --git a/x11-misc/slop/files/slop-4.3.21-no-librt.patch b/x11-misc/slop/files/slop-4.3.21-no-librt.patch
deleted file mode 100644
index 0b95b833ffda..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-librt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,10 +75,6 @@ find_package( GLX       REQUIRED )
- find_package( XRender   REQUIRED )
- find_package( XRandr    REQUIRED )
- find_package( GLEW      REQUIRED )
--# This library is needed only for Ubuntu it seems, some platforms don't even
--# ship with it. I couldn't find a way to do a test compile to check if librt
--# was needed, so instead I just didn't mark it as REQUIRED.
--find_package( RT )
- 
- set( CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} ${CMAKE_IMLIB2_CXX_FLAGS}" )
-@@ -96,10 +92,6 @@ include_directories( "${IMLIB2_INCLUDE_DIR}"
-                      ${XRENDER_INCLUDE_DIRS} )
- endif()
- 
--if ( RT_INCLUDE_DIR )
--    include_directories( ${RT_INCLUDE_DIR} )
--endif()
--
- # Executable
- add_executable( "${BIN_TARGET}" ${source} )
- 
-@@ -119,11 +111,6 @@ if ( CMAKE_OPENGL_SUPPORT )
- endif()
- 
- 
--if ( RT_LIBRARY )
--    target_link_libraries( "${BIN_TARGET}"
--                           "${RT_LIBRARY}" )
--endif()
--
- install( TARGETS ${BIN_TARGET}
-          DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
- 
diff --git a/x11-misc/slop/files/slop-4.3.21-no-opengl.patch b/x11-misc/slop/files/slop-4.3.21-no-opengl.patch
deleted file mode 100644
index 2f596b65e992..000000000000
--- a/x11-misc/slop/files/slop-4.3.21-no-opengl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 62cc1a6..f5d66e5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,14 +71,8 @@ endif()
- 
- # Obtain library paths and make sure they exist.
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmakemodules" )
--find_package( Imlib2    REQUIRED )
- find_package( X11       REQUIRED )
- find_package( XExt      REQUIRED )
--find_package( OpenGL    REQUIRED )
--find_package( GLX       REQUIRED )
--find_package( XRender   REQUIRED )
--find_package( XRandr    REQUIRED )
--find_package( GLEW      REQUIRED )
- 
- set( CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} ${CMAKE_IMLIB2_CXX_FLAGS}" )
-diff --git a/src/x.hpp b/src/x.hpp
-index 2478414..f35e722 100644
---- a/src/x.hpp
-+++ b/src/x.hpp
-@@ -26,7 +26,6 @@
- #include <X11/Xlib.h>
- #include <X11/cursorfont.h>
- #include <X11/extensions/shape.h>
--#include <X11/extensions/Xrandr.h>
- 
- #include <stdlib.h>
- #include <cstring>
-@@ -97,7 +96,6 @@ public:
-     std::vector<bool>   m_mouse;
-     bool                mouseDown( unsigned int button );
-     bool                m_keypressed;
--    XRRScreenResources* m_res;
- private:
-     slop::CursorType    m_currentCursor;
-     bool                m_good;
diff --git a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch b/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
new file mode 100644
index 000000000000..2ca92f9d2ac8
--- /dev/null
+++ b/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
@@ -0,0 +1,56 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,16 +1,13 @@
+ cmake_minimum_required(VERSION 3.1.3)
+ 
++include(GNUInstallDirs)
++
+ set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)")
+-if ( NOT CMAKE_INSTALL_PREFIX )
+-    set(CMAKE_INSTALL_PREFIX "/usr")
+-endif()
+ 
+-project(slop)
++project(slop VERSION 6.3.46 LANGUAGES CXX)
+ 
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
+ 
+-set( CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where man pages reside. (/usr/share/man, /usr/local/share/man, etc.)" )
+-
+ set( CMAKE_COMPRESS_MAN TRUE CACHE BOOL "Whether or not to compress the man pages for install." )
+ 
+ if ( CMAKE_COMPRESS_MAN )
+@@ -21,7 +18,7 @@
+ 
+ include_directories("${PROJECT_BINARY_DIR}")
+ 
+-add_definitions(-DSLOP_VERSION="v6.3.46")
++add_definitions(-DSLOP_VERSION="v${PROJECT_VERSION}")
+ 
+ # The names have to be unique unfortunately.
+ set(EXECUTABLE_NAME "slop")
+@@ -43,11 +40,13 @@
+ 
+ set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+ set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 11)
++set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_EXTENSIONS OFF)
+ 
+ add_executable(${EXECUTABLE_NAME} src/main.cpp)
+ 
+ set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+ set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 11)
++set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_EXTENSIONS OFF)
+ 
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" )
+ 
+@@ -83,7 +82,7 @@
+     target_link_libraries(${EXECUTABLE_NAME} ${ICU_UC_LIBRARIES} )
+ endif()
+ 
+-install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
+-install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
+-install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" COMPONENT development )
++install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" )
++install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}" )
++install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT development )
+ install( FILES "${CMAKE_SOURCE_DIR}/${MANTARGET}" DESTINATION  "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc )
diff --git a/x11-misc/slop/metadata.xml b/x11-misc/slop/metadata.xml
index d1c681a60ce8..34017c588f44 100644
--- a/x11-misc/slop/metadata.xml
+++ b/x11-misc/slop/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>palipalo9@googlemail.com</email>
-		<name>Ingolf Wagner</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<longdescription>
 		slop (Select Operation) is an application that queries for a selection
 		from the user and prints the region to stdout. It grabs the mouse and
diff --git a/x11-misc/slop/slop-4.3.21.ebuild b/x11-misc/slop/slop-4.3.21.ebuild
deleted file mode 100644
index 20411872e466..000000000000
--- a/x11-misc/slop/slop-4.3.21.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An application that queries the user for a selection for printing"
-HOMEPAGE="https://github.com/naelstrof/slop"
-SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	opengl? (
-		media-libs/glew:0=
-		media-libs/imlib2
-		virtual/opengl
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)"
-DEPEND="
-	${RDEPEND}
-	opengl? (
-		media-libs/glm
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.21-no-cppcheck.patch"
-	"${FILESDIR}/${PN}-4.3.21-no-gengetopt.patch"
-	"${FILESDIR}/${PN}-4.3.21-no-librt.patch"
-)
-
-src_prepare() {
-	use opengl || PATCHES+=( "${FILESDIR}/${PN}-4.3.21-no-opengl.patch"  )
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_OPENGL_SUPPORT=$(usex opengl)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/slop/slop-6.3.46.ebuild b/x11-misc/slop/slop-6.3.46.ebuild
index d8334f019a4a..796bb1f9b9dc 100644
--- a/x11-misc/slop/slop-6.3.46.ebuild
+++ b/x11-misc/slop/slop-6.3.46.ebuild
@@ -15,13 +15,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	dev-libs/icu
+	dev-libs/icu:=
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXrender
-"
+	x11-libs/libXrender"
 DEPEND="
 	${RDEPEND}
-	media-libs/glm
-"
+	media-libs/glm"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.3.46-fix-build-system.patch )